merge mainline into newreloc

ChangeLog

@@ -1,3 +1,15 @@
+2010-08-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/term/ieee1275/ofconsole.c (put): Correct prototype.
+	(readkey): Likewise.
+
+2010-08-25  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Multiple variable names support to "export" command.
+
+	* normal/context.c (grub_cmd_export): "export" command supports
+	multiple variable names.
+
 2010-08-23  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* util/grub.d/30_os-prober.in: Fix conversion from grub-probe

grub-core/normal/context.c

@@ -158,11 +158,15 @@ static grub_err_t
 grub_cmd_export (struct grub_command *cmd __attribute__ ((unused)),
 		 int argc, char **args)
 {
+  int i;
+
   if (argc < 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
 		       "no environment variable specified");
 
-  grub_env_export (args[0]);
+  for (i = 0; i < argc; i++)
+    grub_env_export (args[i]);
+
   return 0;
 }
 
@@ -173,7 +177,8 @@ grub_context_init (void)
   grub_env_export ("prefix");
 
   export_cmd = grub_register_command ("export", grub_cmd_export,
-				      N_("ENVVAR"), N_("Export a variable."));
+				      N_("ENVVAR [ENVVAR] ..."),
+				      N_("Export variables."));
 }
 
 void

grub-core/term/ieee1275/ofconsole.c

@@ -55,7 +55,7 @@ static struct color colors[] =
   };
 
 static void
-put (const int c)
+put (struct grub_term_output *term __attribute__ ((unused)), const int c)
 {
   char chr = c;
 
@@ -63,7 +63,7 @@ put (const int c)
 }
 
 static int
-readkey (void)
+readkey (struct grub_term_input *term __attribute__ ((unused)))
 {
   grub_uint8_t c;
   grub_ssize_t actual = 0;