Skip to content
Permalink
Browse files

SDL_GetPrefPath() now uses the organization on all platforms.

Even if that's not the general convention for a given platform.
  • Loading branch information
icculus committed Oct 23, 2013
1 parent 298d3d6 commit 28aa076c8b51d4bc20802c7ce720db1d2fd1aa49
@@ -76,12 +76,12 @@ SDL_GetPrefPath(const char *org, const char *app)
// !!! FIXME: is there a better way to do this?
const char *home = SDL_getenv("HOME");
const char *append = "config/settings/";
const size_t len = SDL_strlen(home) + SDL_strlen(append) + SDL_strlen(app) + 2;
const size_t len = SDL_strlen(home) + SDL_strlen(append) + SDL_strlen(org) + SDL_strlen(app) + 3;
char *retval = (char *) SDL_malloc(len);
if (!retval) {
SDL_OutOfMemory();
} else {
SDL_snprintf(retval, len, "%s%s%s/", home, append, app);
SDL_snprintf(retval, len, "%s%s%s/%s/", home, append, org, app);
create_directory(retval, 0700); // BeOS api: creates missing dirs
}

@@ -73,19 +73,17 @@
NSArray *array = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
char *retval = NULL;

(void) org; /* unused on Mac OS X and iOS. */

if ([array count] > 0) { /* we only want the first item in the list. */
NSString *str = [array objectAtIndex:0];
const char *base = [str fileSystemRepresentation];
if (base) {
const size_t len = SDL_strlen(base) + SDL_strlen(app) + 3;
const size_t len = SDL_strlen(base) + SDL_strlen(app) + 4;
retval = (char *) SDL_malloc(len);
if (retval == NULL) {
SDL_OutOfMemory();
} else {
char *ptr;
SDL_snprintf(retval, len, "%s/%s/", base, app);
SDL_snprintf(retval, len, "%s/%s/%s/", base, org, app);
for (ptr = retval+1; *ptr; ptr++) {
if (*ptr == '/') {
*ptr = '\0';
@@ -178,14 +178,14 @@ SDL_GetPrefPath(const char *org, const char *app)
if (envr[len - 1] == '/')
append += 1;

len += SDL_strlen(append) + SDL_strlen(app) + 2;
len += SDL_strlen(append) + SDL_strlen(org) + SDL_strlen(app) + 3;
retval = (char *) SDL_malloc(len);
if (!retval) {
SDL_OutOfMemory();
return NULL;
}

SDL_snprintf(retval, len, "%s%s%s/", envr, append, app);
SDL_snprintf(retval, len, "%s%s%s/%s/", envr, append, org, app);

for (ptr = retval+1; *ptr; ptr++) {
if (*ptr == '/') {

0 comments on commit 28aa076

Please sign in to comment.