Commit ef8324c7 authored by Albert Gräf's avatar Albert Gräf
Browse files

Turn the user config dir (~/.pd-l2ork on Linux) into a #define so that it's...

Turn the user config dir (~/.pd-l2ork on Linux) into a #define so that it's easier to patch it up when needed.
parent 55f48b71
...@@ -46,6 +46,8 @@ void sys_doflags( void); ...@@ -46,6 +46,8 @@ void sys_doflags( void);
#ifdef UNIX #ifdef UNIX
#define USER_CONFIG_DIR ".pd-l2ork"
static char *sys_prefbuf; static char *sys_prefbuf;
static int sys_prefbufsize; static int sys_prefbufsize;
...@@ -62,7 +64,7 @@ static void sys_initloadpreferences( void) ...@@ -62,7 +64,7 @@ static void sys_initloadpreferences( void)
sys_libdir->s_name); sys_libdir->s_name);
if (homedir) if (homedir)
snprintf(user_prefs_file, FILENAME_MAX, "%s/.pd-l2ork/user.settings", homedir); snprintf(user_prefs_file, FILENAME_MAX, "%s/" USER_CONFIG_DIR "/user.settings", homedir);
if (stat(user_prefs_file, &statbuf) == 0) if (stat(user_prefs_file, &statbuf) == 0)
strncpy(filenamebuf, user_prefs_file, FILENAME_MAX); strncpy(filenamebuf, user_prefs_file, FILENAME_MAX);
else if (stat(default_prefs_file, &statbuf) == 0) else if (stat(default_prefs_file, &statbuf) == 0)
...@@ -143,7 +145,7 @@ static void sys_initsavepreferences( void) ...@@ -143,7 +145,7 @@ static void sys_initsavepreferences( void)
if (!homedir) if (!homedir)
return; return;
snprintf(filenamebuf, FILENAME_MAX, "%s/.pd-l2ork", homedir); snprintf(filenamebuf, FILENAME_MAX, "%s/" USER_CONFIG_DIR, homedir);
filenamebuf[FILENAME_MAX-1] = 0; filenamebuf[FILENAME_MAX-1] = 0;
if (stat(filenamebuf, &statbuf) || !S_ISDIR(statbuf.st_mode)) { if (stat(filenamebuf, &statbuf) || !S_ISDIR(statbuf.st_mode)) {
// user config dir doesn't exist yet, try to create it // user config dir doesn't exist yet, try to create it
...@@ -152,7 +154,7 @@ static void sys_initsavepreferences( void) ...@@ -152,7 +154,7 @@ static void sys_initsavepreferences( void)
return; return;
} }
} }
snprintf(filenamebuf, FILENAME_MAX, "%s/.pd-l2ork/user.settings", homedir); snprintf(filenamebuf, FILENAME_MAX, "%s/" USER_CONFIG_DIR "/user.settings", homedir);
filenamebuf[FILENAME_MAX-1] = 0; filenamebuf[FILENAME_MAX-1] = 0;
if ((sys_prefsavefp = fopen(filenamebuf, "w")) == NULL) if ((sys_prefsavefp = fopen(filenamebuf, "w")) == NULL)
{ {
...@@ -683,7 +685,7 @@ void sys_save_recent_files(void) ...@@ -683,7 +685,7 @@ void sys_save_recent_files(void)
char filenamebuf[FILENAME_MAX], *homedir = getenv("HOME"); char filenamebuf[FILENAME_MAX], *homedir = getenv("HOME");
struct stat statbuf; struct stat statbuf;
if (!homedir) return; if (!homedir) return;
snprintf(filenamebuf, FILENAME_MAX, "%s/.pd-l2ork", homedir); snprintf(filenamebuf, FILENAME_MAX, "%s/" USER_CONFIG_DIR, homedir);
filenamebuf[FILENAME_MAX-1] = 0; filenamebuf[FILENAME_MAX-1] = 0;
if (stat(filenamebuf, &statbuf) || !S_ISDIR(statbuf.st_mode)) { if (stat(filenamebuf, &statbuf) || !S_ISDIR(statbuf.st_mode)) {
// user config dir doesn't exist yet, try to create it // user config dir doesn't exist yet, try to create it
...@@ -692,7 +694,7 @@ void sys_save_recent_files(void) ...@@ -692,7 +694,7 @@ void sys_save_recent_files(void)
return; return;
} }
} }
snprintf(filenamebuf, FILENAME_MAX, "%s/.pd-l2ork/recent_files", homedir); snprintf(filenamebuf, FILENAME_MAX, "%s/" USER_CONFIG_DIR "/recent_files", homedir);
filenamebuf[FILENAME_MAX-1] = 0; filenamebuf[FILENAME_MAX-1] = 0;
if ((fp = fopen(filenamebuf, "w")) == NULL) { if ((fp = fopen(filenamebuf, "w")) == NULL) {
pd_error(0, "%s: %s",filenamebuf, strerror(errno)); pd_error(0, "%s: %s",filenamebuf, strerror(errno));
...@@ -723,7 +725,7 @@ void sys_load_recent_files(void) ...@@ -723,7 +725,7 @@ void sys_load_recent_files(void)
FILE *fp; FILE *fp;
char filenamebuf[FILENAME_MAX], *homedir = getenv("HOME"); char filenamebuf[FILENAME_MAX], *homedir = getenv("HOME");
if (!homedir) return; if (!homedir) return;
snprintf(filenamebuf, FILENAME_MAX, "%s/.pd-l2ork/recent_files", homedir); snprintf(filenamebuf, FILENAME_MAX, "%s/" USER_CONFIG_DIR "/recent_files", homedir);
filenamebuf[FILENAME_MAX-1] = 0; filenamebuf[FILENAME_MAX-1] = 0;
if ((fp = fopen(filenamebuf, "r")) == NULL) return; if ((fp = fopen(filenamebuf, "r")) == NULL) return;
for (sys_n_recent_files = 0; sys_n_recent_files < MAX_RECENT_FILES && for (sys_n_recent_files = 0; sys_n_recent_files < MAX_RECENT_FILES &&
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment