1 files changed, 27 insertions, 30 deletions

diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index 7c9930543..230102d89 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -114,12 +114,12 @@ uuidcache_check_device(const char *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
          * and /proc/sys/dev/cdrom/info here.
@@ -131,12 +131,14 @@ uuidcache_init(void)
          * This is unacceptably complex. Let's just scan /dev.
          * (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;
 }
 
 #define UUID   1
@@ -148,9 +150,7 @@ get_spec_by_x(int n, const char *t, int *majorPtr, int *minorPtr)
 {
         struct uuidCache_s *uc;
 
-        uuidcache_init();
-        uc = uuidCache;
-
+        uc = uuidcache_init(/*scan_devices:*/ 1);
         while (uc) {
                 switch (n) {
                 case UUID:
@@ -215,24 +215,23 @@ get_spec_by_volume_label(const char *s, int *major, int *minor)
 #endif // UNUSED
 
 /* Used by blkid */
-void display_uuid_cache(void)
+void display_uuid_cache(int scan_devices)
 {
-        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);
+        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 (u->type)
-                printf(" TYPE=\"%s\"", u->type);
+        if (uc->type)
+                printf(" TYPE=\"%s\"", uc->type);
 #endif
                 bb_putchar('\n');
-                u = u->next;
+                uc = uc->next;
         }
 }
 
@@ -265,8 +264,7 @@ char *get_devname_from_label(const char *spec)
 {
         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) {
                         return xstrdup(uc->device);
@@ -280,8 +278,7 @@ char *get_devname_from_uuid(const char *spec)
 {
         struct uuidCache_s *uc;
 
-        uuidcache_init();
-        uc = uuidCache;
+        uc = uuidcache_init(/*scan_devices:*/ 1);
         while (uc) {
                 /* case of hex numbers doesn't matter */
                 if (strcasecmp(spec, uc->uc_uuid) == 0) {