cscvs to tla changeset 125

[onak.git] / onak-conf.c

diff --git a/onak-conf.c b/onak-conf.c
index f215b319670e8fabc0a5e76491495e46a1bfef07..1ed252cd396c0c40d283f28a9f4653f18e7c7492 100644 (file)
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

+ *
+ * $Id: onak-conf.c,v 1.8 2003/10/15 21:15:21 noodles Exp $

  */
 
 #include <ctype.h>
  */
 
 #include <ctype.h>


@@ -43,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);