Changeset 49039 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Oct 10, 2013 6:27:32 PM (12 years ago)

Author:

vboxsync

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

89816

Message:

IPRT: Filename extension versus suffix cleanup, long overdue.

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImpl.cpp (modified) (1 diff)
• ApplianceImplExport.cpp (modified) (5 diffs)
• ApplianceImplImport.cpp (modified) (8 diffs)
• MachineImpl.cpp (modified) (2 diffs)
• MachineImplCloneVM.cpp (modified) (3 diffs)

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

@@ -788 +788 @@
         RTPathStripFilename(tmpDir);;
         char *tmpFile = RTStrDup(RTPathFilename(aName.c_str()));
-        RTPathStripExt(tmpFile);
-        const char *tmpExt = RTPathExt(aName.c_str());
-        RTStrAPrintf(&tmpName, "%s%c%s_%d%s", tmpDir, RTPATH_DELIMITER, tmpFile, i, tmpExt);
+        RTPathStripSuffix(tmpFile);
+        const char *pszTmpSuff = RTPathSuffix(aName.c_str());
+        RTStrAPrintf(&tmpName, "%s%c%s_%d%s", tmpDir, RTPATH_DELIMITER, tmpFile, i, pszTmpSuff);
         RTStrFree(tmpFile);
         RTStrFree(tmpDir);

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

@@ -352 +352 @@
                 if (FAILED(rc)) throw rc;
 
-                Utf8Str strTargetName = Utf8Str(locInfo.strPath).stripPath().stripExt();
+                Utf8Str strTargetName = Utf8Str(locInfo.strPath).stripPath().stripSuffix();
                 strTargetVmdkName = Utf8StrFmt("%s-disk%d.vmdk", strTargetName.c_str(), ++pAppliance->m->cDisks);
                 if (strTargetVmdkName.length() > RTTAR_NAME_MAX)
@@ -388 +388 @@
                 if (FAILED(rc)) throw rc;
 
-                Utf8Str strTargetName = Utf8Str(locInfo.strPath).stripPath().stripExt();
+                Utf8Str strTargetName = Utf8Str(locInfo.strPath).stripPath().stripSuffix();
                 strTargetVmdkName = Utf8StrFmt("%s-disk%d.iso", strTargetName.c_str(), ++pAppliance->m->cDisks);
                 if (strTargetVmdkName.length() > RTTAR_NAME_MAX)
@@ -2015 +2015 @@
             Utf8Str strOvaFile = pTask->locInfo.strPath;
             /* Extract the path */
-            Utf8Str strOvfFile = strOvaFile.stripExt().append(".ovf");
+            Utf8Str strOvfFile = strOvaFile.stripSuffix().append(".ovf");
             // Create a memory buffer containing the XML. */
             void *pvBuf = 0;
