Changeset 67511 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jun 20, 2017 2:30:30 PM (7 years ago)

Author:

vboxsync

Message:

IPRT: ISO maker updates (import related).

Location:

trunk/src/VBox/Runtime/common/fs

Files:

• isomakercmd.cpp (modified) (1 diff)
• isomakerimport.cpp (modified) (20 diffs)

trunk/src/VBox/Runtime/common/fs/isomakercmd.cpp

@@ -1397 +1397 @@
 static int rtFsIsoMakerCmdOptImportIso(PRTFSISOMAKERCMDOPTS pOpts, const char *pszIsoSpec)
 {
-    uint32_t        offError = UINT32_MAX;
-    RTERRINFOSTATIC ErrInfo;
-    int rc = RTFsIsoMakerImport(pOpts->hIsoMaker, pszIsoSpec, 0 /*fFlags*/, &offError, RTErrInfoInitStatic(&ErrInfo));
+    RTFSISOMAKERIMPORTRESULTS   Results;
+    RTERRINFOSTATIC             ErrInfo;
+    int rc = RTFsIsoMakerImport(pOpts->hIsoMaker, pszIsoSpec, 0 /*fFlags*/, &Results, RTErrInfoInitStatic(&ErrInfo));
+
+    pOpts->cItemsAdded += Results.cAddedFiles;
+    pOpts->cItemsAdded += Results.cAddedDirs;
+    pOpts->cItemsAdded += Results.cBootCatEntries;
+    pOpts->cItemsAdded += Results.cbSysArea != 0 ? 1 : 0;
+
+    rtFsIsoMakerPrintf(pOpts, "ISO imported statistics for '%s'\n", pszIsoSpec);
+    rtFsIsoMakerPrintf(pOpts, "    cAddedNames:         %'14RU32\n", Results.cAddedNames);
+    rtFsIsoMakerPrintf(pOpts, "    cAddedDirs:          %'14RU32\n", Results.cAddedDirs);
+    rtFsIsoMakerPrintf(pOpts, "    cbAddedDataBlocks:   %'14RU64 bytes\n", Results.cbAddedDataBlocks);
+    rtFsIsoMakerPrintf(pOpts, "    cAddedFiles:         %'14RU32\n", Results.cAddedFiles);
+    if (Results.cBootCatEntries == UINT32_MAX)
+        rtFsIsoMakerPrintf(pOpts, "    cBootCatEntries:               none\n");
+    else
+        rtFsIsoMakerPrintf(pOpts, "    cBootCatEntries:     %'14RU32\n", Results.cBootCatEntries);
+    rtFsIsoMakerPrintf(pOpts, "    cbSysArea:           %'14RU32\n", Results.cbSysArea);
+    rtFsIsoMakerPrintf(pOpts, "    cErrors:             %'14RU32\n", Results.cErrors);
+
     if (RT_SUCCESS(rc))
         return rc;
-    if (offError != UINT32_MAX)
-        return rtFsIsoMakerCmdChainError(pOpts, "RTFsIsoMakerImport", pszIsoSpec, rc, offError, &ErrInfo.Core);
+    if (Results.offError != UINT32_MAX)
+        return rtFsIsoMakerCmdChainError(pOpts, "RTFsIsoMakerImport", pszIsoSpec, rc, Results.offError, &ErrInfo.Core);
     if (RTErrInfoIsSet(&ErrInfo.Core))
         return rtFsIsoMakerCmdErrorRc(pOpts, rc, "RTFsIsoMakerImport failed: %Rrc - %s", rc, ErrInfo.Core.pszMsg);

trunk/src/VBox/Runtime/common/fs/isomakerimport.cpp

@@ -129 +129 @@
     /** Set if we've already seen a joliet volume descriptor. */
     bool                    fSeenJoliet;
+
+    /** Pointer to the import results structure (output). */
+    PRTFSISOMAKERIMPORTRESULTS pResults;
 
     /** Sector buffer for volume descriptors and such. */
@@ -204 +207 @@
 #define VERR_ISOMK_IMPORT_TOO_DEEP_DIR_TREE             (-24921)
 
+/** Import ISO contains a bad directory record. */
 #define VERR_ISOMK_IMPORT_BAD_DIR_REC                   (-24922)
+/** Import ISO directory record with a mismatching volume sequence number. */
 #define VERR_ISOMK_IMPORT_DIR_REC_VOLUME_SEQ_NO         (-24923)
+/** Import ISO directory with an extent that is out of bounds. */
 #define VERR_ISOMK_IMPORT_DIR_REC_EXTENT_OUT_OF_BOUNDS  (-24924)
+/** Import ISO directory with a bad record length. */
 #define VERR_ISOMK_IMPORT_BAD_DIR_REC_LENGTH            (-24925)
+/** Import ISO directory with a bad name length. */
 #define VERR_ISOMK_IMPORT_DOT_DIR_REC_BAD_NAME_LENGTH   (-24926)
+/** Import ISO directory with a bad name. */
 #define VERR_ISOMK_IMPORT_DOT_DIR_REC_BAD_NAME          (-24927)
 
@@ -224 +233 @@
 static int rtFsIsoImpErrorV(PRTFSISOMKIMPORTER pThis, int rc, const char *pszFormat, va_list va)
 {
+    va_list vaCopy;
+    va_copy(vaCopy, va);
+    LogRel(("RTFsIsoMkImport error %Rrc: %N\n", rc, pszFormat, &vaCopy));
+    va_end(vaCopy);
+
     if (RT_SUCCESS(pThis->rc))
     {
@@ -229 +243 @@
         rc = RTErrInfoSetV(pThis->pErrInfo, rc, pszFormat, va);
     }
+
+    pThis->pResults->cErrors++;
     return rc;
 }
@@ -380 +396 @@
         return rc;
 
+    cbChunk -= pDirRec->cbDirRec;
     pDirRec  = (PCISO9660DIRREC)((uintptr_t)pDirRec + pDirRec->cbDirRec);
-    cbChunk -= pDirRec->cbDirRec;
 
     /*
      * Work our way thru all the directory records.
      */
-    Log3(("rtFsIsoImportProcessIso9660TreeWorker: Starting at @%#RX64 LB %#zx\n", off - cbChunk, cbChunk));
+    Log3(("rtFsIsoImportProcessIso9660TreeWorker: Starting at @%#RX64 LB %#RX32 (out of %#RX32) in %#x\n",
+          off - cbChunk, cbChunk, cbChunk + cbDir, idxDir));
     while (cbChunk > 0)
     {
@@ -405 +422 @@
                 return rtFsIsoImpError(pThis, rc, "Error reading %#RX32 bytes at %#RX64 (dir): %Rrc", off, cbToRead);
 
-            Log3(("rtFsIsoImportProcessIso9660TreeWorker: Read %#zx more bytes @%#RX64, now got @%#RX64 LB %#zx\n",
+            Log3(("rtFsIsoImportProcessIso9660TreeWorker: Read %#zx more bytes @%#RX64, now got @%#RX64 LB %#RX32\n",
                   cbToRead, off, off - cbChunk, cbChunk + cbToRead));
             off     += cbToRead;
@@ -427 +444 @@
                     continue;
                 }
-                Log3(("rtFsIsoImportProcessIso9660TreeWorker: cbDirRec=0 --> jumped to @%#RX64 LB %#zx\n", off - cbChunk, cbChunk));
+                Log3(("rtFsIsoImportProcessIso9660TreeWorker: cbDirRec=0 --> jumped %#RX32 to @%#RX64 LB %#RX32\n",
+                      cbSkip, off - cbChunk, cbChunk));
             }
             /* ASSUMES we're working in multiples of sectors! */
@@ -440 +458 @@
                     return rtFsIsoImpError(pThis, rc, "Error reading %#RX32 bytes at %#RX64 (dir): %Rrc", off, cbToRead);
 
-                Log3(("rtFsIsoImportProcessIso9660TreeWorker: cbDirRec=0 --> Read %#zx more bytes @%#RX64, now got @%#RX64 LB %#zx\n",
+                Log3(("rtFsIsoImportProcessIso9660TreeWorker: cbDirRec=0 --> Read %#zx more bytes @%#RX64, now got @%#RX64 LB %#RX32\n",
                       cbToRead, off, off - cbChunk, cbChunk + cbToRead));
                 off     += cbToRead;
@@ -456 +474 @@
                                     - pDirRec->bFileIdLength - !(pDirRec->bFileIdLength & 1);
         uint8_t const * const pbSys = (uint8_t const *)&pDirRec->achFileId[pDirRec->bFileIdLength + !(pDirRec->bFileIdLength & 1)];
-        Log3(("pDirRec=%p @%#010RX64 cb=%#04x ff=%#04x off=%#010RX32 cb=%#010RX32 cbSys=%#x id=%.*Rhxs\n",
-              pDirRec, off - cbChunk, pDirRec->cbDirRec, pDirRec->fFileFlags, ISO9660_GET_ENDIAN(&pDirRec->offExtent),
-              ISO9660_GET_ENDIAN(&pDirRec->cbData), cbSys, pDirRec->bFileIdLength, pDirRec->achFileId));
+        Log3(("pDirRec=&abBuf[%#07zx]: @%#010RX64 cb=%#04x ff=%#04x off=%#010RX32 cb=%#010RX32 cbSys=%#x id=%.*Rhxs\n",
+              (uintptr_t)pDirRec - (uintptr_t)&pThis->abBuf[0], off - cbChunk, pDirRec->cbDirRec, pDirRec->fFileFlags,
+              ISO9660_GET_ENDIAN(&pDirRec->offExtent), ISO9660_GET_ENDIAN(&pDirRec->cbData), cbSys,
+              pDirRec->bFileIdLength, pDirRec->achFileId));
         rc = rtFsIsoImportValidateDirRec(pThis, pDirRec, cbChunk);
         if (RT_FAILURE(rc))
@@ -496 +515 @@
                     pThis->szNameBuf[cchName - offName] = '\0';
             }
-            Log3(("  name='%s'\n", pThis->szNameBuf));
+            Log3(("  --> name='%s'\n", pThis->szNameBuf));
 
             /** @todo rock ridge. */
@@ -509 +528 @@
             uint32_t                idxObj      = UINT32_MAX;
             if (pDirRec->fFileFlags & ISO9660_FILE_FLAGS_DIRECTORY)
+            {
                 rc = RTFsIsoMakerAddUnnamedDir(pThis->hIsoMaker, &idxObj);
+                Log3(("  --> added directory #%#x'\n", idxObj));
+                if (RT_SUCCESS(rc))
+                    pThis->pResults->cAddedDirs++;
+            }
             else
             {
@@ -525 +549 @@
                 pBlock2File = (PRTFSISOMKIMPBLOCK2FILE)RTAvlU32Get(&pThis->Block2FileRoot, ISO9660_GET_ENDIAN(&pDirRec->offExtent));
                 if (!pBlock2File)
+                {
                     rc = RTFsIsoMakerAddUnnamedFileWithCommonSrc(pThis->hIsoMaker, pThis->idxSrcFile,
-                                                                 ISO9660_GET_ENDIAN(&pDirRec->offExtent) * ISO9660_SECTOR_SIZE,
+                                                                 ISO9660_GET_ENDIAN(&pDirRec->offExtent) * (uint64_t)ISO9660_SECTOR_SIZE,
                                                                  ISO9660_GET_ENDIAN(&pDirRec->cbData), NULL /*pObjInfo*/, &idxObj);
+                    Log3(("  --> added new file #%#x\n", idxObj));
+                    if (RT_SUCCESS(rc))
+                    {
+                        pThis->pResults->cAddedFiles++;
+                        pThis->pResults->cbAddedDataBlocks += RT_ALIGN_32(ISO9660_GET_ENDIAN(&pDirRec->cbData), ISO9660_SECTOR_SIZE);
+                    }
+                }
                 else
                 {
                     idxObj = pBlock2File->idxObj;
+                    Log3(("  --> existing file #%#x'\n", idxObj));
                     rc = VINF_SUCCESS;
                 }
@@ -541 +574 @@
                 if (RT_SUCCESS(rc))
                 {
+                    pThis->pResults->cAddedNames++;
+
                     /*
                      * Remember the data location if this is a file, if it's a
@@ -625 +660 @@
         if (!pNext)
             break;
+        idxDir      = pNext->idxObj;
+        offDirBlock = pNext->offDirBlock;
+        cbDir       = pNext->cbDir;
         cDepth      = pNext->cDepth;
-        cbDir       = pNext->cbDir;
-        offDirBlock = pNext->offDirBlock;
         RTMemFree(pNext);
     }
@@ -891 +927 @@
  */
 RTDECL(int) RTFsIsoMakerImport(RTFSISOMAKER hIsoMaker, const char *pszIso, uint32_t fFlags,
-                               uint32_t *poffError, PRTERRINFO pErrInfo)
+                               PRTFSISOMAKERIMPORTRESULTS pResults, PRTERRINFO pErrInfo)
 {
     /*
      * Validate input.
      */
+    AssertPtrReturn(pResults, VERR_INVALID_POINTER);
+    pResults->cAddedNames       = 0;
+    pResults->cAddedDirs        = 0;
+    pResults->cbAddedDataBlocks = 0;
+    pResults->cAddedFiles       = 0;
+    pResults->cBootCatEntries   = UINT32_MAX;
+    pResults->cbSysArea         = 0;
+    pResults->cErrors           = 0;
+    pResults->offError          = UINT32_MAX;
     AssertReturn(!(fFlags & ~RTFSISOMK_IMPORT_F_VALID_MASK), VERR_INVALID_FLAGS);
 
@@ -902 +947 @@
      */
     RTVFSFILE hSrcFile;
-    int rc = RTVfsChainOpenFile(pszIso, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE, &hSrcFile, poffError, pErrInfo);
+    int rc = RTVfsChainOpenFile(pszIso, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE,
+                                &hSrcFile, &pResults->offError, pErrInfo);
     if (RT_FAILURE(rc))
         return rc;
+    pResults->offError = UINT32_MAX;
+
 
     /*
@@ -924 +972 @@
         //pThis->idPrimaryVol   = 0;
         //pThis->fSeenJoliet    = false;
+        pThis->pResults         = pResults;
 
         /*
@@ -948 +997 @@
                 uint32_t iElTorito        = UINT32_MAX;
                 uint32_t iVolDesc         = 0;
-                for (;; iVolDesc++)
+                for (;;)
                 {
                     switch (pThis->uSectorBuf.VolDescHdr.bDescType)
@@ -994 +1043 @@
                      * Read the next volume descriptor and check the signature.
                      */
+                    iVolDesc++;
                     if (iVolDesc >= 32)
                     {
@@ -1036 +1086 @@
                         if (!ASMMemIsAllU8(pThis->abBuf, _32K, 0))
                         {
+                            /* Drop zero sectors from the end. */
+                            uint32_t cbSysArea = _32K;
+                            while (   cbSysArea >= ISO9660_SECTOR_SIZE
+                                   && ASMMemIsAllU8(&pThis->abBuf[cbSysArea - ISO9660_SECTOR_SIZE], ISO9660_SECTOR_SIZE, 0))
+                                cbSysArea -= ISO9660_SECTOR_SIZE;
+
                             /** @todo HFS */
-                            rc = RTFsIsoMakerSetSysAreaContent(hIsoMaker, pThis->abBuf, _32K, 0);
+                            pThis->pResults->cbSysArea = cbSysArea;
+                            rc = RTFsIsoMakerSetSysAreaContent(hIsoMaker, pThis->abBuf, cbSysArea, 0);
                             if (RT_FAILURE(rc))
                                 rtFsIsoImpError(pThis, rc, "RTFsIsoMakerSetSysAreaContent failed: %Rrc", rc);