儲存庫 vbox 的更動 67512

時間撮記:

2017-6-20 下午02:51:54 (7 年 以前)

作者:

vboxsync

訊息:

IPRT: ISO maker updates (import related).

位置:

trunk/src/VBox/Runtime/common/fs

檔案:

• isomaker.cpp (修改) (3 筆差異)
• isomakerimport.cpp (修改) (4 筆差異)

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

@@ -2914 +2914 @@
         ObjInfo.Attr.u.Unix.GenerationId    = 0;
         ObjInfo.Attr.u.Unix.Device          = 0;
+        pObjInfo = &ObjInfo;
     }
     else
@@ -3403 +3404 @@
             else
             {
+                Log4(("rtFsIsoMakerFinalizeRemoveOrphans: %#x cbData=%#RX64\n", pCur->idxObj,
+                      pCur->enmType == RTFSISOMAKEROBJTYPE_FILE ? ((PRTFSISOMAKERFILE)(pCur))->cbData : 0));
                 int rc = rtFsIsoMakerObjRemoveWorker(pThis, pCur);
                 if (RT_SUCCESS(rc))
@@ -3815 +3818 @@
                 *poffData += RT_ALIGN_64(pCurFile->cbData, RTFSISOMAKER_SECTOR_SIZE);
                 RTListAppend(&pThis->FinalizedFiles, &pCurFile->FinalizedEntry);
+                Log4(("rtFsIsoMakerFinalizeData: %#x @%#RX64 cbData=%#RX64\n", pCurFile->Core.idxObj, pCurFile->offData, pCurFile->cbData));
             }
 

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

@@ -523 +523 @@
             }
             /*
-             * Add the object and enter it into the namespace.
+             * Add the object.
              */
             PRTFSISOMKIMPBLOCK2FILE pBlock2File = NULL;
@@ -547 +547 @@
                 }
 
-                pBlock2File = (PRTFSISOMKIMPBLOCK2FILE)RTAvlU32Get(&pThis->Block2FileRoot, ISO9660_GET_ENDIAN(&pDirRec->offExtent));
+                if (ISO9660_GET_ENDIAN(&pDirRec->cbData) > 0) /* no data tracking for zero byte files */
+                    pBlock2File = (PRTFSISOMKIMPBLOCK2FILE)RTAvlU32Get(&pThis->Block2FileRoot, ISO9660_GET_ENDIAN(&pDirRec->offExtent));
                 if (!pBlock2File)
                 {
@@ -567 +568 @@
                 }
             }
+
             if (RT_SUCCESS(rc))
             {
+                /*
+                 * Enter the object into the namespace.
+                 */
                 rc = RTFsIsoMakerObjSetNameAndParent(pThis->hIsoMaker, idxObj, idxDir,
                                                      !fUnicode ? RTFSISOMAKER_NAMESPACE_ISO_9660 : RTFSISOMAKER_NAMESPACE_JOLIET,
@@ -590 +595 @@
                         RTListAppend(pTodoList, &pImpDir->Entry);
                     }
-                    else if (!pBlock2File)
+                    else if (   !pBlock2File
+                             && ISO9660_GET_ENDIAN(&pDirRec->cbData) > 0 /* no data tracking for zero byte files */)
                     {
                         pBlock2File = (PRTFSISOMKIMPBLOCK2FILE)RTMemAlloc(sizeof(*pBlock2File));