Changeset 75293 in vbox for trunk/src/VBox/Additions/darwin/VBoxSF/mount.vboxsf.cpp

Timestamp:

Nov 6, 2018 4:15:09 PM (7 years ago)

Author:

vboxsync

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

126398

Message:

add/darwin/VBoxSF: More renaming, header separation and cleaning up.

File:

• trunk/src/VBox/Additions/darwin/VBoxSF/mount.vboxsf.cpp (moved) (moved from trunk/src/VBox/Additions/darwin/VBoxSF/mount.vboxsf.c ) (2 diffs)

trunk/src/VBox/Additions/darwin/VBoxSF/mount.vboxsf.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBoxVFS - mount tool.
+ * VBoxSF - Darwin Shared Folders, Mount Utility.
  */
 
 /*
- * Copyright (C) 2013-2017 Oracle Corporation
+ * Copyright (C) 2013-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
+#include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
-#include <stdlib.h>
 #include <sys/mount.h>
-#include <errno.h>
-#include <string.h>
 
-#include "vboxvfs.h"
+#include "VBoxSFMount.h"
+#include <iprt/string.h>
 
-static char *progname;
 
-static void
-usage(void)
+static RTEXITCODE usage(const char *pszArg0)
 {
-    fprintf(stderr, "usage: %s [OPTIONS] <shared folder name> "
-                    "<mount point>\n", progname);
-    exit(1);
+    fprintf(stderr, "usage: %s [OPTIONS] <shared folder name> <mount point>\n", pszArg0);
+    return RTEXITCODE_SYNTAX;
 }
 
-int
-main(int argc, char *argv[])
+
+int main(int argc, char **argv)
 {
-    int                         rc;
-    int                         c;
-    char                       *sShareName;
-    char                       *sMountPoint;
-    struct vboxvfs_mount_info   mnt_info;
-
-    /* Set program name */
-    progname = argv[0];
-
-    /* Parse command line */
-    while((c = getopt(argc, argv, "o:")) != -1)
+    /*
+     * Skip past parameters.
+     */
+    int c;
+    while ((c = getopt(argc, argv, "o:")) != -1)
     {
-        switch(c)
+        switch (c)
         {
-            case 'o': break;
-            default : usage();
+            case 'o':
+                break;
+            default:
+                return usage(argv[0]);
         }
     }
 
     /* Two arguments are rquired: <share name> and <mount point> */
-    if ((argc - optind) != 2)
-        usage();
+    if (argc - optind != 2)
+        return usage(argv[0]);
+    const char * const pszFolder     = argv[optind++];
+    const char * const pszMountPoint = argv[optind];
 
-    sShareName = argv[optind++];
-    sMountPoint = argv[optind];
-
-    if (strlen(sShareName) > MAXPATHLEN)
+    /*
+     * Check that the folder is within bounds and doesn't include any shady characters.
+     */
+    size_t cchFolder = strlen(pszFolder);
+    if (   cchFolder < 1
+        || cchFolder >= RT_SIZEOFMEMB(VBOXSFDRWNMOUNTINFO, szFolder)
+        || strpbrk(pszFolder, "\\/") != NULL)
     {
-        fprintf(stderr, "Specified Shared Folder name too long\n");
-        return EINVAL;
+        fprintf(stderr, "Invalid shared folder name '%s'!\n", pszFolder);
+        return RTEXITCODE_FAILURE;
     }
 
-    mnt_info.magic = VBOXVFS_MOUNTINFO_MAGIC;
-    strcpy(mnt_info.name, sShareName);
+    /*
+     * Do the mounting.
+     */
+    VBOXSFDRWNMOUNTINFO MntInfo;
+    RT_ZERO(MntInfo);
+    MntInfo.u32Magic = VBOXSFDRWNMOUNTINFO_MAGIC;
+    memcpy(MntInfo.szFolder, pszFolder, cchFolder);
+    int rc = mount(VBOXSF_DARWIN_FS_NAME, pszMountPoint, 0, &MntInfo);
+    if (rc == 0)
+        return 0;
 
-    rc = mount(VBOXVBFS_NAME, sMountPoint, 0, &mnt_info);
-    if (rc)
-    {
-        fprintf(stderr,
-                "Unable to mount shared folder (%s) '%s' to '%s': %s\n",
-                VBOXVBFS_NAME,
-                mnt_info.name,
-                sMountPoint,
-                strerror(errno));
-        return 1;
-    }
-
-    return 0;
+    fprintf(stderr, "error mounting '%s' at '%s': %s (%d)\n", pszFolder, pszMountPoint, strerror(errno), errno);
+    return RTEXITCODE_FAILURE;
 }