Am Dienstag, den 02.09.2008, 00:46 +0200 schrieb Felix Zielcke:
> I'm too lazy now to make a new patch and go sleeping now.
> [...]
>
> I hope that Marco could have a quick look over it especially the
> changelog part :)
Final patch attached.
In changelog I had again past and present mixed and I just use now the
`normal' types instead of grub_uintN_t, seems like that's more used on
util/
So if there are no objections I'd like to commit this :)
--
Felix Zielcke
2008-08-14 Felix Zielcke <[EMAIL PROTECTED]>
* util/getroot.c: Include <config.h>.
(grub_util_get_grub_dev): Rewritten to use asprintf for mdraid devices,
add support for /dev/md/N devices and handles LVM double dash escaping.
Index: util/getroot.c
===================================================================
--- util/getroot.c (Revision 1845)
+++ util/getroot.c (Arbeitskopie)
@@ -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,58 +418,45 @@ grub_util_get_grub_dev (const char *os_d
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, j;
+ const unsigned char k = sizeof ("/dev/mapper/") - 1;
+ const unsigned short l = strlen (os_dev) - k + 1;
- break;
+ grub_dev = xmalloc (strlen (os_dev) - k + 1);
+
+ for (i = 0, j = 0; i < l; i++, j++)
+ {
+ grub_dev[j] = os_dev[k + i];
+ if (os_dev[k + i] == '-' && os_dev[k + i + 1] == '-')
+ i++;
+ }
+ }
- case GRUB_DEV_ABSTRACTION_RAID:
- grub_dev = xmalloc (20);
+ break;
+ case GRUB_DEV_ABSTRACTION_RAID:
+
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++;
- }
-
- 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++;
- }
+ char *p;
+
+ p = strchr (os_dev, 'p');
+ if (p)
+ *p = ',';
- grub_dev[i] = '\0';
- }
- else
- grub_util_error ("Unknown kind of RAID device `%s'", os_dev);
+ asprintf (&grub_dev, "md%s", os_dev + sizeof ("/dev/md_d") - 1);
}
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);
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
