Mercurial > mbsePi-apps / file diff

--- a/thermferm/rdconfig.c	Tue Jul 01 21:53:03 2014 +0200
+++ b/thermferm/rdconfig.c	Tue Jul 01 23:14:57 2014 +0200
@@ -88,7 +88,7 @@
 
 
 
-int wrconfig(char *confxml)
+int wrconfig(void)
 {
     int			rc = 0;
     FILE		*fp;
@@ -375,8 +375,9 @@
     } else {
 	mypath = xstrcpy(getenv((char *)"HOME"));
     }
-    mypath = xstrcat(mypath, (char *)"/mbsepi-apps/");
-    mypath = xstrcat(mypath, confxml);
+    mypath = xstrcat(mypath, (char *)"/.thermferm/etc/");
+    mkdirs(mypath, 0755);
+    mypath = xstrcat(mypath, (char *)"thermferm.xml");
 
     if (debug)
 	fprintf(stdout, "Writing %s\n", mypath);
@@ -679,7 +680,7 @@
 
 
 
-int rdconfig(char *config) 
+int rdconfig(void) 
 {
     int		rc = 0, ival;
     xmlDocPtr	doc;
@@ -697,24 +698,23 @@
     } else {
     	mypath = xstrcpy(getenv((char *)"HOME"));
     }
-    mypath = xstrcat(mypath, (char *)"/mbsepi-apps/");
-    mypath = xstrcat(mypath, config);
+    mypath = xstrcat(mypath, (char *)"/.thermferm/etc/");
+    mkdirs(mypath, 0755);
+    mypath = xstrcat(mypath, (char *)"thermferm.xml");
     if ((doc = xmlParseFile(mypath)) == NULL) {
 	/*
 	 * Not in the users home directory
 	 */
 	free(mypath);
-	mypath = xstrcpy((char *)"/etc/mbsepi-apps/");
-	mypath = xstrcat(mypath, config);
+	mypath = xstrcpy((char *)"/etc/mbsepi-apps/thermferm.xml");
 	if ((doc = xmlParseFile(mypath)) == NULL) {
 	    /*
 	     * Try /usr/local/etc
 	     */
 	    free(mypath);
-	    mypath = xstrcpy((char *)"/usr/local/etc/mbsepi-apps/");
-	    mypath = xstrcat(mypath, config);
+	    mypath = xstrcpy((char *)"/usr/local/etc/mbsepi-apps/thermferm.xml");
 	    if ((doc = xmlParseFile(mypath)) == NULL) {
-		syslog(LOG_NOTICE, "rdconfig: could not parse %s", config);
+		syslog(LOG_NOTICE, "rdconfig: could not find thermferm.xml");
 		return 1;
 	    }
 	}