Changeset 21077 in vbox for trunk/src/VBox/Main/ApplianceImpl.cpp

Timestamp:

Jun 30, 2009 3:19:12 PM (15 years ago)

Author:

vboxsync

Message:

back out r49329, r49331, will start over

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -26 +26 @@
 #include <iprt/file.h>
 #include <iprt/s3.h>
-#include "iprt/xml_cpp.h"
 
 #include <VBox/param.h>
@@ -40 +39 @@
 
 #include "Logging.h"
+
+#include "VBox/xml.h"
 
 using namespace std;
@@ -233 +234 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
+
+static Utf8Str stripFilename(const Utf8Str &strFile)
+{
+    Utf8Str str2(strFile);
+    RTPathStripFilename(str2.mutableRaw());
+    return str2;
+}
 
 static const struct
@@ -2238 +2246 @@
                     /* The disk image has to be on the same place as the OVF file. So
                      * strip the filename out of the full file path. */
-                    Utf8Str strSrcDir(pAppliance->m->strPath);
-                    strSrcDir.stripFilename();
+                    Utf8Str strSrcDir = stripFilename(pAppliance->m->strPath);
 
                     /* Iterate over all given disk images */
@@ -3515 +3522 @@
             const Utf8Str &strTargetFileNameOnly = pDiskEntry->strOvf;
             // target path needs to be composed from where the output OVF is
-            Utf8Str strTargetFilePath(m->strPath);
-            strTargetFilePath.stripFilename();
+            Utf8Str strTargetFilePath = stripFilename(m->strPath);
             strTargetFilePath.append("/");
             strTargetFilePath.append(strTargetFileNameOnly);
@@ -3715 +3721 @@
                 const Utf8Str &strTargetFileNameOnly = (*itH)->strOvf;
                 /* Target path needs to be composed from where the output OVF is */
-                Utf8Str strTargetFilePath(m->strPath);
-                strTargetFilePath.stripFilename();
+                Utf8Str strTargetFilePath = stripFilename(m->strPath);
                 strTargetFilePath.append("/");
                 strTargetFilePath.append(strTargetFileNameOnly);
@@ -4731 +4736 @@
 
             Utf8Str strTargetVmdkName(bstrName);
-            strTargetVmdkName.stripExt();
+            RTPathStripExt(strTargetVmdkName.mutableRaw());
             strTargetVmdkName.append(".vmdk");