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

40
kern/env.c
View file

@ -1,7 +1,7 @@
/* env.c - Environment variables */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2003 Free Software Foundation, Inc.
* Copyright (C) 2003,2005 Free Software Foundation, Inc.
*
* GRUB is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -22,8 +22,8 @@
#include <grub/misc.h>
#include <grub/mm.h>
/* XXX: What would be a good size for the hashtable? */
#define HASHSZ 123
/* The size of the hash table. */
#define HASHSZ 13
/* A hashtable for quick lookup of variables. */
static struct grub_env_var *grub_env[HASHSZ];
@ -68,16 +68,18 @@ grub_env_set (const char *var, const char *val)
if (env)
{
char *old = env->value;
env->value = grub_strdup (val);
if (! env->name)
if (env->write_hook)
env->value = env->write_hook (env, val);
else
env->value = grub_strdup (val);
if (! env->value)
{
env->value = old;
return grub_errno;
}
if (env->write_hook)
(env->write_hook) (env);
grub_free (old);
return 0;
}
@ -141,12 +143,7 @@ grub_env_get (const char *name)
return 0;
if (env->read_hook)
{
char *val;
env->read_hook (env, &val);
return val;
}
return env->read_hook (env, env->value);
return env->value;
}
@ -190,14 +187,21 @@ grub_env_iterate (int (* func) (struct grub_env_var *var))
grub_err_t
grub_register_variable_hook (const char *var,
grub_err_t (*read_hook) (struct grub_env_var *var, char **),
grub_err_t (*write_hook) (struct grub_env_var *var))
grub_env_read_hook_t read_hook,
grub_env_write_hook_t write_hook)
{
struct grub_env_var *env = grub_env_find (var);
if (! env)
if (grub_env_set (var, "") != GRUB_ERR_NONE)
return grub_errno;
{
char *val = grub_strdup ("");
if (! val)
return grub_errno;
if (grub_env_set (var, val) != GRUB_ERR_NONE)
return grub_errno;
}
env = grub_env_find (var);
/* XXX Insert an assertion? */