Changeset 35010 in vbox

Timestamp:

Dec 13, 2010 1:51:20 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68837

Message:

VBoxService/AutoMount: Use different mtab location on Solaris.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceAutoMount.cpp (modified) (3 diffs)
• VBoxServiceControlExec.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp

@@ -54 +54 @@
 
 #ifndef _PATH_MOUNTED
- #define _PATH_MOUNTED "/etc/mtab"
+ #ifdef RT_OS_SOLARIS
+  #define _PATH_MOUNTED         "/etc/mnttab"
+ #else
+  #define _PATH_MOUNTED         "/etc/mtab"
+ #endif
 #endif
 
@@ -110 +114 @@
     FILE *pFh = fopen(_PATH_MOUNTED, "r");
     if (!pFh)
-        VBoxServiceError("VBoxServiceAutoMountShareIsMounted: Could not open mtab!\n");
+        VBoxServiceError("VBoxServiceAutoMountShareIsMounted: Could not open mount tab \"%s\"!\n",
+                         _PATH_MOUNTED);
     else
     {
@@ -128 +133 @@
     FILE *pFh = setmntent(_PATH_MOUNTED, "r+t");
     if (pFh == NULL)
-        VBoxServiceError("VBoxServiceAutoMountShareIsMounted: Could not open mtab!\n");
+        VBoxServiceError("VBoxServiceAutoMountShareIsMounted: Could not open mount tab \"%s\"!\n",
+                         _PATH_MOUNTED);
     else
     {

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

@@ -104 +104 @@
     {
         size_t cbToWrite = pStdInBuf->cbSize - pStdInBuf->cbOffset;
-        cbToWrite = RT_MIN(cbToWrite, _1M);
+        cbToWrite = RT_MIN(cbToWrite, _64K);
         *pfClose = false;
         if (cbToWrite && pStdInBuf->fAlive)
@@ -1722 +1722 @@
             AssertPtr(pData);
 
-            const uint32_t cbSize = _1M;
+            const uint32_t cbSize = _64K;
             uint32_t cbRead = cbSize;
             uint8_t *pBuf = (uint8_t*)RTMemAlloc(cbSize);