Changeset 96861 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Sep 26, 2022 10:52:54 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/Vfs,Main/Unattended: Detect fedora ISOs, various code cleanups. Added a parameter to RTVfsQueryLabel so we can get the primary volume ID of an ISO (required for fedora ISOs, as the joliet version is truncated). bugref:9781

Location:

trunk/src/VBox/Runtime/common

Files:

• fs/isovfs.cpp (modified) (1 diff)
• vfs/vfsbase.cpp (modified) (2 diffs)

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

@@ -5060 +5060 @@
     {
         case RTVFSQIEX_VOL_LABEL:
-        {
-            if (pThis->enmType == RTFSISOVOLTYPE_UDF)
+        case RTVFSQIEX_VOL_LABEL_ALT:
+        {
+            if (pThis->enmType == RTFSISOVOLTYPE_UDF
+                && (   enmInfo == RTVFSQIEX_VOL_LABEL
+                    || pThis->offPrimaryVolDesc == 0))
                 return rtFsIsoVol_ReturnUdfDString(pThis->Udf.VolInfo.achLogicalVolumeID,
                                                    sizeof(pThis->Udf.VolInfo.achLogicalVolumeID), pvInfo, cbInfo, pcbRet);
+
+            bool const fPrimary = enmInfo == RTVFSQIEX_VOL_LABEL_ALT
+                               || pThis->enmType == RTFSISOVOLTYPE_ISO9960;
+
             int rc = RTVfsFileReadAt(pThis->hVfsBacking,
-                                     pThis->enmType == RTFSISOVOLTYPE_ISO9960
-                                     ? pThis->offPrimaryVolDesc : pThis->offSecondaryVolDesc,
+                                     fPrimary ? pThis->offPrimaryVolDesc : pThis->offSecondaryVolDesc,
                                      uBuf.ab, RT_MAX(RT_MIN(pThis->cbSector, sizeof(uBuf)), sizeof(uBuf.PriVolDesc)), NULL);
             AssertRCReturn(rc, rc);
-            switch (enmInfo)
-            {
-                case RTVFSQIEX_VOL_LABEL:
-                    if (pThis->enmType == RTFSISOVOLTYPE_ISO9960)
-                        return rtFsIsoVol_ReturnIso9660DString(uBuf.PriVolDesc.achVolumeId, sizeof(uBuf.PriVolDesc.achVolumeId),
-                                                               pvInfo, cbInfo, pcbRet);
-                    return rtFsIsoVol_ReturnIso9660D1String(uBuf.SupVolDesc.achVolumeId, sizeof(uBuf.SupVolDesc.achVolumeId),
-                                                            pvInfo, cbInfo, pcbRet);
-                default:
-                    AssertFailedReturn(VERR_INTERNAL_ERROR);
-            }
-            break;
+
+            if (fPrimary)
+                return rtFsIsoVol_ReturnIso9660DString(uBuf.PriVolDesc.achVolumeId, sizeof(uBuf.PriVolDesc.achVolumeId),
+                                                       pvInfo, cbInfo, pcbRet);
+            return rtFsIsoVol_ReturnIso9660D1String(uBuf.SupVolDesc.achVolumeId, sizeof(uBuf.SupVolDesc.achVolumeId),
+                                                    pvInfo, cbInfo, pcbRet);
         }
 

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -2319 +2319 @@
 
 
-RTDECL(int) RTVfsQueryLabel(RTVFS hVfs, char *pszLabel, size_t cbLabel, size_t *pcbActual)
+RTDECL(int) RTVfsQueryLabel(RTVFS hVfs, bool fAlternative, char *pszLabel, size_t cbLabel, size_t *pcbActual)
 {
     RTVFSINTERNAL *pThis = hVfs;
@@ -2336 +2336 @@
 
         RTVfsLockAcquireRead(pThis->Base.hLock);
-        rc = pThis->pOps->Obj.pfnQueryInfoEx(pThis->Base.pvThis, RTVFSQIEX_VOL_LABEL, pszLabel, cbLabel, pcbActual);
+        rc = pThis->pOps->Obj.pfnQueryInfoEx(pThis->Base.pvThis, !fAlternative ? RTVFSQIEX_VOL_LABEL : RTVFSQIEX_VOL_LABEL_ALT,
+                                             pszLabel, cbLabel, pcbActual);
         RTVfsLockReleaseRead(pThis->Base.hLock);
     }