merge mainline into mbivid

ChangeLog

@@ -1,3 +1,33 @@
+2010-01-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Video driver ids.
+
+	* include/grub/video.h (grub_video_driver_id): New type.
+	(grub_video_adapter): New member 'id'. All users updated.
+	(grub_video_get_driver_id): New proto.
+	* video/video.c (grub_video_get_driver_id): New function.
+
+2010-01-14  Carles Pina i Estany  <carles@pina.cat>
+
+	* util/grub.d/30_os-prober.in: Use `set var=val' rather than plain
+	`var=val'.
+
+2010-01-14  Carles Pina i Estany  <carles@pina.cat>
+
+	* normal/cmdline.c (print_completion): Gettextizze.
+
+2001-01-14  Carles Pina i Estany  <carles@pina.cat>
+
+	* loader/i386/pc/chainloader.c: Include `<grub/mm.h>'.
+
+2010-01-14  Carles Pina i Estany  <carles@pina.cat>
+
+	* gettext/gettext.c (grub_gettext_translate): Push and pop
+	grub_errno.
+	(grub_gettext_delete_list): Change comment style.
+	* kern/err.c (grub_error): Gettextizze.
+	(grub_fatal): Gettextizze.
+
 2010-01-14  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* include/grub/i386/loader.h (grub_linux16_boot): Renamed to ...

ChangeLog.mbivid

@@ -4,9 +4,6 @@
 
 	* include/grub/multiboot.h (grub_multiboot_set_accepts_video):
 	New prototype.
-	* include/grub/video.h (grub_video_driver_id): New type.
-	(grub_video_adapter): New member 'id'. All users updated.
-	(grub_video_get_driver_id): New proto.
 	* include/multiboot.h: Resynced with multiboot specification.
 	* include/multiboot2.h: Likewise.
 	* loader/i386/multiboot.c (UNSUPPORTED_FLAGS): Support video flags.
@@ -21,4 +18,3 @@
 	(fill_vbe_info) [HAS_VBE]: Likewise.
 	(retrieve_video_parameters): Likewise.
 	(grub_multiboot_make_mbi): Fill video fields.
-	* video/video.c (grub_video_get_driver_id): New function.

gettext/gettext.c

@@ -148,14 +148,24 @@ grub_gettext_translate (const char *orig)
 
   struct grub_gettext_msg *cur;
 
+  /* Make sure we can use grub_gettext_translate for error messages.  Push
+     active error message to error stack and reset error message.  */
+  grub_error_push ();
+
   cur = grub_named_list_find (GRUB_AS_NAMED_LIST (grub_gettext_msg_list),
 			      orig);
 
   if (cur)
+    {
+      grub_error_pop ();
       return cur->translated;
+    }
 
   if (fd_mo == 0)
+    {
+      grub_error_pop ();
       return orig;
+    }
 
   min = 0;
   max = grub_gettext_max;
@@ -205,6 +215,7 @@ grub_gettext_translate (const char *orig)
 	grub_errno = GRUB_ERR_NONE;
     }
 
+  grub_error_pop ();
   return ret;
 }
 
@@ -308,7 +319,7 @@ grub_gettext_delete_list (void)
       char *original = (char *) ((struct grub_gettext_msg *) item)->name;
       grub_free (original);
 
-      // Don't delete the translated message because could be in use.
+      /* Don't delete the translated message because could be in use.  */
     }
 }
 

kern/err.c

@@ -45,7 +45,7 @@ grub_error (grub_err_t n, const char *fmt, ...)
   grub_errno = n;
 
   va_start (ap, fmt);
-  grub_vsprintf (grub_errmsg, fmt, ap);
+  grub_vsprintf (grub_errmsg, _(fmt), ap);
   va_end (ap);
 
   return n;
@@ -57,7 +57,7 @@ grub_fatal (const char *fmt, ...)
   va_list ap;
 
   va_start (ap, fmt);
-  grub_vprintf (fmt, ap);
+  grub_vprintf (_(fmt), ap);
   va_end (ap);
 
   grub_abort ();

loader/i386/pc/chainloader.c

@@ -34,6 +34,7 @@
 #include <grub/machine/biosnum.h>
 #include <grub/i18n.h>
 #include <grub/video.h>
+#include <grub/mm.h>
 
 static grub_dl_t my_mod;
 static int boot_drive;

normal/cmdline.c

@@ -166,31 +166,30 @@ print_completion (const char *item, grub_completion_type_t type, int count)
   if (count == 0)
     {
       /* If this is the first time, print a label.  */
-      const char *what;
       
+      grub_puts ("");
       switch (type)
 	{
 	case GRUB_COMPLETION_TYPE_COMMAND:
-	  what = "commands";
+	  grub_puts_ (N_("Possible commands are:"));
 	  break;
 	case GRUB_COMPLETION_TYPE_DEVICE:
-	  what = "devices";
+	  grub_puts_ (N_("Possible devices are:"));
 	  break;
 	case GRUB_COMPLETION_TYPE_FILE:
-	  what = "files";
+	  grub_puts_ (N_("Possible files are:"));
 	  break;
 	case GRUB_COMPLETION_TYPE_PARTITION:
-	  what = "partitions";
+	  grub_puts_ (N_("Possible partitions are:"));
 	  break;
 	case GRUB_COMPLETION_TYPE_ARGUMENT:
-	  what = "arguments";
+	  grub_puts_ (N_("Possible arguments are:"));
 	  break;
 	default:
-	  what = "things";
+	  grub_puts_ (N_("Possible things are:"));
 	  break;
 	}
-
+      grub_puts ("");
-      grub_printf ("\nPossible %s are:\n", what);
     }
 
   if (type == GRUB_COMPLETION_TYPE_PARTITION)

util/grub.d/30_os-prober.in

@@ -45,10 +45,10 @@ EOF
 	prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
 	cat << EOF
         insmod ${GRUB_VIDEO_BACKEND}
-        do_resume=0
+        set do_resume=0
         if [ /var/vm/sleepimage -nt10 / ]; then
            if xnu_resume /var/vm/sleepimage; then
-             do_resume=1
+             set do_resume=1
            fi
         fi
         if [ \$do_resume == 0 ]; then