Backport of r880:881 from trunk: try DIR archiver first.

icculus · Mar 31, 2007 · 785d617 · 785d617
1 parent bc14217
commit 785d617
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,6 +4,9 @@
 
 -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---
 
+03312007 - Moved DIR archiver to start of the list, so we don't have to have
+           every other archiver fail to open a directory as a file before
+           adding it to the search path.
 03262007 - Fixed minor cosmetic issue in Windows error messages where it would
            leave whitespace and newlines at the end of the string.
 09232006 - Fixed typo in doxygen comment.

diff --git a/physfs.c b/physfs.c
@@ -108,12 +108,13 @@ static const PHYSFS_ArchiveInfo *supported_types[] =
     &__PHYSFS_ArchiveInfo_WAD,
 #endif
 
-
     NULL
 };
 
 static const DirFunctions *dirFunctions[] =
 {
+    &__PHYSFS_DirFunctions_DIR,
+
 #if (defined PHYSFS_SUPPORTS_ZIP)
     &__PHYSFS_DirFunctions_ZIP,
 #endif
@@ -138,7 +139,6 @@ static const DirFunctions *dirFunctions[] =
     &__PHYSFS_DirFunctions_WAD,
 #endif
 
-    &__PHYSFS_DirFunctions_DIR,
     NULL
 };