Changeset 25023 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 26, 2009 4:11:44 PM (15 years ago)

Author:

vboxsync

Message:

Additions/linux/mount.vboxsf: work around mounts failing if a file of the same name as the share exists in the current directory

File:

• trunk/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c (modified) (1 diff)

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

@@ -562 +562 @@
     if (err == -1 && errno == EPROTO)
     {
+        /* Sometimes the mount utility messes up the share name.  Try to
+         * un-mangle it again. */
+        char szCWD[4096];
+        size_t cchCWD;
+        if (!getcwd(szCWD, sizeof(szCWD)))
+            panic_err("%s: failed to get the current working directory", argv[0]);
+        cchCWD = strlen(szCWD);
+        if (!strncmp(host_name, szCWD, cchCWD))
+        {
+            while (host_name[cchCWD] == '/')
+                ++cchCWD;
+            /* We checked before that we have enough space */
+            strcpy (mntinf.name, host_name + cchCWD);
+        }
+        err = mount (NULL, mount_point, "vboxsf", flags, &mntinf);
+    }
+    if (err == -1 && errno == EPROTO)
+    {
         /* New mount tool with old vboxsf module? Try again using the old
          * vbsf_mount_info_old structure. */