Changeset 40156 in vbox for trunk/src

Timestamp:

Feb 16, 2012 4:31:01 PM (13 years ago)

Author:

vboxsync

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

76309

Message:

Main and FE/Qt: do not put slashes, control characters and a few others into VM file names by default. Policy adjustment.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)
• Main/src-server/VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -314 +314 @@
     /* Get machine directory: */
     QString strMachineFolder = fileInfo.absolutePath();
-    QString strMachineBaseName = fileInfo.baseName();
+    QString strMachineBaseName = fileInfo.completeBaseName();
 
     /* Try to create this machine directory (and it's predecessors): */

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -1331 +1331 @@
      * characters which need UTF-16 surrogate pairs for Windows's benefit. */
     RTUNICP aCpSet[] =
-        { ' ', ' ', '(', ')', '-', '-', '0', '9', 'A', 'Z', 'a', 'z', '_', '_',
+        { ' ', ' ', '(', ')', '-', '.', '0', '9', 'A', 'Z', 'a', 'z', '_', '_',
           0xa0, 0xd7af, '\0' };
-    Assert(RTStrPurgeComplementSet(strName.mutableRaw(), aCpSet, '_') > 0);
+    char *pszName = strName.mutableRaw();
+    Assert(RTStrPurgeComplementSet(pszName, aCpSet, '_') > 0);
+    /* No leading dot or dash. */
+    if (pszName[0] == '.' || pszName[0] == '-')
+        pszName[0] = '_';
+    /* No trailing dot. */
+    if (pszName[strName.length() - 1] == '.')
+        pszName[strName.length() - 1] = '_';
+    /* Mangle leading and trailing spaces. */
+    for (size_t i = 0; pszName[i] == ' '; ++i)
+       pszName[i] = '_';
+    for (size_t i = strName.length() - 1; i && pszName[i] == ' '; --i)
+       pszName[i] = '_';
+
     if (strBase.isEmpty())
         /* we use the non-full folder value below to keep the path relative */