X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-conf.c;h=a29a58bfc7979df54957028a24cbc5b8734c72e9;hb=cab77e4ffc25ba4fb2e5289beaa47c7d915de942;hp=ec61cd2332b1eea0805f9052cf0b3a96e7b37117;hpb=4c8bebffd4bc105ebaa09256b7a57f4a6201bd52;p=onak.git diff --git a/onak-conf.c b/onak-conf.c index ec61cd2..a29a58b 100644 --- a/onak-conf.c +++ b/onak-conf.c @@ -92,10 +92,28 @@ void readconfig(const char *configfile) { FILE *conffile; char curline[1024]; int i; + char *dir, *conf; + size_t len; curline[1023] = 0; if (configfile == NULL) { - conffile = fopen(CONFIGFILE, "r"); + conffile = NULL; + if ((dir = getenv("XDG_CONFIG_HOME")) != NULL) { + len = strlen(dir) + 1 + 9 + 1; /* dir + / + onak.conf + NUL */ + conf = malloc(len); + snprintf(conf, len, "%s/onak.conf", dir); + conffile = fopen(conf, "r"); + free(conf); + } else if ((dir = getenv("HOME")) != NULL) { + len = strlen(dir) + 18 + 1; /* dir + /.config/onak.conf + NUL */ + conf = malloc(len); + snprintf(conf, len, "%s/.config/onak.conf", dir); + conffile = fopen(conf, "r"); + free(conf); + } + if (conffile == NULL) { + conffile = fopen(CONFIGFILE, "r"); + } } else { conffile = fopen(configfile, "r"); }