* util/grub-editenv.c (argp_parser): Don't pass translated strings

as printf format strings; the translations might contain '%' which
could cause a crash.
(main): Likewise.
* util/grub-fstest.c (argp_parser): Likewise.
* util/grub-setup.c (argp_parser): Likewise.
(main): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 6adf6142ad6d4b561c8cde2b2cb3fa48a979893e..e20e2b65426532c526fb6ab719bd8752ee044e69 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-20  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub-editenv.c (argp_parser): Don't pass translated strings
+       as printf format strings; the translations might contain '%' which
+       could cause a crash.
+       (main): Likewise.
+       * util/grub-fstest.c (argp_parser): Likewise.
+       * util/grub-setup.c (argp_parser): Likewise.
+       (main): Likewise.
+
 2010-09-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Use argp in grub-fstest.

diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index 3ea026cfe5379caf13e6f6a7f36cde916c735125..bfda7c3d8cb2efc04a47349dfe264d91ac7324ed 100644 (file)
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -72,7 +72,8 @@ error_t argp_parser (int key, char *arg, struct argp_state *state)
         break;
 
       case ARGP_KEY_NO_ARGS:
-        fprintf (stderr, _("You need to specify at least one command.\n"));
+        fprintf (stderr, "%s",
+                _("You need to specify at least one command.\n"));
         argp_usage (state);
         break;
 
@@ -272,7 +273,7 @@ main (int argc, char *argv[])
   /* Parse our arguments */
   if (argp_parse (&argp, argc, argv, 0, &index, 0) != 0)
     {
-      fprintf (stderr, _("Error in parsing command line arguments\n"));
+      fprintf (stderr, "%s", _("Error in parsing command line arguments\n"));
       exit(1);
     }
 

diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index 72485679f5e72b43e8fa4cd19b364fa794fe73bd..aedb2954a19bc22d32433333c17856cbde5cc20a 100644 (file)
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -394,12 +394,12 @@ argp_parser (int key, char *arg, struct argp_state *state)
       num_disks = grub_strtoul (arg, NULL, 0);
       if (num_disks < 1)
        {
-         fprintf (stderr, _("Invalid disk count.\n"));
+         fprintf (stderr, "%s", _("Invalid disk count.\n"));
          argp_usage (state);
        }
       if (args_count != 0)
        {
-         fprintf (stderr, _("Disk count must precede disks list.\n"));
+         fprintf (stderr, "%s", _("Disk count must precede disks list.\n"));
          argp_usage (state);
        }
       return 0;
@@ -415,12 +415,12 @@ argp_parser (int key, char *arg, struct argp_state *state)
     case ARGP_KEY_END:
       if (args_count < num_disks)
        {
-         fprintf (stderr, _("No command is specified.\n"));
+         fprintf (stderr, "%s", _("No command is specified.\n"));
          argp_usage (state);
        }
       if (args_count - 1 - num_disks < nparm)
        {
-         fprintf (stderr, _("Not enough parameters to command.\n"));
+         fprintf (stderr, "%s", _("Not enough parameters to command.\n"));
          argp_usage (state);
        }
       return 0;
@@ -436,7 +436,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
     {
       if (arg[0] != '/')
        {
-         fprintf (stderr, _("Must use absolute path.\n"));
+         fprintf (stderr, "%s", _("Must use absolute path.\n"));
          argp_usage (state);
        }
       if (args_count == 0)

diff --git a/util/grub-setup.c b/util/grub-setup.c
index 90a4b2ac26aac6e397315feca1d1159a164ace90..05355bf432a429ad965d89aa204b0c49922e0a1e 100644 (file)
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -778,7 +778,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
         break;
 
       case ARGP_KEY_NO_ARGS:
-          fprintf (stderr, _("No device is specified.\n"));
+          fprintf (stderr, "%s", _("No device is specified.\n"));
           argp_usage (state);
           break;
 
@@ -835,7 +835,7 @@ main (int argc, char *argv[])
   /* Parse our arguments */
   if (argp_parse (&argp, argc, argv, 0, 0, &arguments) != 0)
     {
-      fprintf (stderr, _("Error in parsing command line arguments\n"));
+      fprintf (stderr, "%s", _("Error in parsing command line arguments\n"));
       exit(1);
     }