2008-09-04 Felix Zielcke <fzielcke@z-51.de>

        * util/getroot.c: Include <config.h>.
        (grub_util_get_grub_dev): Rewrite to use asprintf for mdraid devices,
        add support for /dev/md/N devices and handle LVM double dash escaping.

diff --git a/ChangeLog b/ChangeLog
index 1b8b46d1091deb2afbdcb353e21fc80ad913a2ce..571472959e0a976b6b6fad4465fe0022327f95aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
 2008-09-04  Felix Zielcke  <fzielcke@z-51.de>
 
-        * config.guess: Update to latest version from config.git.
-        * config.sub: Likewise.
+       * util/getroot.c: Include <config.h>.
+       (grub_util_get_grub_dev): Rewrite to use asprintf for mdraid devices,
+       add support for /dev/md/N devices and handle LVM double dash escaping.
+
+2008-09-04  Felix Zielcke  <fzielcke@z-51.de>
+
+       * config.guess: Update to latest version from config git.
+       * config.sub: Likewise.
 
 2008-09-03  Robert Millan  <rmh@aybabtu.com>
 

diff --git a/util/getroot.c b/util/getroot.c
index f721e7fc37da024e0d02372fe87803209c65c916..07d4580a32265f0b893f17cca7e9ef67883c3419 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -17,6 +17,7 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>
@@ -417,62 +418,52 @@ grub_util_get_grub_dev (const char *os_dev)
   switch (grub_util_get_dev_abstraction (os_dev))
     {
     case GRUB_DEV_ABSTRACTION_LVM:
-      grub_dev = xmalloc (strlen (os_dev) - 12 + 1);
 
-      strcpy (grub_dev, os_dev + 12);
+      {
+       unsigned short i, len;
+       grub_size_t offset = sizeof ("/dev/mapper/") - 1;
 
+       len = strlen (os_dev) - offset + 1;
+       grub_dev = xmalloc (len);
+
+       for (i = 0; i < len; i++, offset++)
+         {
+           grub_dev[i] = os_dev[offset];
+           if (os_dev[offset] == '-' && os_dev[offset + 1] == '-')
+             offset++;
+         }
+      }
+      
       break;
 
     case GRUB_DEV_ABSTRACTION_RAID:
-      grub_dev = xmalloc (20);
 
       if (os_dev[7] == '_' && os_dev[8] == 'd')
        {
-         const char *p;
-
          /* This a partitionable RAID device of the form /dev/md_dNNpMM. */
-         int i;
-
-         grub_dev[0] = 'm';
-         grub_dev[1] = 'd';
-         i = 2;
          
-         p = os_dev + 9;
-         while (*p >= '0' && *p <= '9')
-           {
-             grub_dev[i] = *p;
-             i++;
-             p++;
-           }
+         char *p , *q;
 
-         if (*p == '\0')
-           grub_dev[i] = '\0';
-         else if (*p == 'p')
-           {
-             p++;
-             grub_dev[i] = ',';
-             i++;
-
-             while (*p >= '0' && *p <= '9')
-               {
-                 grub_dev[i] = *p;
-                 i++;
-                 p++;
-               }
-
-             grub_dev[i] = '\0';
-           }
-         else
-           grub_util_error ("Unknown kind of RAID device `%s'", os_dev);
+         p = strdup (os_dev + sizeof ("/dev/md_d") - 1);
+
+         q = strchr (p, 'p');
+         if (q)
+           *q = ',';
+
+         asprintf (&grub_dev, "md%s", p);
+         free (p);
        }
       else if (os_dev[7] >= '0' && os_dev[7] <= '9')
        {
-         memcpy (grub_dev, os_dev + 5, 7);
-         grub_dev[7] = '\0';
+         asprintf (&grub_dev, "md%s", os_dev + sizeof ("/dev/md") - 1);
+       }
+      else if (os_dev[7] == '/' && os_dev[8] >= '0' && os_dev[8] <= '9')
+       {
+         asprintf (&grub_dev, "md%s", os_dev + sizeof ("/dev/md/") - 1);
        }
       else
        grub_util_error ("Unknown kind of RAID device `%s'", os_dev);
-
+      
       break;
 
     default:  /* GRUB_DEV_ABSTRACTION_NONE */