Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/volume_id/get_devname.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

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

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

@@ -20 +20 @@
     char *label;
     char *uc_uuid; /* prefix makes it easier to grep for */
+    IF_FEATURE_BLKID_TYPE(const char *type;)
 } *uuidCache;
+
+#if !ENABLE_FEATURE_BLKID_TYPE
+#define get_label_uuid(fd, label, uuid, type) \
+    get_label_uuid(fd, label, uuid)
+#define uuidcache_addentry(device, label, uuid, type) \
+    uuidcache_addentry(device, label, uuid)
+#endif
 
 /* Returns !0 on error.
@@ -27 +35 @@
  * NB: closes fd. */
 static int
-get_label_uuid(int fd, char **label, char **uuid)
+get_label_uuid(int fd, char **label, char **uuid, const char **type)
 {
     int rv = 1;
@@ -42 +50 @@
         goto ret;
 
-    if (vid->label[0] != '\0' || vid->uuid[0] != '\0') {
+    if (vid->label[0] != '\0' || vid->uuid[0] != '\0'
+#if ENABLE_FEATURE_BLKID_TYPE
+     || vid->type != NULL
+#endif
+    ) {
         *label = xstrndup(vid->label, sizeof(vid->label));
         *uuid  = xstrndup(vid->uuid, sizeof(vid->uuid));
+#if ENABLE_FEATURE_BLKID_TYPE
+        *type = vid->type;
+        dbg("found label '%s', uuid '%s', type '%s'", *label, *uuid, *type);
+#else
         dbg("found label '%s', uuid '%s'", *label, *uuid);
+#endif
         rv = 0;
     }
@@ -55 +72 @@
 /* NB: we take ownership of (malloc'ed) label and uuid */
 static void
-uuidcache_addentry(char *device, /*int major, int minor,*/ char *label, char *uuid)
+uuidcache_addentry(char *device, /*int major, int minor,*/ char *label, char *uuid, const char *type)
 {
     struct uuidCache_s *last;
@@ -73 +90 @@
     last->label = label;
     last->uc_uuid = uuid;
+    IF_FEATURE_BLKID_TYPE(last->type = type;)
 }
 
@@ -84 +102 @@
         int depth UNUSED_PARAM)
 {
-    char *uuid = uuid; /* for compiler */
-    char *label = label;
-    int fd;
-
     /* note: this check rejects links to devices, among other nodes */
     if (!S_ISBLK(statbuf->st_mode))
@@ -100 +114 @@
         return TRUE;
 
-    fd = open(device, O_RDONLY);
-    if (fd < 0)
-        return TRUE;
-
-    /* get_label_uuid() closes fd in all cases (success & failure) */
-    if (get_label_uuid(fd, &label, &uuid) == 0) {
-        /* uuidcache_addentry() takes ownership of all three params */
-        uuidcache_addentry(xstrdup(device), /*ma, mi,*/ label, uuid);
-    }
+    add_to_uuid_cache(device);
+
     return TRUE;
 }
 
-static void
-uuidcache_init(void)
-{
+static struct uuidCache_s*
+uuidcache_init(int scan_devices)
+{
+    dbg("DBG: uuidCache=%x, uuidCache");
     if (uuidCache)
-        return;
+        return uuidCache;
 
     /* We were scanning /proc/partitions
@@ -128 +136 @@
      * (Maybe add scanning of /sys/block/XXX/dev for devices
      * somehow not having their /dev/XXX entries created?) */
-
-    recursive_action("/dev", ACTION_RECURSE,
-        uuidcache_check_device, /* file_action */
-        NULL, /* dir_action */
-        NULL, /* userData */
-        0 /* depth */);
+    if (scan_devices)
+        recursive_action("/dev", ACTION_RECURSE,
+            uuidcache_check_device, /* file_action */
+            NULL, /* dir_action */
+            NULL, /* userData */
+            0 /* depth */);
+
+    return uuidCache;
 }
 
@@ -145 +155 @@
     struct uuidCache_s *uc;
 
-    uuidcache_init();
-    uc = uuidCache;
-
+    uc = uuidcache_init(/*scan_devices:*/ 1);
     while (uc) {
         switch (n) {
@@ -212 +220 @@
 
 /* Used by blkid */
-void display_uuid_cache(void)
-{
-    struct uuidCache_s *u;
-
-    uuidcache_init();
-    u = uuidCache;
-    while (u) {
-        printf("%s:", u->device);
-        if (u->label[0])
-            printf(" LABEL=\"%s\"", u->label);
-        if (u->uc_uuid[0])
-            printf(" UUID=\"%s\"", u->uc_uuid);
+void display_uuid_cache(int scan_devices)
+{
+    struct uuidCache_s *uc;
+
+    uc = uuidcache_init(scan_devices);
+    while (uc) {
+        printf("%s:", uc->device);
+        if (uc->label[0])
+            printf(" LABEL=\"%s\"", uc->label);
+        if (uc->uc_uuid[0])
+            printf(" UUID=\"%s\"", uc->uc_uuid);
+#if ENABLE_FEATURE_BLKID_TYPE
+    if (uc->type)
+        printf(" TYPE=\"%s\"", uc->type);
+#endif
         bb_putchar('\n');
-        u = u->next;
-    }
-}
+        uc = uc->next;
+    }
+}
+
+int add_to_uuid_cache(const char *device)
+{
+    char *uuid = uuid; /* for compiler */
+    char *label = label;
+#if ENABLE_FEATURE_BLKID_TYPE
+    const char *type = type;
+#endif
+    int fd;
+
+    fd = open(device, O_RDONLY);
+    if (fd < 0)
+        return 0;
+
+    /* get_label_uuid() closes fd in all cases (success & failure) */
+    if (get_label_uuid(fd, &label, &uuid, &type) == 0) {
+        /* uuidcache_addentry() takes ownership of all four params */
+        uuidcache_addentry(xstrdup(device), /*ma, mi,*/ label, uuid, type);
+        return 1;
+    }
+    return 0;
+}
+
 
 /* Used by mount and findfs */
@@ -235 +269 @@
     struct uuidCache_s *uc;
 
-    uuidcache_init();
-    uc = uuidCache;
+    uc = uuidcache_init(/*scan_devices:*/ 1);
     while (uc) {
         if (uc->label[0] && strcmp(spec, uc->label) == 0) {
@@ -250 +283 @@
     struct uuidCache_s *uc;
 
-    uuidcache_init();
-    uc = uuidCache;
+    uc = uuidcache_init(/*scan_devices:*/ 1);
     while (uc) {
         /* case of hex numbers doesn't matter */