autoconf onak-mail.pl config

[onak.git] / onak-conf.c

diff --git a/onak-conf.c b/onak-conf.c
index bbe26a1470f91cde0ce631312225c93f551d86f9..81d7bdf97cc978ff2f271643a8dccb61ebf710ad 100644 (file)
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -4,10 +4,10 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

- *
- * $Id: onak-conf.c,v 1.7 2003/06/04 20:57:11 noodles Exp $

  */
 
  */
 

+#include "config.h"
+

 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -45,13 +45,17 @@ struct onak_config config = {
        NULL,                   /* pg_dbpass */
 };
 
        NULL,                   /* pg_dbpass */
 };
 

-void readconfig(void) {
+void readconfig(const char *configfile) {

        FILE *conffile;
        char  curline[1024];
        int   i;
 
        curline[1023] = 0;
        FILE *conffile;
        char  curline[1024];
        int   i;
 
        curline[1023] = 0;

-       conffile = fopen(CONFIGFILE, "r");
+       if (configfile == NULL) {
+               conffile = fopen(CONFIGFILE, "r");
+       } else {
+               conffile = fopen(configfile, "r");
+       }

        if (conffile != NULL) {
                fgets(curline, 1023, conffile);
 
        if (conffile != NULL) {
                fgets(curline, 1023, conffile);
 


@@ -110,6 +114,8 @@ void readconfig(void) {
                                lladd(config.syncsites, strdup(&curline[9]));
                } else if (!strncmp("logfile ", curline, 8)) {
                        config.logfile = strdup(&curline[8]);
                                lladd(config.syncsites, strdup(&curline[9]));
                } else if (!strncmp("logfile ", curline, 8)) {
                        config.logfile = strdup(&curline[8]);

+               } else if (!strncmp("loglevel ", curline, 9)) {
+                       setlogthreshold(atoi(&curline[9]));

                } else if (!strncmp("this_site ", curline, 10)) {
                        config.thissite = strdup(&curline[10]);
                } else if (!strncmp("socket_name ", curline, 12) ||
                } else if (!strncmp("this_site ", curline, 10)) {
                        config.thissite = strdup(&curline[10]);
                } else if (!strncmp("socket_name ", curline, 12) ||