Changeset 23052 in vbox for trunk/src

Timestamp:

Sep 16, 2009 8:28:05 AM (15 years ago)

Author:

vboxsync

Message:

VBoxFUSE: make it build and work on Linux

Location:

trunk/src/VBox/ImageMounter/VBoxFUSE

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxFUSE.cpp (modified) (8 diffs)

trunk/src/VBox/ImageMounter/VBoxFUSE/Makefile.kmk

@@ -54 +54 @@
         $(LIB_RUNTIME)
 VBoxFUSE_LIBS.darwin = fuse
+VBoxFUSE_LIBS.linux = fuse
 VBoxFUSE_LIBPATHS.darwin = /usr/local/lib
 

trunk/src/VBox/ImageMounter/VBoxFUSE/VBoxFUSE.cpp

@@ -27 +27 @@
 #include <iprt/types.h>
 
-#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
+#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
 # include <sys/param.h>
 # undef PVM     /* Blasted old BSD mess still hanging around darwin. */
@@ -41 +41 @@
 //#  define EDOOFUS EXYZ
 # else
-#  error "Choose an unlikely and (if possible) fun error number for EDOOFUS."
+#  define EDOOFUS 0xfad8484d
 # endif
 #endif
@@ -338 +338 @@
     pStat->st_blocks    = (pNode->cbPrimary + DEV_BSIZE - 1) / DEV_BSIZE;
     pStat->st_blksize   = 0x1000;           /* ignored */
+#ifndef RT_OS_LINUX
     pStat->st_flags     = 0;
     pStat->st_gen       = 0;
+#endif
 }
 
@@ -520 +522 @@
      */
     char *pszFormat;
-    rc = VDGetFormat(pszImage, &pszFormat);
+    rc = VDGetFormat(NULL /* pVDIIfsDisk */, pszImage, &pszFormat);
     if (RT_FAILURE(rc))
     {
@@ -1003 +1005 @@
     if (pInfo->flags & (O_APPEND | O_NONBLOCK | O_SYMLINK | O_NOCTTY | O_SHLOCK | O_EXLOCK | O_ASYNC
                         | O_CREAT | O_TRUNC | O_EXCL | O_EVTONLY))
+        return -EINVAL;
+    if ((pInfo->flags & O_ACCMODE) == O_ACCMODE)
+        return -EINVAL;
+#elif defined(RT_OS_LINUX)
+    if (pInfo->flags & (  O_APPEND | O_ASYNC | O_DIRECT /* | O_LARGEFILE ? */
+                        | O_NOATIME | O_NOCTTY | O_NOFOLLOW | O_NONBLOCK
+                        /* | O_SYNC ? */))
         return -EINVAL;
     if ((pInfo->flags & O_ACCMODE) == O_ACCMODE)
@@ -1152 +1161 @@
     AssertReturn((unsigned)cbBuf == cbBuf, -EINVAL);
     AssertReturn(offFile >= 0, -EINVAL);
-    AssertReturn(offFile + cbBuf >= offFile, -EINVAL);
+    AssertReturn(offFile + (ssize_t)cbBuf >= offFile, -EINVAL);
 
     PVBOXFUSENODE pNode = (PVBOXFUSENODE)(uintptr_t)pInfo->fh;
@@ -1168 +1177 @@
 
             int rc;
-            if (offFile + cbBuf < offFile)
+            if (offFile + (ssize_t)cbBuf < offFile)
                 rc = -EINVAL;
             else if (offFile >= pFlatImage->Node.cbPrimary)
@@ -1177 +1186 @@
             {
                 /* Adjust for EOF. */
-                if (offFile + cbBuf >= pFlatImage->Node.cbPrimary)
+                if (offFile + (ssize_t)cbBuf >= pFlatImage->Node.cbPrimary)
                     cbBuf = pFlatImage->Node.cbPrimary - offFile;