Changeset 67502 in vbox

Timestamp:

Jun 20, 2017 11:59:43 AM (8 years ago)

Author:

vboxsync

Message:

IPRT: ISO maker updates (import related).

Location:

trunk

Files:

• include/iprt/fsisomaker.h (modified) (1 diff)
• src/VBox/Runtime/common/fs/isomakercmd.cpp (modified) (4 diffs)
• src/VBox/Runtime/common/fs/isomakerimport.cpp (modified) (9 diffs)

trunk/include/iprt/fsisomaker.h

@@ -406 +406 @@
  * @param   hIsoMaker           The ISO maker handle.
  * @param   pszIso              Path to the existing image to import / clone.
+ *                              This is fed to RTVfsChainOpenFile.
  * @param   fFlags              Reserved for the future, MBZ.
+ * @param   poffError           Where to return the position in @a pszIso
+ *                              causing trouble when opening it for reading.
+ *                              Optional.
  * @param   pErrInfo            Where to return additional error information.
  *                              Optional.
  */
-RTDECL(int) RTFsIsoMakerImport(RTFSISOMAKER hIsoMaker, const char *pszIso, uint32_t fFlags, PRTERRINFO pErrInfo);
+RTDECL(int) RTFsIsoMakerImport(RTFSISOMAKER hIsoMaker, const char *pszIso, uint32_t fFlags,
+                               uint32_t *poffError, PRTERRINFO pErrInfo);
 
 /** @name RTFSISOMK_IMPORT_F_XXX - Flags for RTFsIsoMakerImport.

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

@@ -95 +95 @@
     RTFSISOMAKERCMD_OPT_NAME_SETUP,
     RTFSISOMAKERCMD_OPT_NO_JOLIET,
+    RTFSISOMAKERCMD_OPT_IMPORT_ISO,
 
     RTFSISOMAKERCMD_OPT_ELTORITO_NEW_ENTRY,
@@ -414 +415 @@
     { "--name-setup",                   RTFSISOMAKERCMD_OPT_NAME_SETUP,                     RTGETOPT_REQ_STRING  },
     { "--no-joliet",                    RTFSISOMAKERCMD_OPT_NO_JOLIET,                      RTGETOPT_REQ_NOTHING },
+    { "--import-iso",                   RTFSISOMAKERCMD_OPT_IMPORT_ISO,                     RTGETOPT_REQ_STRING  },
+
     { "--eltorito-new-entry",           RTFSISOMAKERCMD_OPT_ELTORITO_NEW_ENTRY,             RTGETOPT_REQ_NOTHING },
     { "--eltorito-add-image",           RTFSISOMAKERCMD_OPT_ELTORITO_ADD_IMAGE,             RTGETOPT_REQ_NOTHING },
@@ -1386 +1389 @@
 
 /**
+ * Deals with the --import-iso {iso-file-spec} options.
+ *
+ * @returns IPRT status code
+ * @param   pOpts               The ISO maker command instance.
+ * @param   pszIsoSpec          The ISO path specifier.
+ */
+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));
+    if (RT_SUCCESS(rc))
+        return rc;
+    if (offError != UINT32_MAX)
+        return rtFsIsoMakerCmdChainError(pOpts, "RTFsIsoMakerImport", pszIsoSpec, rc, offError, &ErrInfo.Core);
+    if (RTErrInfoIsSet(&ErrInfo.Core))
+        return rtFsIsoMakerCmdErrorRc(pOpts, rc, "RTFsIsoMakerImport failed: %Rrc - %s", rc, ErrInfo.Core.pszMsg);
+    return rtFsIsoMakerCmdErrorRc(pOpts, rc, "RTFsIsoMakerImport failed: %Rrc", rc);
+}
+
+
+/**
  * Deals with: -G|--generic-boot {file}
  *
@@ -1949 +1974 @@
             case RTFSISOMAKERCMD_OPT_IPRT_ISO_MAKER_FILE_MARKER:
                 /* ignored */
+                break;
+
+            case RTFSISOMAKERCMD_OPT_IMPORT_ISO:
+                rc = rtFsIsoMakerCmdOptImportIso(&Opts, ValueUnion.psz);
                 break;
 

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

@@ -327 +327 @@
 
 static int rtFsIsoImportProcessIso9660TreeWorker(PRTFSISOMKIMPORTER pThis, uint32_t idxDir,
-                                                 uint32_t offDirBlock, uint32_t cbDir, uint8_t cDepth, bool fUnicode)
+                                                 uint32_t offDirBlock, uint32_t cbDir, uint8_t cDepth, bool fUnicode,
+                                                 PRTLISTANCHOR pTodoList)
 {
     /*
@@ -420 +421 @@
          * likely to get error with subsequent record too.
          */
+        Log3(("pDirRec=%p @%#010RX64 cb=%#04x ff=%#04x off=%#010RX32 cb=%#010RX32 id=%.*Rhxs\n", pDirRec, off - cbChunk, pDirRec->cbDirRec, pDirRec->fFileFlags,
+              ISO9660_GET_ENDIAN(&pDirRec->offExtent), ISO9660_GET_ENDIAN(&pDirRec->cbData), pDirRec->bFileIdLength, pDirRec->achFileId));
         rc = rtFsIsoImportValidateDirRec(pThis, pDirRec, cbChunk);
         if (RT_FAILURE(rc))
@@ -463 +466 @@
              * Add the object and enter it into the namespace.
              */
-            uint32_t idxObj = UINT32_MAX;
+            PRTFSISOMKIMPBLOCK2FILE pBlock2File = NULL;
+            uint32_t                idxObj      = UINT32_MAX;
             if (pDirRec->fFileFlags & ISO9660_FILE_FLAGS_DIRECTORY)
                 rc = RTFsIsoMakerAddUnnamedDir(pThis->hIsoMaker, &idxObj);
             else
             {
-                rc = VERR_NOT_IMPLEMENTED; /** @todo need new file add function  */
+                /* Add the common source file if we haven't done that already. */
+                if (pThis->idxSrcFile != UINT32_MAX)
+                { /* likely */ }
+                else
+                {
+                    rc = RTFsIsoMakerAddCommonSourceFile(pThis->hIsoMaker, pThis->hSrcFile, &pThis->idxSrcFile);
+                    if (RT_FAILURE(rc))
+                        return rtFsIsoImpError(pThis, rc, "RTFsIsoMakerAddCommonSourceFile failed: %Rrc", rc);
+                    Assert(pThis->idxSrcFile != UINT32_MAX);
+                }
+
+                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->cbData), NULL /*pObjInfo*/, &idxObj);
+                else
+                {
+                    idxObj = pBlock2File->idxObj;
+                    rc = VINF_SUCCESS;
+                }
             }
             if (RT_SUCCESS(rc))
