儲存庫 vbox 的更動 67399
- 時間撮記:
- 2017-6-14 下午12:59:37 (7 年 以前)
- 位置:
- trunk/src/VBox/Runtime/common/fs
- 檔案:
-
- 修改 3 筆資料
圖例:
- 未更動
- 新增
- 刪除
-
trunk/src/VBox/Runtime/common/fs/iso9660vfs.cpp
r67394 r67399 675 675 if (pShared) 676 676 { 677 LogFlow(("rtFsIso9660File_New: cbObject=%#RX64 First Extent: off=%#RX64 cb=%#RX64\n", 678 pShared->Core.cbObject, pShared->Core.FirstExtent.offDisk, pShared->Core.FirstExtent.cbExtent)); 677 679 pNewFile->offFile = 0; 678 680 pNewFile->pShared = pShared; -
trunk/src/VBox/Runtime/common/fs/isomaker.cpp
r67393 r67399 1458 1458 char *pszDst, size_t cbDst, size_t *pcchDst, size_t *pcbInDirRec) 1459 1459 { 1460 AssertReturn(cbDst > ISO9660_MAX_NAME_LEN , VERR_INTERNAL_ERROR_3);1460 AssertReturn(cbDst > ISO9660_MAX_NAME_LEN + 2, VERR_INTERNAL_ERROR_3); 1461 1461 1462 1462 /* Skip leading dots. */ … … 1522 1522 } 1523 1523 1524 /* Append version if not directory */ 1525 if (!fIsDir) 1526 { 1527 pszDst[cchDst++] = ';'; 1528 pszDst[cchDst++] = '1'; 1529 pszDst[cchDst] = '\0'; 1530 } 1531 1524 1532 /* 1525 1533 * Unique name? … … 1916 1924 size_t offNext = cchComponent; 1917 1925 while (RTPATH_IS_SLASH(ch)) 1918 ch = pszPath[ offNext++];1926 ch = pszPath[++offNext]; 1919 1927 1920 1928 if (ch == '\0') … … 1985 1993 AssertReturn(pChild != NULL, VERR_INTERNAL_ERROR_4); 1986 1994 } 1995 pParent = pChild; 1987 1996 } 1988 1997 } … … 3859 3868 pDir = RTListGetNext(&pFinalizedDirs->FinalizedDirs, pDir, RTFSISOMAKERNAMEDIR, FinalizedEntry); 3860 3869 AssertReturnStmt(pDir, *pbBuf = 0xff, 1); 3861 } while (offInTable - pDir->offPathTable <RTFSISOMAKER_CALC_PATHREC_SIZE(pDir->pName->cbNameInDirRec));3870 } while (offInTable - pDir->offPathTable >= RTFSISOMAKER_CALC_PATHREC_SIZE(pDir->pName->cbNameInDirRec)); 3862 3871 /* Back to the start: */ 3863 3872 else if (offInTable == 0) … … 3872 3881 pDir = RTListGetPrev(&pFinalizedDirs->FinalizedDirs, pDir, RTFSISOMAKERNAMEDIR, FinalizedEntry); 3873 3882 AssertReturnStmt(pDir, *pbBuf = 0xff, 1); 3874 } while (offInTable - pDir->offPathTable <RTFSISOMAKER_CALC_PATHREC_SIZE(pDir->pName->cbNameInDirRec));3883 } while (offInTable - pDir->offPathTable >= RTFSISOMAKER_CALC_PATHREC_SIZE(pDir->pName->cbNameInDirRec)); 3875 3884 3876 3885 /* … … 4096 4105 pDir = RTListGetNext(&pFinalizedDirs->FinalizedDirs, pDir, RTFSISOMAKERNAMEDIR, FinalizedEntry); 4097 4106 AssertReturnStmt(pDir, *pbBuf = 0xff, 1); 4098 } while ((offInDir64 = offUnsigned - pDir->offDir) <RT_ALIGN_32(pDir->cbDir, RTFSISOMAKER_SECTOR_SIZE));4107 } while ((offInDir64 = offUnsigned - pDir->offDir) >= RT_ALIGN_32(pDir->cbDir, RTFSISOMAKER_SECTOR_SIZE)); 4099 4108 /* Back to the start: */ 4100 4109 else if (pFinalizedDirs->offDirs / RTFSISOMAKER_SECTOR_SIZE == offUnsigned / RTFSISOMAKER_SECTOR_SIZE) … … 4109 4118 pDir = RTListGetPrev(&pFinalizedDirs->FinalizedDirs, pDir, RTFSISOMAKERNAMEDIR, FinalizedEntry); 4110 4119 AssertReturnStmt(pDir, *pbBuf = 0xff, 1); 4111 } while ((offInDir64 = offUnsigned - pDir->offDir) <RT_ALIGN_32(pDir->cbDir, RTFSISOMAKER_SECTOR_SIZE));4120 } while ((offInDir64 = offUnsigned - pDir->offDir) >= RT_ALIGN_32(pDir->cbDir, RTFSISOMAKER_SECTOR_SIZE)); 4112 4121 4113 4122 /* -
trunk/src/VBox/Runtime/common/fs/isomakercmd.cpp
r67381 r67399 897 897 return rtFsIsoMakerCmdSyntaxError(pOpts, "too many name specifiers (max %d)", RT_ELEMENTS(pOpts->afNameSpecifiers)); 898 898 pOpts->afNameSpecifiers[iNameSpecifier] = fNameSpecifier; 899 iNameSpecifier++; 900 901 /* 902 * Next, if any. 903 */ 904 if (pszSpec[offSpec] == ',') 905 offSpec++; 899 906 } while (pszSpec[offSpec] != '\0'); 900 907 … … 1057 1064 } 1058 1065 1059 for (uint32_t iDst = cParsedNames; iDst < pOpts->cNameSpecifiers; iDst++)1066 for (uint32_t iDst = iSrc + 1; iDst < pOpts->cNameSpecifiers; iDst++) 1060 1067 aParsedNames[iDst] = aParsedNames[iSrc]; 1061 1068 cParsedNames = pOpts->cNameSpecifiers + 1;
注意:
瀏覽 TracChangeset
來幫助您使用更動檢視器