@@ -2235 +2235 @@
         {
             // Create & write the manifest file
-            Utf8Str strMfFilePath = Utf8Str(pTask->locInfo.strPath).stripExt().append(".mf");
+            Utf8Str strMfFilePath = Utf8Str(pTask->locInfo.strPath).stripSuffix().append(".mf");
             Utf8Str strMfFileName = Utf8Str(strMfFilePath).stripPath();
             pTask->pProgress->SetNextOperation(BstrFmt(tr("Creating manifest file '%s'"), strMfFileName.c_str()).raw(),
@@ -2371 +2371 @@
         if (m->fManifest)
         {
-            Utf8Str strMfFile = Utf8Str(strTmpOvf).stripExt().append(".mf");
+            Utf8Str strMfFile = Utf8Str(strTmpOvf).stripSuffix().append(".mf");
             filesList.push_back(pair<Utf8Str, ULONG>(strMfFile , m->ulWeightForXmlOperation)); /* Use 1% of the total for the manifest file upload */
         }

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

@@ -641 +641 @@
                         /* Figure out from extension which format the image of disk has. */
                         {
-                            char *pszExt = RTPathExt(di.strHref.c_str());
+                            char *pszExt = RTPathSuffix(di.strHref.c_str());
+                            if (pszExt)
+                                pszExt++;
                             /* Get the system properties. */
                             SystemProperties *pSysProps = mVirtualBox->getSystemProperties();
-                            ComObjPtr<MediumFormat> trgFormat = pSysProps->mediumFormatFromExtension(&pszExt[1]);
+                            ComObjPtr<MediumFormat> trgFormat = pSysProps->mediumFormatFromExtension(pszExt);
                             if (trgFormat.isNull())
                             {
@@ -955 +957 @@
             }
 
-            Utf8Str strMfFile = Utf8Str(pTask->locInfo.strPath).stripExt().append(".mf");
+            Utf8Str strMfFile = Utf8Str(pTask->locInfo.strPath).stripSuffix().append(".mf");
 
             SHASTORAGE storage;
@@ -1101 +1103 @@
             }
 
-            Utf8Str extension(RTPathExt(pszFilename));
-
-            if (!extension.endsWith(".ovf",Utf8Str::CaseInsensitive))
+            Utf8Str suffix(RTPathSuffix(pszFilename));
+
+            if (!suffix.endsWith(".ovf",Utf8Str::CaseInsensitive))
             {
                 vrc = VERR_FILE_NOT_FOUND;
@@ -1523 +1525 @@
             throw setError(E_OUTOFMEMORY);
 
-        Utf8Str strMfFile = Utf8Str(pTask->locInfo.strPath).stripExt().append(".mf");
+        Utf8Str strMfFile = Utf8Str(pTask->locInfo.strPath).stripSuffix().append(".mf");
 
         SHASTORAGE storage;
@@ -1573 +1575 @@
             Utf8Str manifestShaDigest = storage.strDigest;
 
-            Utf8Str strCertFile = Utf8Str(pTask->locInfo.strPath).stripExt().append(".cert");
+            Utf8Str strCertFile = Utf8Str(pTask->locInfo.strPath).stripSuffix().append(".cert");
             if (RTFileExists(strCertFile.c_str()))
             {
@@ -1685 +1687 @@
         size_t cbMfSize = 0;
         size_t cbCertSize = 0;
-        Utf8Str strMfFile = (Utf8Str(pszFilename)).stripExt().append(".mf");
-        Utf8Str strCertFile = (Utf8Str(pszFilename)).stripExt().append(".cert");
+        Utf8Str strMfFile = (Utf8Str(pszFilename)).stripSuffix().append(".mf");
+        Utf8Str strCertFile = (Utf8Str(pszFilename)).stripSuffix().append(".cert");
 
         /* Skip the OVF file, cause this was read in IAppliance::Read already. */
@@ -2299 +2301 @@
                 Utf8Str strTempTargetFilename(*strTargetPath);
                 strTempTargetFilename = strTempTargetFilename.stripPath();
-                strTempTargetFilename = strTempTargetFilename.stripExt();
+                strTempTargetFilename = strTempTargetFilename.stripSuffix();
                 Utf8Str vdf = typeOfVirtualDiskFormatFromURI(di.strFormat);
 
@@ -2337 +2339 @@
             Utf8Str strTrgFormat = "VMDK";
             ULONG lCabs = 0;
-            char *pszExt = NULL;
-
-            if (RTPathHaveExt(strTargetPath->c_str()))
-            {
-                pszExt = RTPathExt(strTargetPath->c_str());
+
+            if (RTPathHasSuffix(strTargetPath->c_str()))
+            {
+                const char *pszSuff = RTPathSuffix(strTargetPath->c_str());
                 /* Figure out which format the user like to have. Default is VMDK. */
-                ComObjPtr<MediumFormat> trgFormat = pSysProps->mediumFormatFromExtension(&pszExt[1]);
+                ComObjPtr<MediumFormat> trgFormat = pSysProps->mediumFormatFromExtension(&pszSuff[1]);
                 if (trgFormat.isNull())
                     throw setError(VBOX_E_NOT_SUPPORTED,

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

@@ -7911 +7911 @@
 
     strFile = mData->m_strConfigFileFull;       // path/to/machinesfolder/vmname/vmname.vbox
-    strFile.stripExt();                         // path/to/machinesfolder/vmname/vmname
+    strFile.stripSuffix();                      // path/to/machinesfolder/vmname/vmname
     strFile.append(".webm");                    // path/to/machinesfolder/vmname/vmname.webm
 }
@@ -11974 +11974 @@
     Utf8Str strConfigFileOnly(mData->m_strConfigFileFull);  // path/to/machinesfolder/vmname/vmname.vbox
     strConfigFileOnly.stripPath()                           // vmname.vbox
-                     .stripExt();                           // vmname
+                     .stripSuffix();                        // vmname
     /** @todo hack, make somehow use of ComposeMachineFilename */
     if (mUserData->s.fDirectoryIncludesUUID)

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

@@ -1134 +1134 @@
                             if (!mt.strBaseName.isEmpty())
                                 strSrcTest = mt.strBaseName;
-                            strSrcTest.stripExt();
+                            strSrcTest.stripSuffix();
                             /* If the old disk name was in {uuid} format we also
                              * want the new name in this format, but with the
@@ -1142 +1142 @@
                              * template: "new name-disk1.vdi". */
                             if (strSrcTest == strOldVMName)
-                                strNewName = Utf8StrFmt("%s%s", trgMCF.machineUserData.strName.c_str(), RTPathExt(Utf8Str(bstrSrcName).c_str()));
+                                strNewName = Utf8StrFmt("%s%s", trgMCF.machineUserData.strName.c_str(), RTPathSuffix(Utf8Str(bstrSrcName).c_str()));
                             else if (   strSrcTest.startsWith("{")
                                      && strSrcTest.endsWith("}"))
@@ -1150 +1150 @@
                                 Guid temp_guid(strSrcTest);
                                 if (temp_guid.isValid() && !temp_guid.isZero())
-                                    strNewName = Utf8StrFmt("%s%s", newId.toStringCurly().c_str(), RTPathExt(strNewName.c_str()));
+                                    strNewName = Utf8StrFmt("%s%s", newId.toStringCurly().c_str(), RTPathSuffix(strNewName.c_str()));
                             }
                             else
-                                strNewName = Utf8StrFmt("%s-disk%d%s", trgMCF.machineUserData.strName.c_str(), ++cDisks, RTPathExt(Utf8Str(bstrSrcName).c_str()));
+                                strNewName = Utf8StrFmt("%s-disk%d%s", trgMCF.machineUserData.strName.c_str(), ++cDisks,
+                                                        RTPathSuffix(Utf8Str(bstrSrcName).c_str()));
                         }