Changeset 98717 in vbox for trunk/src/VBox/Main/src-helper-apps

Timestamp:

Feb 24, 2023 11:04:07 AM (2 years ago)

Author:

vboxsync

Message:

Main/VBoxVolInfo: Don't link directly against libdevmapper but use the IPRT runtime loader to get rid of the buildtime dependency, bugref:10367

Location:

trunk/src/VBox/Main/src-helper-apps/VBoxVolInfo

Files:

• . (added)
• Makefile.kmk (added)
• VBoxVolInfo.cpp (moved) (moved from trunk/src/VBox/Main/src-helper-apps/VBoxVolInfo.cpp ) (4 diffs)
• libdevmapper-calls.h (added)
• libdevmapper.cpp (added)
• libdevmapper.h (added)

trunk/src/VBox/Main/src-helper-apps/VBoxVolInfo/VBoxVolInfo.cpp

@@ -32 +32 @@
 *********************************************************************************************************************************/
 #include <dirent.h>
-extern "C"
-{
-#define private privatekw
-#include <libdevmapper.h>
-}
 #include <stdio.h>
 #include <sys/types.h>
@@ -42 +37 @@
 #include <unistd.h>
 
+#include <VBox/err.h>
+
+#include "libdevmapper.h"
 
 /*********************************************************************************************************************************
-*   Function Prototypes                                                                                                          *
+*   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-void print_dev_name(dev_t devid);
+
+/*
+ * Looks up device name by id using /dev directory. Prints it to stdout.
+ */
+static void print_dev_name(dev_t devid)
+{
+    char path[PATH_MAX];
+    struct dirent *de;
+    DIR *dir = opendir("/dev");
+
+    while ((de = readdir(dir)) != NULL)
+    {
+        struct stat st;
+        snprintf(path, sizeof(path), "/dev/%s", de->d_name);
+        if (!stat(path, &st))
+            if (S_ISBLK(st.st_mode))
+                if (devid == st.st_rdev)
+                {
+                    puts(de->d_name);
+                    break;
+                }
+    }
+    closedir(dir);
+}
+
 
 /*
@@ -59 +81 @@
     {
         fprintf(stderr, "USAGE: %s <volume_name>\n", argv[0]);
+        return 1;
+    }
+
+    int vrc = RTDevmapperLoadLib();
+    if (RT_FAILURE(vrc))
+    {
+        fprintf(stderr, "%s: libdevmapper library not found.  Service not available.\n", argv[0]);
         return 1;
     }
@@ -82 +111 @@
     return 0;
 }
-
-/*
- * Looks up device name by id using /dev directory. Prints it to stdout.
- */
-void print_dev_name(dev_t devid)
-{
-    char path[PATH_MAX];
-    struct dirent *de;
-    DIR *dir = opendir("/dev");
-
-    while ((de = readdir(dir)) != NULL)
-    {
-        struct stat st;
-        snprintf(path, sizeof(path), "/dev/%s", de->d_name);
-        if (!stat(path, &st))
-            if (S_ISBLK(st.st_mode))
-                if (devid == st.st_rdev)
-                {
-                    puts(de->d_name);
-                    break;
-                }
-    }
-    closedir(dir);
-}