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

Cleanups in calculateBaseDir.

This commit is contained in:
Ryan C. Gordon 2007-03-21 05:22:48 +00:00
parent 075e6769e2
commit 030e84f356
1 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
physfs.c
View File

@ -651,35 +651,38 @@ static int appendDirSep(char **dir)
static char *calculateBaseDir(const char *argv0) static char *calculateBaseDir(const char *argv0)
{ {
const char *dirsep = PHYSFS_getDirSeparator(); char *retval = NULL;
char *retval; const char *dirsep = NULL;
char *ptr; char *ptr = NULL;
/* /* Give the platform layer first shot at this. */
* See if the platform driver wants to handle this for us...
*/
retval = __PHYSFS_platformCalcBaseDir(argv0); retval = __PHYSFS_platformCalcBaseDir(argv0);
if (retval != NULL) if (retval != NULL)
return(retval); return(retval);
/* we need argv0 to be sane to go on. */ /* We need argv0 to go on. */
BAIL_IF_MACRO(argv0 == NULL, ERR_INVALID_ARGUMENT, NULL); BAIL_IF_MACRO(argv0 == NULL, ERR_ARGV0_IS_NULL, NULL);
/* dirsep = PHYSFS_getDirSeparator();
* Determine if there's a path on argv0. If there is, that's the base dir. if (strlen(dirsep) == 1) /* fast path. */
*/ ptr = strrchr(argv0, *dirsep);
else
{
ptr = strstr(argv0, dirsep); ptr = strstr(argv0, dirsep);
if (ptr != NULL) if (ptr != NULL)
{ {
char *p = ptr; char *p = ptr;
size_t size;
while (p != NULL) while (p != NULL)
{ {
ptr = p; ptr = p;
p = strstr(p + 1, dirsep); p = strstr(p + 1, dirsep);
} /* while */ } /* while */
} /* if */
} /* else */
size = (size_t) (ptr - argv0); if (ptr != NULL)
{
size_t size = (size_t) (ptr - argv0);
retval = (char *) allocator.Malloc(size + 1); retval = (char *) allocator.Malloc(size + 1);
BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL);
memcpy(retval, argv0, size); memcpy(retval, argv0, size);
@ -687,23 +690,9 @@ static char *calculateBaseDir(const char *argv0)
return(retval); return(retval);
} /* if */ } /* if */
/* !!! FIXME: should probably just fail here instead of being heroic. */ /* argv0 wasn't helpful. */
BAIL_MACRO(ERR_INVALID_ARGUMENT, NULL);
/* return(NULL);
* Last ditch effort: it's the current working directory. (*shrug*)
*/
retval = __PHYSFS_platformCurrentDir();
if (retval != NULL)
return(retval);
/*
* Ok, current directory doesn't exist, use the root directory.
* Not a good alternative, but it only happens if the current
* directory was deleted from under the program.
*/
retval = (char *) allocator.Malloc(strlen(dirsep) + 1);
strcpy(retval, dirsep);
return(retval);
} /* calculateBaseDir */ } /* calculateBaseDir */
@ -752,6 +741,7 @@ int PHYSFS_init(const char *argv0)
baseDir = calculateBaseDir(argv0); baseDir = calculateBaseDir(argv0);
BAIL_IF_MACRO(baseDir == NULL, NULL, 0); BAIL_IF_MACRO(baseDir == NULL, NULL, 0);
/* !!! FIXME: only call this if we got this from argv0 (unreliable). */
ptr = __PHYSFS_platformRealPath(baseDir); ptr = __PHYSFS_platformRealPath(baseDir);
allocator.Free(baseDir); allocator.Free(baseDir);
BAIL_IF_MACRO(ptr == NULL, NULL, 0); BAIL_IF_MACRO(ptr == NULL, NULL, 0);