Changeset 80774 in vbox for trunk/src/VBox/ImageMounter

Timestamp:

Sep 13, 2019 11:17:18 AM (5 years ago)

Author:

vboxsync

Message:

vboximg-mount: Drop compile time depedency on libfuse/libosxfuse and use the IPRT runtime loader to resolve the required methods dynamically

Location:

trunk/src/VBox/ImageMounter/vboximg-mount

Files:

• Makefile.kmk (modified) (2 diffs)
• fuse-calls.h (added)
• fuse.cpp (added)
• fuse.h (added)
• vboximg-mount.cpp (modified) (4 diffs)

trunk/src/VBox/ImageMounter/vboximg-mount/Makefile.kmk

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-ifeq ($(KBUILD_TARGET),darwin)
- VBOX_PATH_FUSE ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/osxfuse/v*)))
- ifneq ($(VBOX_PATH_FUSE),)
-  LIB_FUSE     := $(VBOX_PATH_FUSE)/lib/libosxfuse.dylib
-  LIBPATH_FUSE := $(VBOX_PATH_FUSE)/lib
-  FUSE_INCS    := $(VBOX_PATH_FUSE)/include/osxfuse
- else
-  LIB_FUSE     := /usr/local/lib/libosxfuse.dylib
-  LIBPATH_FUSE := /usr/local/lib
-  FUSE_INCS    := /usr/local/include/osxfuse \
-        /usr/local/include
- endif
-else
- LIB_FUSE := fuse
- FUSE_INCS := /usr/include
-endif
-
 #
 # vboximg-mount - Disk Image Flatting FUSE Program.
@@ -53 +36 @@
     vboximgMedia.h \
     vboximgOpts.h \
-    SelfSizingTable.h
+    SelfSizingTable.h \
+    fuse.cpp
 
 vboximg-mount_LIBS = \
         $(LIB_DDU) \
-        $(LIB_RUNTIME) \
-        $(LIB_FUSE)
-
-vboximg-mount_INCS = $(FUSE_INCS)
-#vboximg-mount_CXXFLAGS.darwin = -std=c++11
+        $(LIB_RUNTIME)
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/ImageMounter/vboximg-mount/vboximg-mount.cpp

@@ -29 +29 @@
 #endif
 #define MAX_READERS (INT32_MAX / 32)
-#include <fuse.h>
 #ifdef UNIX_DERIVATIVE
 #include <errno.h>
@@ -80 +79 @@
 #include <iprt/time.h>
 
+#include "fuse.h"
 #include "vboximgCrypto.h"
 #include "vboximgMedia.h"
@@ -934 +934 @@
         return RTMsgErrorExitFailure("VDInit failed, rc=%Rrc\n", rc);
 
+    rc = RTFuseLoadLib();
+    if (RT_FAILURE(rc))
+        return RTMsgErrorExitFailure("Failed to load the fuse library, rc=%Rrc\n", rc);
+
     memset(&g_vboximgOps, 0, sizeof(g_vboximgOps));
     g_vboximgOps.open        = vboximgOp_open;
@@ -1330 +1334 @@
         RTPrintf("\nvboximg-mount: Going into background...\n");
 
-    rc = fuse_main(args.argc, args.argv, &g_vboximgOps, NULL);
+    rc = fuse_main_real(args.argc, args.argv, &g_vboximgOps, sizeof(g_vboximgOps), NULL);
 
     int rc2 = RTVfsFileRelease(g_hVfsFileDisk);