From e444f9ed023d280c063470e071bbfad467f41cea Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 26 Sep 2001 03:08:57 +0000 Subject: [PATCH] PHYSFS_setSaneConfig() fixes: set write dir correctly, and put it at start of search path. --- physfs.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/physfs.c b/physfs.c index d0c3d4e3..df1e1b7a 100644 --- a/physfs.c +++ b/physfs.c @@ -652,17 +652,21 @@ int PHYSFS_setSaneConfig(const char *organization, const char *appName, if (!PHYSFS_setWriteDir(str)) { - if ( (!PHYSFS_setWriteDir(userdir)) || - (!PHYSFS_mkdir(str + strlen(userdir))) ) + if ( (PHYSFS_setWriteDir(userdir)) && + (PHYSFS_mkdir(str + strlen(userdir))) ) + { + PHYSFS_setWriteDir(str); + } /* if */ + else { PHYSFS_setWriteDir(NULL); free(str); BAIL_IF_MACRO(1, ERR_CANT_SET_WRITE_DIR, 0); - } /* if */ + } /* else */ } /* if */ - /* Put write dir related dirs on search path... */ - PHYSFS_addToSearchPath(str, 1); + /* Put write dir first in search path... */ + PHYSFS_addToSearchPath(str, 0); free(str); /* Put base path on search path... */