X-Git-Url: http://www.average.org/gitweb/?p=pulsecounter.git;a=blobdiff_plain;f=linux%2Fdbstore.c;h=d5d7ee7fe89bf044c973ddec4a182e91333df7db;hp=56e5ba4b53696737e49ffe33ca2910410eaff159;hb=0b9cbcb21231c3a12a9d8c579ace126eb97166e5;hpb=398a1adb227d1011f1ea8dac6aa44f8a84bc92d4

diff --git a/linux/dbstore.c b/linux/dbstore.c
index 56e5ba4..d5d7ee7 100644
--- a/linux/dbstore.c
+++ b/linux/dbstore.c
@@ -19,40 +19,49 @@ static char *dbnm = "watermeter";
 int dbconfig(char *conffile)
 {
 	FILE *fp = fopen(conffile, "r");
+	int lc = 0;
 	int rc = 0;
 	char buf[128];
 
-	if (!fp)
-		return 1;
+	if (!fp) return 1;
 	while (fgets(buf, sizeof(buf), fp)) {
 		char *k, *v, *e;
 
+		lc++;
 		e = buf + strlen(buf) - 1;
-		if (*e == '\n')
-			*e = '\0';
+		if (*e == '\n') *e = '\0';
 		else {
-			/* line too long */
+			g_warning("%s:%d line too long", conffile, lc);
 			rc = 1;
 			break;
 		}
-		for (k = buf; k < e && isspace(k); k++) /*nothing*/ ;
-		if (*k == '#') break;
-		for (v = k; v < e && !isspace(v)
+		if ((k = strchr(buf, '#'))) {
+			e=k;
+			*e = '\0';
+		}
+		for (k = buf; k < e && isspace(*k); k++) /*nothing*/ ;
+		for (v = k; v < e && !isspace(*v)
 			    && *v != ':' && *v != '='; v++) /*nothing*/ ;
-		if (v < e && (*v == ':' || *v == '=')) v++;
-		for (; v < e && (isspace(v) || *v == ':' || *v == '=')
+		*v++ = '\0';
+		if (*k == '\0') continue; /* empty or comment-only line */
+		for (; v < e && (isspace(*v) || *v == ':' || *v == '=')
 		     					; v++) /*nothing*/ ;
 		if (v >= e) {
-			/* no value */
+			g_warning("%s:%d no value for key \"%s\"",
+					conffile, lc, k);
 			rc = 1;
 			break;
-		}
+		} 
+#ifdef TEST_CONFIG
+		printf("k=%s v=%s\n", k, v);
+#endif
 		if      (!strcmp(k, "host"))     host = strdup(v);
 		else if (!strcmp(k, "user"))     user = strdup(v);
 		else if (!strcmp(k, "password")) pass = strdup(v);
 		else if (!strcmp(k, "database")) dbnm = strdup(v);
 		else {
-			/* unknown key */
+			g_warning("%s:%d unrecognized key \"%s\"",
+					conffile, lc, k);
 			rc = 1;
 			break;
 		}
@@ -95,7 +104,7 @@ int dbstore(uint8_t which, uint32_t val)
 		if (row && *row) prev_val = atoi(*row);
 		mysql_free_result(result);
 	}
-	if (val <= prev_val) {
+	if (val < prev_val) {
 		snprintf(statement, sizeof(statement),
 			 "insert into %sadj values (\"%s\",%u);\n",
 			 table, tstr, prev_val);
@@ -119,3 +128,16 @@ int dbstore(uint8_t which, uint32_t val)
 	mysql_close(&mysql);
 	return rc;
 }
+
+#ifdef TEST_CONFIG
+int main(int const argc, char *argv[])
+{
+	if (dbconfig(argv[1])) {
+		printf("could not parse config file\n");
+		return 1;
+	}
+	printf("host: %s\nuser: %s\npass: %s\ndbnm: %s\n",
+		host, user, pass, dbnm);
+	return 0;
+}
+#endif