encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Christoph Mallon: Simplify avoidance of duplicate / in SDL_GetPrefPath()

This commit is contained in:
Sam Lantinga 2013-08-29 08:24:43 -07:00
parent 257cef3024
commit 321aa4ae10
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/filesystem/unix/SDL_sysfilesystem.c
View File

@ -156,7 +156,7 @@ SDL_GetPrefPath(const char *org, const char *app)
* http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html * http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
*/ */
const char *envr = SDL_getenv("XDG_DATA_HOME"); const char *envr = SDL_getenv("XDG_DATA_HOME");
const char *append = "/"; const char *append;
char *retval = NULL; char *retval = NULL;
char *ptr = NULL; char *ptr = NULL;
size_t len = 0; size_t len = 0;
@ -169,18 +169,16 @@ SDL_GetPrefPath(const char *org, const char *app)
SDL_SetError("neither XDG_DATA_HOME nor HOME environment is set"); SDL_SetError("neither XDG_DATA_HOME nor HOME environment is set");
return NULL; return NULL;
} }
if (envr[SDL_strlen(envr) - 1] == '/') {
append = ".local/share/";
} else {
append = "/.local/share/"; append = "/.local/share/";
}
} else { } else {
if (envr[SDL_strlen(envr) - 1] == '/') { append = "/";
append = "";
}
} /* if */ } /* if */
len = SDL_strlen(envr) + SDL_strlen(append) + SDL_strlen(app) + 2; len = SDL_strlen(envr);
if (envr[len - 1] == '/')
append += 1;
len += SDL_strlen(append) + SDL_strlen(app) + 2;
retval = (char *) SDL_malloc(len); retval = (char *) SDL_malloc(len);
if (!retval) { if (!retval) {
SDL_OutOfMemory(); SDL_OutOfMemory();