Browse Source

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

Ryan C. Gordon 19 years ago
parent
commit
785d617e74
2 changed files with 5 additions and 2 deletions
  1. 3 0
      CHANGELOG
  2. 2 2
      physfs.c

+ 3 - 0
CHANGELOG

@@ -4,6 +4,9 @@
 
 
 -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---
 -- 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
 03262007 - Fixed minor cosmetic issue in Windows error messages where it would
            leave whitespace and newlines at the end of the string.
            leave whitespace and newlines at the end of the string.
 09232006 - Fixed typo in doxygen comment.
 09232006 - Fixed typo in doxygen comment.

+ 2 - 2
physfs.c

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