Switch to C99 struct initialisation for default configuration

[onak.git] / onak-conf.c

diff --git a/onak-conf.c b/onak-conf.c
index e3085e1996be9e1fa6ec7690ea8f70fdf7e10951..9a8a4713b4f8aea5c548e1641328d1ab68368e8a 100644 (file)
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -37,37 +37,38 @@ extern struct onak_dbctx *DBINIT(bool readonly);
  *     config file.
  */
 struct onak_config config = {
-       128,                    /* maxkeys */
-       NULL,                   /* thissite */
-       NULL,                   /* adminemail */
-       NULL,                   /* mta */
-       NULL,                   /* syncsites */
-       NULL,                   /* logfile */
+       .maxkeys = 128,
+       .thissite = NULL,
+       .adminemail = NULL,
+       .mta = NULL,
+       .syncsites = NULL,
+       .logfile = NULL,
 
-       false,                  /* use_keyd */
+       .use_keyd = false,
+       .sock_dir = ".",
 
        /*
         * Options for directory backends.
         */
-       NULL,                   /* db_dir */
+       .db_dir = NULL,
 
        /*
         * Options for the Postgres backend.
         */
-       NULL,                   /* pg_dbhost */
-       NULL,                   /* pg_dbname */
-       NULL,                   /* pg_dbuser */
-       NULL,                   /* pg_dbpass */
+       .pg_dbhost = NULL,
+       .pg_dbname = NULL,
+       .pg_dbuser = NULL,
+       .pg_dbpass = NULL,
 
        /*
         * Options for dynamic backends.
         */
-       NULL,                   /* db_backend */
-       NULL,                   /* backends_dir */
+       .db_backend = NULL,
+       .backends_dir = NULL,
 
-       DBINIT,                 /* Default db initialisation function */
+       .dbinit = DBINIT,
 
-       true,                   /* Check packet sig hashes */
+       .check_sighash = true,
 };
 
 bool parsebool(char *str, bool fallback)
@@ -118,7 +119,12 @@ void readconfig(const char *configfile) {
                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;
@@ -195,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);
@@ -203,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 {