X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-conf.c;h=763bdb203de12b60bd88b3818b75bd76c66672aa;hb=a183a1f43e77bc96119f60a5b056dd0a489eabe2;hp=ec61cd2332b1eea0805f9052cf0b3a96e7b37117;hpb=4c8bebffd4bc105ebaa09256b7a57f4a6201bd52;p=onak.git

diff --git a/onak-conf.c b/onak-conf.c
index ec61cd2..763bdb2 100644
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -28,7 +28,7 @@
 #include "log.h"
 #include "onak-conf.h"
 
-extern struct dbfuncs DBFUNCS;
+extern struct onak_dbctx *DBINIT(bool readonly);
 
 /*
  *	config - Runtime configuration for onak.
@@ -45,6 +45,7 @@ struct onak_config config = {
 	NULL,			/* logfile */
 
 	false,			/* use_keyd */
+	".",			/* sock_dir */
 
 	/*
 	 * Options for directory backends.
@@ -65,7 +66,7 @@ struct onak_config config = {
 	NULL,			/* db_backend */
 	NULL,			/* backends_dir */
 
-	&DBFUNCS,		/* Default dbfuncs struct */
+	DBINIT,			/* Default db initialisation function */
 
 	true,			/* Check packet sig hashes */
 };
@@ -92,15 +93,38 @@ 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");
 	}
 	if (conffile != NULL) {
-		fgets(curline, 1023, conffile);
+		if (!fgets(curline, 1023, conffile)) {
+			logthing(LOGTHING_CRITICAL,
+				"Problem reading configuration file.");
+			fclose(conffile);
+			return;
+		}
 
 		while (!feof(conffile)) {
 			for (i = strlen(curline) - 1;
@@ -177,6 +201,8 @@ void readconfig(const char *configfile) {
 		} else if (!strncmp("use_keyd ", curline, 9)) {
 			config.use_keyd = parsebool(&curline[9],
 						config.use_keyd);
+		} else if (!strncmp("sock_dir ", curline, 9)) {
+			config.sock_dir = strdup(&curline[9]);
 		} else if (!strncmp("check_sighash ", curline, 9)) {
 			config.check_sighash = parsebool(&curline[9],
 						config.check_sighash);
@@ -185,7 +211,12 @@ void readconfig(const char *configfile) {
 				"Unknown config line: %s", curline);
 		}
 
-			fgets(curline, 1023, conffile);
+			if (!fgets(curline, 1023, conffile) &&
+					!feof(conffile)) {
+				logthing(LOGTHING_CRITICAL,
+					"Problem reading configuration file.");
+				break;
+			}
 		}
 		fclose(conffile);
 	} else {