* normal/autofs.c (read_fs_list): New parameter 'prefix'.

	All users updated.
	* normal/crypto.c (read_crypto_list): Likewise.
	* normal/dyncmd.c (read_command_list): Likewise.
	* normal/term.c (read_terminal_list): Likewise.
	* normal/main.c (read_lists): Use explicit prefix.
	(read_lists_hook): Use read_lists.
	(grub_normal_execute): Likewise.

diff --git a/ChangeLog b/ChangeLog
index a2a33b2ef3746d073e682d5e6c7d366d3421cdfd..5f3251fcb8b26ac7f326508b817dda320cced4bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * normal/autofs.c (read_fs_list): New parameter 'prefix'.
+       All users updated.
+       * normal/crypto.c (read_crypto_list): Likewise.
+       * normal/dyncmd.c (read_command_list): Likewise.
+       * normal/term.c (read_terminal_list): Likewise.
+       * normal/main.c (read_lists): Use explicit prefix.
+       (read_lists_hook): Use read_lists.
+       (grub_normal_execute): Likewise.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-mkrescue.in: Fix incorrect path in coreboot part.

diff --git a/include/grub/normal.h b/include/grub/normal.h
index fe45ddf71a5f2282f3701b114506c90abb69a44b..35eedf5aec320a578cce3660930ef3928cfbc5d7 100644 (file)
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -96,17 +96,17 @@ void read_handler_list (void);
 void free_handler_list (void);
 
 /* Defined in `dyncmd.c'.  */
-void read_command_list (void);
+void read_command_list (const char *prefix);
 
 /* Defined in `autofs.c'.  */
-void read_fs_list (void);
+void read_fs_list (const char *prefix);
 
 void grub_context_init (void);
 void grub_context_fini (void);
 
-void read_crypto_list (void);
+void read_crypto_list (const char *prefix);
 
-void read_terminal_list (void);
+void read_terminal_list (const char *prefix);
 
 void grub_set_more (int onoff);
 

diff --git a/normal/autofs.c b/normal/autofs.c
index 11b3fc1bea2cce91b12ee8b09613d575df923f73..e1d4c017cfa8728f7b30d876f2e6b016015ed311 100644 (file)
--- a/normal/autofs.c
+++ b/normal/autofs.c
@@ -51,11 +51,8 @@ autoload_fs_module (void)
 
 /* Read the file fs.lst for auto-loading.  */
 void
-read_fs_list (void)
+read_fs_list (const char *prefix)
 {
-  const char *prefix;
-
-  prefix = grub_env_get ("prefix");
   if (prefix)
     {
       char *filename;

diff --git a/normal/crypto.c b/normal/crypto.c
index f051e2c4c6e0fe1345c409a69698674dc9df1106..465c9f81df82c0c72dc7bc4b25fbe8064f176a4c 100644 (file)
--- a/normal/crypto.c
+++ b/normal/crypto.c
@@ -66,14 +66,12 @@ grub_crypto_spec_free (void)
 
 /* Read the file crypto.lst for auto-loading.  */
 void
-read_crypto_list (void)
+read_crypto_list (const char *prefix)
 {
-  const char *prefix;
   char *filename;
   grub_file_t file;
   char *buf = NULL;
 
-  prefix = grub_env_get ("prefix");
   if (!prefix)
     {
       grub_errno = GRUB_ERR_NONE;

diff --git a/normal/dyncmd.c b/normal/dyncmd.c
index ca9a8228914b2dd92708c9907a64fa0a4b94a53e..a3cafa514c83c57cf30fdbbd2dfa0b56c3c40595 100644 (file)
--- a/normal/dyncmd.c
+++ b/normal/dyncmd.c
@@ -60,11 +60,8 @@ grub_dyncmd_dispatcher (struct grub_command *cmd,
 
 /* Read the file command.lst for auto-loading.  */
 void
-read_command_list (void)
+read_command_list (const char *prefix)
 {
-  const char *prefix;
-
-  prefix = grub_env_get ("prefix");
   if (prefix)
     {
       char *filename;

diff --git a/normal/main.c b/normal/main.c
index 5a546748528dc53e05f64bf4eab94630f15a2ea9..df92e622b9d81e90412235b2a8a86730bd30e729 100644 (file)
--- a/normal/main.c
+++ b/normal/main.c
@@ -434,14 +434,20 @@ grub_normal_init_page (struct grub_term_output *term)
   grub_free (unicode_msg);
 }
 
+static void
+read_lists (const char *val)
+{
+  read_command_list (val);
+  read_fs_list (val);
+  read_crypto_list (val);
+  read_terminal_list (val);
+}
+
 static char *
-read_lists (struct grub_env_var *var __attribute__ ((unused)),
-           const char *val)
+read_lists_hook (struct grub_env_var *var __attribute__ ((unused)),
+                const char *val)
 {
-  read_command_list ();
-  read_fs_list ();
-  read_crypto_list ();
-  read_terminal_list ();
+  read_lists (val);
   return val ? grub_strdup (val) : NULL;
 }
 
@@ -451,10 +457,11 @@ void
 grub_normal_execute (const char *config, int nested, int batch)
 {
   grub_menu_t menu = 0;
+  const char *prefix = grub_env_get ("prefix");
 
-  read_lists (NULL, NULL);
+  read_lists (prefix);
   read_handler_list ();
-  grub_register_variable_hook ("prefix", NULL, read_lists);
+  grub_register_variable_hook ("prefix", NULL, read_lists_hook);
   grub_command_execute ("parser.grub", 0, 0);
 
   if (config)

diff --git a/normal/term.c b/normal/term.c
index 7bedd6799423d5ff3cf86295051a20246c765529..688141dab91244b2119c6df672f8682d99aa5a5f 100644 (file)
--- a/normal/term.c
+++ b/normal/term.c
@@ -167,14 +167,12 @@ grub_terminal_autoload_free (void)
 
 /* Read the file terminal.lst for auto-loading.  */
 void
-read_terminal_list (void)
+read_terminal_list (const char *prefix)
 {
-  const char *prefix;
   char *filename;
   grub_file_t file;
   char *buf = NULL;
 
-  prefix = grub_env_get ("prefix");
   if (!prefix)
     {
       grub_errno = GRUB_ERR_NONE;