Changeset 50615 in vbox for trunk/src/VBox/Runtime

Timestamp:

Feb 26, 2014 6:29:01 PM (11 years ago)

Author:

vboxsync

Message:

RTDbgSymCache.cpp: Added -o option for overwriting existing cache entries. Some fixes.

File:

• trunk/src/VBox/Runtime/tools/RTDbgSymCache.cpp (modified) (9 diffs)

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

@@ -73 +73 @@
 {
     bool        fRecursive;
+    bool        fOverwriteOnConflict;
     const char *pszFilter;
     const char *pszCache;
@@ -172 +173 @@
 {
     if (!pszCommand || !strcmp(pszCommand, "add"))
-        RTPrintf("Usage: %s add [-rn] <cache-root-dir> <file1> [fileN..]\n", pszArg0);
+        RTPrintf("Usage: %s add [-Rno] <cache-root-dir> <file1> [fileN..]\n", pszArg0);
     return RTEXITCODE_SUCCESS;
 }
@@ -372 +373 @@
         else
             RTMsgInfo("Error comparing '%s' with '%s': %Rrc", pszSrcPath, szDstPath, rc);
-        return rc;
+        if (!pCfg->fOverwriteOnConflict)
+            return rc;
     }
 
@@ -746 +748 @@
         static char const * const s_apszSubBundleDirs[] =
         {
-            "Contents/Plugins",
+            "Contents/Plugins/",
             /** @todo Frameworks ++ */
         };
@@ -752 +754 @@
         {
             pszPath[cchPath + cchName] = '\0';
-            int rc2 = RTPathAppend(pszPath, RTPATH_MAX, s_apszSubBundleDirs[i]);
+            int rc2 = RTPathAppend(pszPath, RTPATH_MAX - 1, s_apszSubBundleDirs[i]);
             if (RT_SUCCESS(rc2))
-                rc2 = rtDbgSymCacheAddDirWorker(pszPath, strlen(pszPath), pDirEntry, pCfg);
+            {
+                if (RTDirExists(pszPath))
+                {
+                    size_t cchPath2 = strlen(pszPath);
+                    if (!RTPATH_IS_SLASH(pszPath[cchPath2 - 1]))
+                    {
+                        pszPath[cchPath2++] = RTPATH_SLASH;
+                        pszPath[cchPath2]   = '\0';
+                    }
+                    rc2 = rtDbgSymCacheAddDirWorker(pszPath, cchPath2, pDirEntry, pCfg);
+                }
+            }
             else
             {
@@ -1087 +1100 @@
  *
  * @returns Program exit code.
- * @param   pszPath         The user supplied path to the file or directory.
- * @param   pszCache        The path to the cache.
- * @param   fRecursive      Whether to process directories recursively.
- */
-static RTEXITCODE rtDbgSymCacheAddFileOrDir(const char *pszPath, const char *pszCache, bool fRecursive)
+ * @param   pszPath                 The user supplied path to the file or directory.
+ * @param   pszCache                The path to the cache.
+ * @param   fRecursive              Whether to process directories recursively.
+ * @param   fOverwriteOnConflict    Whether to overwrite existing cache entry on
+ *                                  conflict, or just leave it.
+ */
+static RTEXITCODE rtDbgSymCacheAddFileOrDir(const char *pszPath, const char *pszCache, bool fRecursive,
+                                            bool fOverwriteOnConflict)
 {
     RTDBGSYMCACHEADDCFG Cfg;
@@ -1166 +1182 @@
     static RTGETOPTDEF const s_aOptions[] =
     {
-        { "--recursive",        'R', RTGETOPT_REQ_NOTHING },
-        { "--no-recursive",     'n', RTGETOPT_REQ_NOTHING },
+        { "--recursive",                'R', RTGETOPT_REQ_NOTHING },
+        { "--no-recursive",             'n', RTGETOPT_REQ_NOTHING },
+        { "--overwrite-on-conflict",    'o', RTGETOPT_REQ_NOTHING },
     };
 
-    const char *pszCache        = NULL;
-    bool        fRecursive      = false;
+    const char *pszCache                = NULL;
+    bool        fRecursive              = false;
+    bool        fOverwriteOnConflict    = false;
 
     RTGETOPTSTATE State;
@@ -1191 +1209 @@
             case 'n':
                 fRecursive = false;
+                break;
+
+            case 'o':
+                fOverwriteOnConflict = true;
                 break;
 
@@ -1210 +1232 @@
                 else
                 {
-                    RTEXITCODE rcExit = rtDbgSymCacheAddFileOrDir(ValueUnion.psz, pszCache, fRecursive);
+                    RTEXITCODE rcExit = rtDbgSymCacheAddFileOrDir(ValueUnion.psz, pszCache, fRecursive, fOverwriteOnConflict);
                     if (rcExit != RTEXITCODE_FAILURE)
                         return rcExit;