walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed calculateUserDir() to prevent extra dir separator insertion in default case.

This commit is contained in:
Ryan C. Gordon 2002-04-02 13:39:44 +00:00
parent 85ec84ed37
commit 21a2eda1b5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
physfs.c
View File

@ -279,12 +279,12 @@ static char *calculateUserDir(void)
str = (uname != NULL) ? uname : "default"; str = (uname != NULL) ? uname : "default";
retval = (char *) malloc(strlen(baseDir) + strlen(str) + retval = (char *) malloc(strlen(baseDir) + strlen(str) +
(strlen(dirsep) * 2) + 6); strlen(dirsep) + 6);
if (retval == NULL) if (retval == NULL)
__PHYSFS_setError(ERR_OUT_OF_MEMORY); __PHYSFS_setError(ERR_OUT_OF_MEMORY);
else else
sprintf(retval, "%s%susers%s%s", baseDir, dirsep, dirsep, str); sprintf(retval, "%susers%s%s", baseDir, dirsep, str);
if (uname != NULL) if (uname != NULL)
free((void *) uname); free((void *) uname);
@ -398,7 +398,6 @@ int PHYSFS_init(const char *argv0)
char *ptr; char *ptr;
BAIL_IF_MACRO(initialized, ERR_IS_INITIALIZED, 0); BAIL_IF_MACRO(initialized, ERR_IS_INITIALIZED, 0);
BAIL_IF_MACRO(argv0 == NULL, ERR_INVALID_ARGUMENT, 0);
BAIL_IF_MACRO(!__PHYSFS_platformInit(), NULL, 0); BAIL_IF_MACRO(!__PHYSFS_platformInit(), NULL, 0);
BAIL_IF_MACRO(!initializeMutexes(), NULL, 0); BAIL_IF_MACRO(!initializeMutexes(), NULL, 0);