* util/grub-mount.c (argp_parser): Accept relative pathes.

	* util/grub-fstest.c (argp_parser): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 8c3ccb6314c450d93f386a9dfeb132fae8eb7e0b..d3c48339ea5a15c7979420ed7a504b004cdded80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-mount.c (argp_parser): Accept relative pathes.
+       * util/grub-fstest.c (argp_parser): Likewise.
+
 2011-11-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Plan9 support.

diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index c9f24ff08a4f34aa2243026c529df3907db46823..886155fe2bce2229cb84c83ef7fd2a06eb651a34 100644 (file)
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -562,14 +562,9 @@ argp_parser (int key, char *arg, struct argp_state *state)
 
   if (args_count < num_disks)
     {
-      if (arg[0] != '/')
-       {
-         fprintf (stderr, "%s", _("Must use absolute path.\n"));
-         argp_usage (state);
-       }
       if (args_count == 0)
        images = xmalloc (num_disks * sizeof (images[0]));
-      images[args_count] = xstrdup (arg);
+      images[args_count] = canonicalize_file_name (arg);
       args_count++;
       return 0;
     }

diff --git a/util/grub-mount.c b/util/grub-mount.c
index a4be217387470ab786a1ecd18722e34018032535..da7d604a29b7efdce355926c1f3746738e60c149 100644 (file)
--- a/util/grub-mount.c
+++ b/util/grub-mount.c
@@ -489,13 +489,8 @@ argp_parser (int key, char *arg, struct argp_state *state)
       return 0;
     }
 
-  if (arg[0] != '/')
-    {
-      fprintf (stderr, "%s", _("Must use absolute path.\n"));
-      argp_usage (state);
-    }
   images = xrealloc (images, (num_disks + 1) * sizeof (images[0]));
-  images[num_disks] = xstrdup (arg);
+  images[num_disks] = canonicalize_file_name (arg);
   num_disks++;
 
   return 0;