Changeset 93081 in vbox for trunk/src/VBox/Runtime/common/fs

Timestamp:

Dec 26, 2021 1:25:45 AM (3 years ago)

Author:

vboxsync

Message:

IPRT/isovfs.cpp: Made it handle OS/2 ACP2, MCP2 and similar images that doesn't terminate the volume descriptors. Also made it deal with images containing non-conforming filenames, i.e. mixed or lower case instead of all upper case (ACP2, MCP2, ++).

File:

• trunk/src/VBox/Runtime/common/fs/isovfs.cpp (modified) (6 diffs)

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

@@ -451 +451 @@
 
 
-
-/*********************************************************************************************************************************
-*   Global Variables                                                                                                             *
-*********************************************************************************************************************************/
-
-
 /*********************************************************************************************************************************
 *   Internal Functions                                                                                                           *
@@ -2434 +2428 @@
  * @param   cchEntry            The length of the compare string.
  * @param   puVersion           Where to return any file version number.
+ *
+ * @note    We're using RTStrNICmpAscii here because of non-conforming ISOs with
+ *          entirely lowercase name or mixed cased names.
  */
 DECL_FORCE_INLINE(bool) rtFsIsoDir_IsEntryEqualAscii(PCISO9660DIRREC pDirRec, const char *pszEntry, size_t cchEntry,
-                                                         uint32_t *puVersion)
+                                                     uint32_t *puVersion)
 {
     /* ASSUME directories cannot have any version tags. */
@@ -2443 +2440 @@
         if (RT_LIKELY(pDirRec->bFileIdLength != cchEntry))
             return false;
-        if (RT_LIKELY(memcmp(pDirRec->achFileId, pszEntry, cchEntry) != 0))
+        if (RT_LIKELY(RTStrNICmpAscii(pDirRec->achFileId, pszEntry, cchEntry) != 0))
             return false;
     }
@@ -2453 +2450 @@
         if (cchNameDelta == 0)
         {
-            if (RT_LIKELY(memcmp(pDirRec->achFileId, pszEntry, cchEntry) != 0))
+            if (RT_LIKELY(RTStrNICmpAscii(pDirRec->achFileId, pszEntry, cchEntry) != 0))
                 return false;
             *puVersion = 1;
@@ -2461 +2458 @@
             if (RT_LIKELY(pDirRec->achFileId[cchEntry] != ';'))
                 return false;
-            if (RT_LIKELY(memcmp(pDirRec->achFileId, pszEntry, cchEntry) != 0))
+            if (RT_LIKELY(RTStrNICmpAscii(pDirRec->achFileId, pszEntry, cchEntry) != 0))
                 return false;
             uint32_t uVersion;
@@ -5787 +5784 @@
                                            "Not ISO? Unable to recognize volume descriptor signature: %.5Rhxs", Buf.VolDescHdr.achStdId);
         else if (enmState == kStateCdSeq)
+        {
+#if 1
+            /* The warp server for ebusiness update ISOs knowns as ACP2 & MCP2 ends up here,
+               as they do in deed miss a terminator volume descriptor and we're now at the
+               root directory already. Just detect this, ignore it and get on with things. */
+            Log(("rtFsIsoVolTryInit: Ignoring missing ISO 9660 terminator volume descriptor (found %.5Rhxs).\n",
+                 Buf.VolDescHdr.achStdId));
+            break;
+#else
             return RTERRINFO_LOG_SET_F(pErrInfo, VERR_VFS_BOGUS_FORMAT,
                                        "Missing ISO 9660 terminator volume descriptor? (Found %.5Rhxs)", Buf.VolDescHdr.achStdId);
+#endif
+        }
         else if (enmState == kStateUdfSeq)
             return RTERRINFO_LOG_SET_F(pErrInfo, VERR_VFS_BOGUS_FORMAT,