From 785d617e744289eb47c4a98c97a6754176ea1f0f Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sat, 31 Mar 2007 06:56:15 +0000
Subject: [PATCH] Backport of r880:881 from trunk: try DIR archiver first.

---
 CHANGELOG | 3 +++
 physfs.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index fbb8501..146c4bd 100644
--- 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
index 127b32d..e4c9d8d 100644
--- 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
 };