vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2005-07-20 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
Change the semantics of variable hooks. They now return	strings
	instead of error values.

	* util/i386/pc/grub-setup.c: Include grub/env.h.
	(setup): Use grub_device_set_root instead of grub_env_set.

	* kern/rescue.c (grub_rescue_cmd_root): Use grub_env_set and
	grub_env_get instead of grub_device_set_root and
	grub_device_get_root, respectively.

	* kern/main.c (grub_env_write_root): New function.
	(grub_set_root_dev): Register grub_env_write_hook for "root". Use
	grub_env_set instead of grub_device_set_root.

	* kern/env.c (HASHSZ): Reduced to 13, because GRUB does not need
	many variables.
	(grub_env_set): Set ENV->VALUE to the result of ENV->WRITE_HOOK
	rather than calling ENV->WRITE_HOOK afterwards.
	(grub_env_get): Return the result of ENV->READ_HOOK rather than
	passing a pointer of a pointer.
	(grub_register_variable_hook): Change the types of "read_hook" and
	"write_hook" to grub_env_read_hook_t and grub_env_write_hook_t,
	respectively.
	Allocate the default empty string on the heap, because this string
	may be freed later.

	* kern/device.c: Include grub/env.h.
	(grub_device_set_root): Removed.
	(grub_device_get_root): Likewise.
	(grub_device_open): Use grub_env_get instead of
	grub_device_get_root.

	* include/grub/env.h (grub_env_read_hook_t): New type.
	(grub_env_write_hook_t): Likewise.
	(grub_env_var): Change the types of "read_hook" and "write_hook"
	to grub_env_read_hook_t and grub_env_write_hook_t, respectively.
	(grub_register_variable_hook): Likewise.

	* include/grub/device.h (grub_device_set_root): Removed.
	(grub_device_set_root): Likewise.

	* fs/fat.c (grub_fat_dir): Make a copy of PATH in DIRNAME, and
	make sure that DIRNAME terminates with '/', so that
	grub_fat_find_dir will fail if PATH is not a directory.

	* commands/ls.c (grub_ls_list_files): Remove the qualifier const
	from DIRNAME.
	Use the qualifier auto for print_files and print_files_long.
	If FS->DIR sets GRUB_ERRNO to GRUB_ERR_BAD_FILE_TYPE, try DIRNAME
	as a regular file.
	Put a newline only if there is no error.
	(grub_cmd_ls): Remove grub_ls_print_files, because this is not
	used.
This commit is contained in:
okuji 2005-07-20 20:30:46 +00:00
parent 896f0afdb7
commit 5f968e1e61
10 changed files with 173 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

52
commands/ls.c
View file

@ -121,14 +121,16 @@ grub_ls_list_disks (int longlist)
}
static grub_err_t
grub_ls_list_files (const char *dirname, int longlist, int all, int human)
grub_ls_list_files (char *dirname, int longlist, int all, int human)
{
char *device_name;
grub_fs_t fs;
const char *path;
grub_device_t dev;
static int print_files (const char *filename, int dir)
auto int print_files (const char *filename, int dir);
auto int print_files_long (const char *filename, int dir);
int print_files (const char *filename, int dir)
{
if (all || filename[0] != '.')
grub_printf ("%s%s ", filename, dir ? "/" : "");
@ -136,7 +138,7 @@ grub_ls_list_files (const char *dirname, int longlist, int all, int human)
return 0;
}
static int print_files_long (const char *filename, int dir)
int print_files_long (const char *filename, int dir)
{
char pathname[grub_strlen (dirname) + grub_strlen (filename) + 1];
@ -228,7 +230,39 @@ grub_ls_list_files (const char *dirname, int longlist, int all, int human)
(fs->dir) (dev, path, print_files_long);
else
(fs->dir) (dev, path, print_files);
grub_putchar ('\n');
if (grub_errno == GRUB_ERR_BAD_FILE_TYPE
&& path[grub_strlen (path) - 1] != '/')
{
/* PATH might be a regular file. */
char *p;
grub_file_t file;
grub_errno = 0;
file = grub_file_open (dirname);
if (! file)
goto fail;
grub_file_close (file);
p = grub_strrchr (dirname, '/') + 1;
dirname = grub_strndup (dirname, p - dirname);
if (! dirname)
goto fail;
all = 1;
if (longlist)
print_files_long (p, 0);
else
print_files (p, 0);
grub_free (dirname);
}
if (grub_errno == GRUB_ERR_NONE)
grub_putchar ('\n');
grub_refresh ();
}
@ -244,14 +278,6 @@ grub_ls_list_files (const char *dirname, int longlist, int all, int human)
static grub_err_t
grub_cmd_ls (struct grub_arg_list *state, int argc, char **args)
{
static int grub_ls_print_files (const char *filename, int dir)
{
if (state[2].set/*all*/ || filename[0] != '.')
grub_printf ("%s%s ", filename, dir ? "/" : "");
return 0;
}
if (argc == 0)
grub_ls_list_disks (state[0].set);
else