r882 - branches/stable-1.0

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2007-03-31 02:56:15 -0400 (Sat, 31 Mar 2007)
New Revision: 882

Modified:
   branches/stable-1.0/CHANGELOG
   branches/stable-1.0/physfs.c
Log:
Backport of r880:881 from trunk: try DIR archiver first.


Modified: branches/stable-1.0/CHANGELOG
===================================================================
--- branches/stable-1.0/CHANGELOG	2007-03-31 06:52:27 UTC (rev 881)
+++ branches/stable-1.0/CHANGELOG	2007-03-31 06:56:15 UTC (rev 882)
@@ -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.

Modified: branches/stable-1.0/physfs.c
===================================================================
--- branches/stable-1.0/physfs.c	2007-03-31 06:52:27 UTC (rev 881)
+++ branches/stable-1.0/physfs.c	2007-03-31 06:56:15 UTC (rev 882)
@@ -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
 };