Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/volume_id/get_devname.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/volume_id/get_devname.c (modified) (2 diffs)

branches/3.3/mindi-busybox/util-linux/volume_id/get_devname.c

@@ -8 +8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//kbuild:lib-$(CONFIG_BLKID) += get_devname.o
+//kbuild:lib-$(CONFIG_FINDFS) += get_devname.o
+//kbuild:lib-$(CONFIG_FEATURE_MOUNT_LABEL) += get_devname.o
+
 #include <sys/mount.h> /* BLKGETSIZE64 */
 #if !defined(BLKGETSIZE64)
@@ -298 +303 @@
     char *tmp = *fsname;
 
-    if (strncmp(*fsname, "UUID=", 5) == 0)
+    if (is_prefixed_with(*fsname, "UUID="))
         tmp = get_devname_from_uuid(*fsname + 5);
-    else if (strncmp(*fsname, "LABEL=", 6) == 0)
+    else if (is_prefixed_with(*fsname, "LABEL="))
         tmp = get_devname_from_label(*fsname + 6);