Changeset 69718 in vbox for trunk/src/VBox/Runtime/tools

Timestamp:

Nov 16, 2017 2:55:45 PM (7 years ago)

Author:

vboxsync

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

119099

Message:

RTMkDir,nt/RTDirRelDirCreate: Some adjustments.

File:

• trunk/src/VBox/Runtime/tools/RTMkDir.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/tools/RTMkDir.cpp

@@ -52 +52 @@
     /** Whether to always use the VFS chain API (for testing). */
     bool        fAlwaysUseChainApi;
+    /** Directory creation flags (RTDIRCREATE_FLAGS_XXX).   */
+    uint32_t    fCreateFlags;
     /** The directory mode. */
     RTFMODE     fMode;
-    /** The mode to apply to parent directories we create. */
-    RTFMODE     fParentMode;
 } RTCMDMKDIROPTS;
 
@@ -174 +174 @@
 
                     /* Not found, so try create it. */
-                    rc = RTVfsDirCreateDir(hVfsCurDir, pszFinalPath, ch == '\0' ? pOpts->fMode : pOpts->fParentMode,
-                                           0 /*fFlags*/, &hVfsNextDir);
+                    rc = RTVfsDirCreateDir(hVfsCurDir, pszFinalPath, pOpts->fMode, pOpts->fCreateFlags, &hVfsNextDir);
                     if (rc == VERR_ALREADY_EXISTS)
                         continue; /* We lost a creation race, try again. */
@@ -257 +256 @@
         { "--parents",                  'p', RTGETOPT_REQ_NOTHING },
         { "--always-use-vfs-chain-api", 'A', RTGETOPT_REQ_NOTHING },
+        { "--allow-content-indexing",   'i', RTGETOPT_REQ_NOTHING },
         { "--verbose",                  'v', RTGETOPT_REQ_NOTHING },
     };
@@ -267 +267 @@
 
     RTCMDMKDIROPTS Opts;
-    Opts.fVerbose           = false;
-    Opts.fParents           = false;
-    Opts.fAlwaysUseChainApi = false;
-    Opts.fMode              = 0775 | RTFS_TYPE_DIRECTORY | RTFS_DOS_DIRECTORY;
-    Opts.fParentMode        = 0775 | RTFS_TYPE_DIRECTORY | RTFS_DOS_DIRECTORY;
+    Opts.fVerbose               = false;
+    Opts.fParents               = false;
+    Opts.fAlwaysUseChainApi     = false;
+    Opts.fCreateFlags           = RTDIRCREATE_FLAGS_NOT_CONTENT_INDEXED_NOT_CRITICAL | RTDIRCREATE_FLAGS_NOT_CONTENT_INDEXED_SET;
+    Opts.fMode                  = 0775 | RTFS_TYPE_DIRECTORY | RTFS_DOS_DIRECTORY;
 
     RTGETOPTUNION ValueUnion;
@@ -281 +281 @@
             case 'm':
                 /** @todo DOS+NT attributes and symbolic notation. */
-                Opts.fMode       &= ~07777;
-                Opts.fMode       |= ValueUnion.u32 & 07777;
-                Opts.fParentMode &= ~07777;
-                Opts.fParentMode |= ValueUnion.u32 & 07777;
+                Opts.fMode &= ~07777;
+                Opts.fMode |= ValueUnion.u32 & 07777;
                 break;
 
@@ -298 +296 @@
                 Opts.fAlwaysUseChainApi = true;
                 break;
+
+            case 'i':
+                Opts.fCreateFlags &= ~RTDIRCREATE_FLAGS_NOT_CONTENT_INDEXED_SET;
+                Opts.fCreateFlags |= RTDIRCREATE_FLAGS_NOT_CONTENT_INDEXED_DONT_SET;
+                break;
+
             case 'h':
-                RTPrintf("Usage: %s [-pv] [-m|--mode <mode>] <dir> [..]\n", papszArgs[0]);
+                RTPrintf("Usage: %s [options] <dir> [..]\n"
+                         "\n"
+                         "Options:\n"
+                         "  -m <mode>, --mode <mode>\n"
+                         "      The creation mode. Default is 0775.\n"
+                         "  -p, --parent\n"
+                         "      Create parent directories too. Ignore any existing directories.\n"
+                         "  -v, --verbose\n"
+                         "      Tell which directories get created.\n"
+                         "  -A, --always-use-vfs-chain-api\n"
+                         "      Always use the VFS API.\n"
+                         "  -i, --allow-content-indexing\n"
+                         "      Don't set flags to disable context indexing on windows.\n"
+                         , papszArgs[0]);
                 return RTEXITCODE_SUCCESS;