Backport of r880:881 from trunk: try DIR archiver first. stable-1.0
authorRyan C. Gordon <icculus@icculus.org>
Sat, 31 Mar 2007 06:56:15 +0000
branchstable-1.0
changeset 870 95afd7667adf
parent 860 d4dac47eb63c
child 883 56e2e76653a5
Backport of r880:881 from trunk: try DIR archiver first.
CHANGELOG
physfs.c
--- a/CHANGELOG	Mon Mar 26 06:34:55 2007 +0000
+++ b/CHANGELOG	Sat Mar 31 06:56:15 2007 +0000
@@ -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.
--- a/physfs.c	Mon Mar 26 06:34:55 2007 +0000
+++ b/physfs.c	Sat Mar 31 06:56:15 2007 +0000
@@ -108,12 +108,13 @@
     &__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 @@
     &__PHYSFS_DirFunctions_WAD,
 #endif
 
-    &__PHYSFS_DirFunctions_DIR,
     NULL
 };