Add '/' to GetUserFolder(HOME) on Cocoa & Unix

This commit is contained in:
Semphris 2024-05-02 11:29:14 -04:00 committed by Sam Lantinga
parent eb2c9e9235
commit 0178b19489
2 changed files with 6 additions and 2 deletions

View file

@ -146,9 +146,10 @@ char *SDL_GetUserFolder(SDL_Folder folder)
if (!base) { if (!base) {
SDL_SetError("No $HOME environment variable available"); SDL_SetError("No $HOME environment variable available");
return NULL;
} }
return SDL_strdup(base); goto append_slash;
case SDL_FOLDER_DESKTOP: case SDL_FOLDER_DESKTOP:
dir = NSDesktopDirectory; dir = NSDesktopDirectory;
@ -209,6 +210,7 @@ char *SDL_GetUserFolder(SDL_Folder folder)
return NULL; return NULL;
} }
append_slash:
retval = SDL_malloc(SDL_strlen(base) + 2); retval = SDL_malloc(SDL_strlen(base) + 2);
if (retval == NULL) { if (retval == NULL) {
return NULL; return NULL;

View file

@ -535,7 +535,8 @@ char *SDL_GetUserFolder(SDL_Folder folder)
return NULL; return NULL;
} }
return SDL_strdup(param); retval = SDL_strdup(param);
goto append_slash;
case SDL_FOLDER_DESKTOP: case SDL_FOLDER_DESKTOP:
param = "DESKTOP"; param = "DESKTOP";
@ -595,6 +596,7 @@ char *SDL_GetUserFolder(SDL_Folder folder)
return NULL; return NULL;
} }
append_slash:
newretval = (char *) SDL_realloc(retval, SDL_strlen(retval) + 2); newretval = (char *) SDL_realloc(retval, SDL_strlen(retval) + 2);
if (!newretval) { if (!newretval) {