@@ -481 +505 @@
                      * directory push it onto the traversal stack.
                      */
+                    if (pDirRec->fFileFlags & ISO9660_FILE_FLAGS_DIRECTORY)
+                    {
+                        PRTFSISOMKIMPDIR pImpDir = (PRTFSISOMKIMPDIR)RTMemAlloc(sizeof(*pImpDir));
+                        AssertReturn(pImpDir, rtFsIsoImpError(pThis, VERR_NO_MEMORY, "Could not allocate RTFSISOMKIMPDIR"));
+                        pImpDir->cbDir       = ISO9660_GET_ENDIAN(&pDirRec->cbData);
+                        pImpDir->offDirBlock = ISO9660_GET_ENDIAN(&pDirRec->offExtent);
+                        pImpDir->idxObj      = idxObj;
+                        pImpDir->cDepth      = cDepth + 1;
+                        RTListAppend(pTodoList, &pImpDir->Entry);
+                    }
+                    else if (!pBlock2File)
+                    {
+                        pBlock2File = (PRTFSISOMKIMPBLOCK2FILE)RTMemAlloc(sizeof(*pBlock2File));
+                        AssertReturn(pBlock2File, rtFsIsoImpError(pThis, VERR_NO_MEMORY, "Could not allocate RTFSISOMKIMPBLOCK2FILE"));
+                        pBlock2File->idxObj   = idxObj;
+                        pBlock2File->Core.Key = ISO9660_GET_ENDIAN(&pDirRec->offExtent);
+                        bool fRc = RTAvlU32Insert(&pThis->Block2FileRoot, &pBlock2File->Core);
+                        Assert(fRc); RT_NOREF(fRc);
+                    }
                 }
                 else
@@ -486 +529 @@
                                     off - cbChunk, pDirRec->bFileIdLength, pDirRec->achFileId);
             }
+            else
+                rtFsIsoImpError(pThis, rc, "Error adding '%s' (fFileFlags=%#x): %Rrc",
+                                pThis->szNameBuf, pDirRec->fFileFlags, rc);
         }
         else
             rtFsIsoImpError(pThis, rc, "Invalid name at %#RX64: %.Rhxs",
                             off - cbChunk, pDirRec->bFileIdLength, pDirRec->achFileId);
+
+        /*
+         * Advance to the next directory record.
+         */
+        cbChunk -= pDirRec->cbDirRec;
+        pDirRec = (PCISO9660DIRREC)((uintptr_t)pDirRec + pDirRec->cbDirRec);
     }
 
@@ -504 +556 @@
     if (idxDir == UINT32_MAX)
     {
+        idxDir = RTFSISOMAKER_CFG_IDX_ROOT;
         int rc = RTFsIsoMakerObjSetPath(pThis->hIsoMaker, RTFSISOMAKER_CFG_IDX_ROOT, RTFSISOMAKER_NAMESPACE_ISO_9660, "/");
         if (RT_FAILURE(rc))
@@ -519 +572 @@
     for (;;)
     {
-        int rc2 = rtFsIsoImportProcessIso9660TreeWorker(pThis, idxDir, offDirBlock, cbDir, cDepth, fUnicode);
+        int rc2 = rtFsIsoImportProcessIso9660TreeWorker(pThis, idxDir, offDirBlock, cbDir, cDepth, fUnicode, &TodoList);
         if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
             rc = rc2;
@@ -700 +753 @@
  * @param   hIsoMaker           The ISO maker handle.
  * @param   pszIso              Path to the existing image to import / clone.
+ *                              This is fed to RTVfsChainOpenFile.
  * @param   fFlags              Reserved for the future, MBZ.
+ * @param   poffError           Where to return the position in @a pszIso
+ *                              causing trouble when opening it for reading.
+ *                              Optional.
  * @param   pErrInfo            Where to return additional error information.
  *                              Optional.
  */
-RTDECL(int) RTFsIsoMakerImport(RTFSISOMAKER hIsoMaker, const char *pszIso, uint32_t fFlags, PRTERRINFO pErrInfo)
+RTDECL(int) RTFsIsoMakerImport(RTFSISOMAKER hIsoMaker, const char *pszIso, uint32_t fFlags,
+                               uint32_t *poffError, PRTERRINFO pErrInfo)
 {
     /*
@@ -715 +773 @@
      */
     RTVFSFILE hSrcFile;
-    uint32_t offError;
-    int rc = RTVfsChainOpenFile(pszIso, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE, &hSrcFile, &offError, pErrInfo);
+    int rc = RTVfsChainOpenFile(pszIso, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE, &hSrcFile, poffError, pErrInfo);
     if (RT_FAILURE(rc))
         return rc;