Changeset 34570 in vbox

Timestamp:

Dec 1, 2010 1:33:49 PM (14 years ago)

Author:

vboxsync

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

68364

Message:

ExtPackUtil.cpp: The underscore=space trick.

File:

• trunk/src/VBox/Main/ExtPackUtil.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ExtPackUtil.cpp

@@ -245 +245 @@
      * Skip ahead to the filename part and count the number of characters
      * that matches the criteria for a extension pack name.
+     *
+     * Trick: '_' == ' ' - filenames with spaces cause trouble.
      */
     const char *pszSrc = RTPathFilename(pszTarball);
@@ -251 +253 @@
 
     size_t off = 0;
-    while (RT_C_IS_ALNUM(pszSrc[off]) || pszSrc[off] == ' ')
+    while (RT_C_IS_ALNUM(pszSrc[off]) || pszSrc[off] == ' ' || pszSrc[off] == '_')
         off++;
 
@@ -257 +259 @@
      * Check min and max name limits.
      */
-    if (   off > VBOX_EXTPACK_NAME_MIN_LEN
+    if (   off > VBOX_EXTPACK_NAME_MAX_LEN
         || off < VBOX_EXTPACK_NAME_MIN_LEN)
         return NULL;
 
     /*
-     * Make a duplicate of the name and return it.
-     */
-    iprt::MiniString *pStrRet = new iprt::MiniString(pszSrc, off);
-    Assert(VBoxExtPackIsValidName(pStrRet->c_str()));
+     * Replace underscores, duplicate the string and return it.
+     * (Unforuntately, iprt::ministring does not offer simple search & replace.)
+     */
+    char szTmp[VBOX_EXTPACK_NAME_MAX_LEN + 1];
+    memcpy(szTmp, pszSrc, off);
+    szTmp[off] = '\0';
+    char *psz = szTmp;
+    while ((psz = strchr(psz, '_')) != NULL)
+        *psz++ = ' ';
+    Assert(VBoxExtPackIsValidName(szTmp));
+
+    iprt::MiniString *pStrRet = new iprt::MiniString(szTmp, off);
     return pStrRet;
 }