arcfw(cdfs): when opening file without extension also check for filen…

…ame with dot suffix NT 3.51 PMZ has setupldr actually named "setupldr.", so this is required there. Fixes #33 .
Wack0 · Aug 4, 2024 · 89e8fb5 · 89e8fb5
1 parent 1e28b96
commit 89e8fb5
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/arcgrackle/source/lib9660.c b/arcgrackle/source/lib9660.c
@@ -196,11 +196,14 @@ static l9660_status openat_raw(l9660_file *child, l9660_dir *parent, const char
         const char *seg = name;
         name = strchrnul(name, '\\');
         size_t seglen = (size_t)name - (size_t)seg;
+        bool check_also_for_dot = false;
         if (*name) name++;
+        else if (strchr(seg, '.') == NULL) check_also_for_dot = true;
 
         /* ISO9660 stores '.' as '\0' */
-        if (seglen == 1 && *seg == '.')
+        if (seglen == 1 && *seg == '.') {
             seg = "\0";
+        }
 
         /* ISO9660 stores ".." as '\1' */
         if (seglen == 2 && seg[0] == '.' && seg[1] == '.') {
@@ -221,16 +224,23 @@ static l9660_status openat_raw(l9660_file *child, l9660_dir *parent, const char
 #endif
 
             /* wrong length */
-            if (seglen > dent->name_len)
+            if (seglen > dent->name_len) {
                 continue;
+            }
 
             /* check name */
             if (strnicmp(seg, dent->name, seglen) != 0)
                 continue;
 
             /* check for a revision tag */
-            if (dent->name_len > seglen && dent->name[seglen] != ';')
-                continue;
+            if (dent->name_len > seglen && dent->name[seglen] != ';') {
+                if (!check_also_for_dot) continue;
+                if (dent->name_len > (seglen + 1)) {
+                    if (dent->name[seglen] != '.') continue;
+                    if (dent->name[seglen + 1] != ';') continue;
+                }
+                else continue;
+            }
 
             /* all tests pass */
             break;