WAD: add support for tags and labels

Labeled and tagged lumps are put in a folder.

Author: madebr

src/physfs_archiver_wad.c

@@ -47,13 +47,25 @@
 
 #if PHYSFS_SUPPORTS_WAD
 
+#define MAX_DEPTH 16
+
 static int wadLoadEntries(PHYSFS_Io *io, const PHYSFS_uint32 count, void *arc)
 {
+    PHYSFS_sint32 depth;
+    char path[(MAX_DEPTH - 1) * 2 + 8 + MAX_DEPTH + 8 + 1];
+    PHYSFS_uint32 parent_positions[MAX_DEPTH+1];
+    int parent_is_label = 0;
     PHYSFS_uint32 i;
+
+    depth = 0;
+    path[0] = '\0';
+    parent_positions[0] = 0;
+
     for (i = 0; i < count; i++)
     {
         PHYSFS_uint32 pos;
         PHYSFS_uint32 size;
+        int is_directory;
         char name[9];
 
         BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &pos, 4), 0);
@@ -63,9 +75,48 @@ static int wadLoadEntries(PHYSFS_Io *io, const PHYSFS_uint32 count, void *arc)
         name[8] = '\0'; /* name might not be null-terminated in file. */
         size = PHYSFS_swapULE32(size);
         pos = PHYSFS_swapULE32(pos);
-        BAIL_IF_ERRPASS(!UNPK_addEntry(arc, name, 0, -1, -1, pos, size), 0);
+        is_directory = 0;
+
+        if (size == 0) {
+            size_t len = strlen(name);
+
+            if (parent_is_label) {
+                BAIL_IF_ERRPASS(depth <= 0, 0);
+                depth -= 1;
+                parent_is_label = 0;
+            }
+
+            if (len > 6 && strcmp(name + len - 6, "_START") == 0) {
+                BAIL_IF_ERRPASS(depth > MAX_DEPTH, 0);
+                is_directory = 1;
+
+                strncpy(path + parent_positions[depth], name, len - 6);
+                strcpy(path + parent_positions[depth] + len - 6, "/");
+                depth += 1;
+                parent_positions[depth] = parent_positions[depth - 1] + len - 5;
+            } else if (len > 4 && strcmp(name + len - 4, "_END") == 0) {
+                BAIL_IF_ERRPASS(depth <= 0, 0);
+
+                depth -= 1;
+            } else {
+                BAIL_IF_ERRPASS(depth > MAX_DEPTH, 0);
+                is_directory = 1;
+                parent_is_label = 1;
+
+                strncpy(path + parent_positions[depth], name, len);
+                strcpy(path + parent_positions[depth] + len, "/");
+                depth += 1;
+                parent_positions[depth] = parent_positions[depth - 1] + len + 1;
+            }
+            continue;
+        } else {
+            strcpy(path + parent_positions[depth], name);
+        }
+        BAIL_IF_ERRPASS(!UNPK_addEntry(arc, path, is_directory, -1, -1, pos, size), 0);
     } /* for */
 
+    BAIL_IF_ERRPASS(depth != 0, 0);
+
     return 1;
 } /* wadLoadEntries */
 
@@ -90,10 +141,10 @@ static void *WAD_openArchive(PHYSFS_Io *io, const char *name,
     BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &count, sizeof (count)), NULL);
     count = PHYSFS_swapULE32(count);
 
-    BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &directoryOffset, 4), 0);
+    BAIL_IF_ERRPASS(!__PHYSFS_readAll(io, &directoryOffset, 4), NULL);
     directoryOffset = PHYSFS_swapULE32(directoryOffset);
 
-    BAIL_IF_ERRPASS(!io->seek(io, directoryOffset), 0);
+    BAIL_IF_ERRPASS(!io->seek(io, directoryOffset), NULL);
 
     unpkarc = UNPK_openArchive(io, 0, 1);
     BAIL_IF_ERRPASS(!unpkarc, NULL);