From e38b16ccb3441d2bf4d58835b644c426dd157f23 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 21 Mar 2002 03:22:04 +0000 Subject: [PATCH] Patched to compile. --- platform/win32.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/platform/win32.c b/platform/win32.c index f933e164..125b7645 100644 --- a/platform/win32.c +++ b/platform/win32.c @@ -70,10 +70,11 @@ char **__PHYSFS_platformDetectAvailableCDs(void) } /* __PHYSFS_detectAvailableCDs */ -static char *getExePath(void) +static char *getExePath(const char *argv0) { + char *filepart = NULL; char *retval = (char *) malloc(sizeof (TCHAR) * (MAX_PATH + 1)); - buflen = GetModuleFileName(NULL, retval, MAX_PATH + 1); + DWORD buflen = GetModuleFileName(NULL, retval, MAX_PATH + 1); retval[buflen] = '\0'; /* does API always null-terminate the string? */ /* make sure the string was not truncated. */ @@ -103,14 +104,10 @@ static char *getExePath(void) char *__PHYSFS_platformCalcBaseDir(const char *argv0) { - DWORD buflen = 0; - char *retval = NULL; - char *filepart = NULL; - if (strchr(argv0, '\\') != NULL) /* default behaviour can handle this. */ return(NULL); - return(getExePath()); + return(getExePath(argv0)); } /* __PHYSFS_platformCalcBaseDir */ @@ -175,8 +172,7 @@ char *__PHYSFS_platformGetUserDir(void) } /* if */ } /* if */ - /* screw it; it's the same as the base dir... */ - return(getExePath()); + return(NULL); } /* __PHYSFS_platformGetUserDir */