儲存庫 vbox 的更動 58717

時間撮記:

2015-11-17 上午09:11:03 (9 年 以前)

作者:

vboxsync

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

104145

訊息:

Additions/linux/sharedfolders: pass the share name as parameter to mount so that /proc/mounts shows it instead of 'none' (thanks DuPingping!)

位置:

trunk/src/VBox/Additions

檔案:

• common/VBoxService/VBoxServiceAutoMount.cpp (修改) (3 筆差異)
• linux/sharedfolders/mount.vboxsf.c (修改) (3 筆差異)

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

@@ -342 +342 @@
         strcpy(mntinf.nls_name, "\0");
 
-        int r = mount(NULL,
+        int r = mount(pszShareName,
                       pszMountPoint,
                       "vboxsf",
@@ -403 +403 @@
                     strcpy(mntinf.name, pszMountPoint + cchCWD);
                 }
-                r = mount(NULL, pszMountPoint, "vboxsf", fFlags, &mntinf);
+                r = mount(mntinf.name, pszMountPoint, "vboxsf", fFlags, &mntinf);
             }
             if (errno == EPROTO)
@@ -417 +417 @@
                 mntinf_old.gid = mntinf.gid;
                 mntinf_old.ttl = mntinf.ttl;
-                r = mount(NULL, pszMountPoint, "vboxsf", fFlags, &mntinf_old);
+                r = mount(mntinf_old.name, pszMountPoint, "vboxsf", fFlags, &mntinf_old);
             }
             if (r == -1) /* Was there some error from one of the tries above? */

trunk/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c

@@ -483 +483 @@
      *       to keep this code here slick without having VbglR3.
      */
-    err = mount(NULL, mount_point, "vboxsf", flags, &mntinf);
+    err = mount(host_name, mount_point, "vboxsf", flags, &mntinf);
     if (err == -1 && errno == EPROTO)
     {
@@ -500 +500 @@
             strcpy(mntinf.name, host_name + cchCWD);
         }
-        err = mount(NULL, mount_point, "vboxsf", flags, &mntinf);
+        err = mount(host_name, mount_point, "vboxsf", flags, &mntinf);
     }
     if (err == -1 && errno == EPROTO)
@@ -512 +512 @@
         mntinf_old.gid = mntinf.gid;
         mntinf_old.ttl = mntinf.ttl;
-        err = mount(NULL, mount_point, "vboxsf", flags, &mntinf_old);
+        err = mount(host_name, mount_point, "vboxsf", flags, &mntinf_old);
     }
     if (err)