From ff78cd9edd672080475ddfa1b982d9c770aca6f0 Mon Sep 17 00:00:00 2001 From: Marco Peereboom Date: Wed, 15 Feb 2012 17:26:10 -0600 Subject: [PATCH 1/1] try multiple config files --- spectrwm.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/spectrwm.c b/spectrwm.c index 5951b9e..5e9f3ef 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -6972,44 +6972,39 @@ main(int argc, char *argv[]) /* load config */ for (i = 0; ; i++) { + conf[0] = '\0'; switch (i) { case 0: /* ~ */ snprintf(conf, sizeof conf, "%s/.%s", pwd->pw_dir, SWM_CONF_FILE); - if (stat(conf, &sb) != -1) - if (S_ISREG(sb.st_mode)) - cfile = conf; break; case 1: /* global */ snprintf(conf, sizeof conf, "/etc/%s", SWM_CONF_FILE); - if (stat(conf, &sb) != -1) - if (S_ISREG(sb.st_mode)) - cfile = conf; break; case 2: /* ~ compat */ snprintf(conf, sizeof conf, "%s/.%s", pwd->pw_dir, SWM_CONF_FILE_OLD); - if (stat(conf, &sb) != -1) - if (S_ISREG(sb.st_mode)) - cfile = conf; break; case 3: /* global compat */ snprintf(conf, sizeof conf, "/etc/%s", SWM_CONF_FILE_OLD); - if (stat(conf, &sb) != -1) - if (S_ISREG(sb.st_mode)) - cfile = conf; break; default: - cfile = NULL; - break; + goto noconfig; } + + if (strlen(conf) && stat(conf, &sb) != -1) + if (S_ISREG(sb.st_mode)) { + cfile = conf; + break; + } } +noconfig: /* load conf (if any) and refresh font color in bar graphics contexts */ if (cfile && conf_load(cfile, SWM_CONF_DEFAULT) == 0) -- 1.7.10.4