Changeset 67412 in vbox for trunk/src/VBox/Runtime/common/fs/isomaker.cpp

Timestamp:

Jun 14, 2017 7:59:31 PM (7 years ago)

Author:

vboxsync

Message:

IPRT: More ISO maker code.

File:

• trunk/src/VBox/Runtime/common/fs/isomaker.cpp (modified) (8 diffs)

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

@@ -3601 +3601 @@
     {
         PRTFSISOMAKERNAME pChild = *ppChild++;
-        if (pChild->pszTransNm)
+        if (pChild->cchTransNm)
         {
             /** @todo TRANS.TBL codeset, currently using UTF-8 which is probably not it.
@@ -3672 +3672 @@
             pFile = RTListGetNext(&pIsoMaker->FinalizedFiles, pFile, RTFSISOMAKERFILE, FinalizedEntry);
             AssertReturn(pFile, VERR_INTERNAL_ERROR_3);
-        } while ((offInFile = offUnsigned - pFile->offData) < RT_ALIGN_64(pFile->cbData, RTFSISOMAKER_SECTOR_SIZE));
+        } while ((offInFile = offUnsigned - pFile->offData) >= RT_ALIGN_64(pFile->cbData, RTFSISOMAKER_SECTOR_SIZE));
     }
     else
@@ -3681 +3681 @@
             pFile = RTListGetPrev(&pIsoMaker->FinalizedFiles, pFile, RTFSISOMAKERFILE, FinalizedEntry);
             AssertReturn(pFile, VERR_INTERNAL_ERROR_3);
-        } while ((offInFile = offUnsigned - pFile->offData) < RT_ALIGN_64(pFile->cbData, RTFSISOMAKER_SECTOR_SIZE));
+        } while ((offInFile = offUnsigned - pFile->offData) >= RT_ALIGN_64(pFile->cbData, RTFSISOMAKER_SECTOR_SIZE));
     }
 
@@ -3702 +3702 @@
     if (offInFile < pFile->cbData)
     {
-        int rc;
+        int    rc;
         size_t cbToRead = RT_MIN(cbBuf, pFile->cbData - offInFile);
+
         switch (pFile->enmSrcType)
         {
@@ -3711 +3712 @@
                     rc = RTVfsChainOpenFile(pFile->u.pszSrcPath, RTFILE_O_READ | RTFILE_O_DENY_NONE | RTFILE_O_OPEN,
                                             &pThis->hVfsSrcFile, NULL, NULL);
-                    if (RT_FAILURE(rc))
-                        return rc;
+                    AssertMsgRCReturn(rc, ("%s -> %Rrc\n", pFile->u.pszSrcPath, rc), rc);
                 }
                 rc = RTVfsFileReadAt(pThis->hVfsSrcFile, offInFile, pbBuf, cbToRead, NULL);
+                AssertRC(rc);
                 break;
 
             case RTFSISOMAKERSRCTYPE_VFS_FILE:
                 rc = RTVfsFileReadAt(pFile->u.hVfsFile, offInFile, pbBuf, cbToRead, NULL);
+                AssertRC(rc);
                 break;
 
@@ -3725 +3727 @@
                 {
                     rc = rtFsIsoMakerOutFile_ProduceTransTbl(pThis, pFile);
-                    if (RT_FAILURE(rc))
-                        return rc;
+                    AssertRCReturn(rc, rc);
                 }
-                rc = RTVfsFileReadAt(pFile->u.hVfsFile, offInFile, pbBuf, cbToRead, NULL);
+                rc = RTVfsFileReadAt(pThis->hVfsSrcFile, offInFile, pbBuf, cbToRead, NULL);
+                AssertRC(rc);
                 break;
 
@@ -3742 +3744 @@
          */
         if (   cbToRead < cbBuf
+            && (pFile->cbData & RTFSISOMAKER_SECTOR_OFFSET_MASK)
             && offInFile + cbToRead == pFile->cbData)
         {
@@ -3921 +3924 @@
  * @param   pName       The namespace node.
  * @param   fUnicode    Set if the name should be translated to big endian
- *                      UTF-16 / UCS-2, i.e. we're in the joliet namespace.
+ *                      UTF-16BE / UCS-2BE, i.e. we're in the joliet namespace.
  * @param   pbBuf       The buffer.  This is at least pName->cbDirRec bytes big.
  */