From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 12 Jun 2010 11:02:06 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~600^2~22^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95af254928d71b69751b7cc617e5aa262655a5b6;p=thirdparty%2Fgrub.git

merge with mainline
---

95af254928d71b69751b7cc617e5aa262655a5b6
diff --cc conf/common.rmk
index 3674cae07,3b9d1e5ce..c437156b7
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@@ -638,18 -619,14 +619,14 @@@ keystatus_mod_LDFLAGS = $(COMMON_LDFLAG
  
  # For normal.mod.
  normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
- 	normal/auth.c normal/autofs.c normal/handler.c \
+ 	normal/auth.c normal/autofs.c  \
  	normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
  	normal/menu_entry.c normal/menu_text.c \
- 	normal/misc.c normal/crypto.c normal/term.c normal/context.c
- normal_mod_CFLAGS = $(COMMON_CFLAGS)
- normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
- 
- # For sh.mod.
- sh_mod_SOURCES = script/main.c script/script.c script/argv.c script/execute.c \
+ 	normal/misc.c normal/crypto.c normal/term.c normal/context.c \
 -	script/main.c script/script.c script/execute.c \
++	script/main.c script/script.c script/execute.c script/argv.c \
  	script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
- sh_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
- sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ normal_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
+ normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
  ifneq (, $(FONT_SOURCE))
  font/font.c_DEPENDENCIES = ascii.h
diff --cc include/grub/script_sh.h
index 9199a539e,7d6129243..9bfc7e4bb
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@@ -340,9 -344,8 +345,9 @@@ grub_script_function_t grub_script_func
  						    struct grub_script *cmd);
  void grub_script_function_remove (const char *name);
  grub_script_function_t grub_script_function_find (char *functionname);
- int grub_script_function_iterate (int (*iterate) (grub_script_function_t));
 -int grub_script_function_call (grub_script_function_t func,
 -			       int argc, char **args);
++
 +grub_err_t grub_script_function_call (grub_script_function_t func,
 +				      int argc, char **args);
  
  char **
  grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count);
diff --cc script/function.c
index 82c753bcd,810c65233..47b236652
--- a/script/function.c
+++ b/script/function.c
@@@ -103,15 -103,12 +103,3 @@@ grub_script_function_find (char *functi
  
    return func;
  }
--
--int
- grub_script_function_iterate (int (*iterate) (grub_script_function_t))
 -grub_script_function_call (grub_script_function_t func,
 -			   int argc __attribute__((unused)),
 -			   char **args __attribute__((unused)))
--{
-   grub_script_function_t func;
- 
-   for (func = grub_script_function_list; func; func = func->next)
-     if (iterate (func))
-       return 1;
- 
-   return 0;
 -  /* XXX: Arguments are not supported yet.  */
 -  return grub_script_execute (func->func);
--}