2010-01-27 Carles Pina i Estany <carles@pina.cat>

	* util/lvm.c: New macro LVM_DEV_MAPPER_STRING.
	(grub_util_lvm_isvolume): Use LVM_DEV_MAPPER_STRING.

diff --git a/ChangeLog b/ChangeLog
index b54d3bcbccbec69f906d923ccc5824bd917e7de9..e3988f1509311239da98933c0de70afd00540c09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-27  Carles Pina i Estany  <carles@pina.cat>
+
+       * util/lvm.c: New macro LVM_DEV_MAPPER_STRING.
+       (grub_util_lvm_isvolume): Use LVM_DEV_MAPPER_STRING.
+
 2010-01-26  Carles Pina i Estany  <carles@pina.cat>
 
        * util/bin2h.c (usage): Fix warning (space after backslash).

diff --git a/util/lvm.c b/util/lvm.c
index 8a8ed1e4cc290860c8665f5b81dfa37258c1dc01..0a091634475affe7e629451e8765e00a9b5150db 100644 (file)
--- a/util/lvm.c
+++ b/util/lvm.c
@@ -26,6 +26,8 @@
 #include <string.h>
 #include <sys/stat.h>
 
+#define LVM_DEV_MAPPER_STRING "/dev/mapper/"
+
 int
 grub_util_lvm_isvolume (char *name)
 {
@@ -33,10 +35,10 @@ grub_util_lvm_isvolume (char *name)
   struct stat st;
   int err;
 
-  devname = xmalloc (strlen (name) + 13);
+  devname = xmalloc (strlen (name) + sizeof (LVM_DEV_MAPPER_STRING));
 
-  strcpy (devname, "/dev/mapper/");
-  strcpy (devname+12, name);
+  strcpy (devname, LVM_DEV_MAPPER_STRING);
+  strcpy (devname + sizeof(LVM_DEV_MAPPER_STRING) - 1, name);
 
   err = stat (devname, &st);
   free (devname);