* grub-core/kern/emu/hostdisk.c (read_device_map): Explicitly

	delimit path in strings using quotes.
	* util/getroot.c (grub_guess_root_devices): Likewise.
	(grub_make_system_path_relative_to_its_root): Likewise.
	* util/grub-probe.c (probe): Likewise.
	* util/ieee1275/ofpath.c (find_obppath): Likewise.
	(xrealpath): Likewise.

diff --git a/ChangeLog b/ChangeLog
index ea903833fe58c8684073e7510f5dd478f2dc67be..1c0e633d4befe660273cc3a08e7281d9e90fafbd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-01-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/emu/hostdisk.c (read_device_map): Explicitly
+       delimit path in strings using quotes.
+       * util/getroot.c (grub_guess_root_devices): Likewise.
+       (grub_make_system_path_relative_to_its_root): Likewise.
+       * util/grub-probe.c (probe): Likewise.
+       * util/ieee1275/ofpath.c (find_obppath): Likewise.
+       (xrealpath): Likewise.
+
 2013-01-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Fix compilation with older compilers.

diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index b8c376643fe3acc34add95aad7df718c6d26724a..ccd24174a888c458770aca772102ede0809b73eb 100644 (file)
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -1339,7 +1339,7 @@ read_device_map (const char *dev_map)
        {
          map[drive].device = xmalloc (PATH_MAX);
          if (! realpath (p, map[drive].device))
-           grub_util_error (_("failed to get canonical path of %s"), p);
+           grub_util_error (_("failed to get canonical path of `%s'"), p);
        }
       else
 #endif

diff --git a/util/getroot.c b/util/getroot.c
index 24ce6aacc4e4035322fcaf886efa947b6bc81dd3..3b5b0f672bb8a2c8db3be9447f64921b97f4c164 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -1065,7 +1065,7 @@ grub_guess_root_devices (const char *dir)
            {
              *cur = canonicalize_file_name (tmp);
              if (*cur == NULL)
-               grub_util_error (_("failed to get canonical path of %s"), tmp);
+               grub_util_error (_("failed to get canonical path of `%s'"), tmp);
              free (tmp);
            }
          root = (strcmp (*cur, "/dev/root") == 0);
@@ -2778,7 +2778,7 @@ grub_make_system_path_relative_to_its_root (const char *path)
   /* canonicalize.  */
   p = canonicalize_file_name (path);
   if (p == NULL)
-    grub_util_error (_("failed to get canonical path of %s"), path);
+    grub_util_error (_("failed to get canonical path of `%s'"), path);
 
   /* For ZFS sub-pool filesystems, could be extended to others (btrfs?).  */
 #if !defined (__MINGW32__) && !defined (__CYGWIN__)

diff --git a/util/grub-probe.c b/util/grub-probe.c
index c2a0f6280715d569d6d949626c0623ead558caeb..b66cbeaa8f0bd251d2e13aa9cd44181c28021ae2 100644 (file)
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -327,7 +327,7 @@ probe (const char *path, char **device_names, char delim)
     {
       grub_path = canonicalize_file_name (path);
       if (! grub_path)
-       grub_util_error (_("failed to get canonical path of %s"), path);
+       grub_util_error (_("failed to get canonical path of `%s'"), path);
       device_names = grub_guess_root_devices (grub_path);
       free (grub_path);
     }

diff --git a/util/ieee1275/ofpath.c b/util/ieee1275/ofpath.c
index 9de9ffc80d5146d2008263b8d9db5eea942465e5..f0a34b5872ae84cb6074a461c1d247cee2e016b7 100644 (file)
--- a/util/ieee1275/ofpath.c
+++ b/util/ieee1275/ofpath.c
@@ -131,7 +131,7 @@ find_obppath (const char *sysfs_path_orig)
          kill_trailing_dir(sysfs_path);
          if (!strcmp(sysfs_path, "/sys"))
            {
-             grub_util_info (_("'obppath' not found in parent dirs of %s,"
+             grub_util_info (_("`obppath' not found in parent dirs of `%s',"
                                " no IEEE1275 name discovery"),
                              sysfs_path_orig);
              free (path);
@@ -164,7 +164,7 @@ xrealpath (const char *in)
   out = realpath (in, NULL);
 #endif
   if (!out)
-    grub_util_error (_("failed to get canonical path of %s"), in);
+    grub_util_error (_("failed to get canonical path of `%s'"), in);
   return out;
 }