Changeset 38455 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 15, 2011 9:57:51 AM (13 years ago)

Author:

vboxsync

Message:

Main-OVA: fix importing of renamed OVA files

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImpl.h (modified) (1 diff)
• src-server/ApplianceImplImport.cpp (modified) (11 diffs)

trunk/src/VBox/Main/include/ApplianceImpl.h

@@ -150 +150 @@
     HRESULT readFSOVF(TaskOVF *pTask);
     HRESULT readFSOVA(TaskOVF *pTask);
-    HRESULT readFSImpl(TaskOVF *pTask, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage);
+    HRESULT readFSImpl(TaskOVF *pTask, const RTCString &strFilename, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage);
     HRESULT readS3(TaskOVF *pTask);
 

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

@@ -841 +841 @@
             break;
         }
-        rc = readFSImpl(pTask, pSha1Callbacks, &storage);
+
+        rc = readFSImpl(pTask, pTask->locInfo.strPath, pSha1Callbacks, &storage);
     }while(0);
 
@@ -871 +872 @@
     PVDINTERFACEIO pSha1Callbacks = 0;
     PVDINTERFACEIO pTarCallbacks = 0;
+    char *pszFilename = 0;
     do
     {
+        vrc = RTTarCurrentFile(tar, &pszFilename);
+        if (RT_FAILURE(vrc))
+        {
+            rc = VBOX_E_FILE_ERROR;
+            break;
+        }
         pSha1Callbacks = Sha1CreateInterface();
         if (!pSha1Callbacks)
@@ -896 +904 @@
             break;
         }
-        rc = readFSImpl(pTask, pSha1Callbacks, &storage);
+        rc = readFSImpl(pTask, pszFilename, pSha1Callbacks, &storage);
     }while(0);
 
@@ -902 +910 @@
 
     /* Cleanup */
+    if (pszFilename)
+        RTMemFree(pszFilename);
     if (pSha1Callbacks)
         RTMemFree(pSha1Callbacks);
@@ -913 +923 @@
 }
 
-HRESULT Appliance::readFSImpl(TaskOVF *pTask, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage)
+HRESULT Appliance::readFSImpl(TaskOVF *pTask, const RTCString &strFilename, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage)
 {
     LogFlowFuncEnter();
@@ -924 +934 @@
     try
     {
-        Utf8Str strOvfFile = Utf8Str(pTask->locInfo.strPath).stripExt().append(".ovf");
         /* Read the OVF into a memory buffer */
         size_t cbSize = 0;
-        int vrc = Sha1ReadBuf(strOvfFile.c_str(), &pvTmpBuf, &cbSize, pCallbacks, pStorage);
+        int vrc = Sha1ReadBuf(strFilename.c_str(), &pvTmpBuf, &cbSize, pCallbacks, pStorage);
         if (   RT_FAILURE(vrc)
             || !pvTmpBuf)
             throw setError(VBOX_E_FILE_ERROR,
                            tr("Could not read OVF file '%s' (%Rrc)"),
-                           RTPathFilename(strOvfFile.c_str()), vrc);
+                           RTPathFilename(strFilename.c_str()), vrc);
         /* Copy the SHA1 sum of the OVF file for later validation */
         m->strOVFSHA1Digest = pStorage->strDigest;
@@ -1300 +1309 @@
     PVDINTERFACEIO pSha1Callbacks = 0;
     PVDINTERFACEIO pTarCallbacks = 0;
+    char *pszFilename = 0;
     void *pvMfBuf = 0;
     writeLock.release();
@@ -1322 +1332 @@
                            tr("Internal error (%Rrc)"), vrc);
 
+        /* Read the file name of the first file (need to be the ovf file). This
+         * is how all internal files are named. */
+        vrc = RTTarCurrentFile(tar, &pszFilename);
+        if (RT_FAILURE(vrc))
+            throw setError(E_FAIL,
+                           tr("Internal error (%Rrc)"), vrc);
         /* Skip the OVF file, cause this was read in IAppliance::Read already. */
         vrc = RTTarSeekNextFile(tar);
@@ -1337 +1353 @@
 
         size_t cbMfSize = 0;
-        Utf8Str strMfFile = Utf8Str(pTask->locInfo.strPath).stripExt().append(".mf");
+        Utf8Str strMfFile = Utf8Str(pszFilename).stripExt().append(".mf");
         /* Create the import stack for the rollback on errors. */
         ImportStack stack(pTask->locInfo, m->pReader->m_mapDisks, pTask->pProgress);
@@ -1366 +1382 @@
         {
             /* Add the ovf file to the digest list. */
-            stack.llSrcDisksDigest.push_front(STRPAIR(Utf8Str(pTask->locInfo.strPath).stripExt().append(".ovf"), m->strOVFSHA1Digest));
+            stack.llSrcDisksDigest.push_front(STRPAIR(Utf8Str(pszFilename).stripExt().append(".ovf"), m->strOVFSHA1Digest));
             rc = verifyManifestFile(strMfFile, stack, pvMfBuf, cbMfSize);
             if (FAILED(rc)) throw rc;
@@ -1380 +1396 @@
 
     /* Cleanup */
+    if (pszFilename)
+        RTMemFree(pszFilename);
     if (pvMfBuf)
         RTMemFree(pvMfBuf);