X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/blobdiff_plain/aa0b2bbbfe637eddd30d9eaad0ecfa33b2d045e8..dc38829e3ba8688fee7c0aff7d419ac6b01d4f7e:/config.c

diff --git a/config.c b/config.c
index 63b10c2..e06f480 100644
--- a/config.c
+++ b/config.c
@@ -140,7 +140,7 @@ static int get_key(struct session *session, char *line, char **key, char **value
 		 * the value.
 		 */
 	}
-	printf("%s = %s\n", *key, *value);
+	/* printf("%s = %s\n", *key, *value); */
 	return 0;
 }
 
@@ -295,7 +295,7 @@ static struct config_function config_table[] = {
 	{ NULL, NULL }
 };
 
-void process_line(struct session *session, char *key, char *value)
+static void process_line(struct session *session, char *key, char *value)
 {
 	struct config_function *item;
 	int result;
@@ -309,7 +309,10 @@ void process_line(struct session *session, char *key, char *value)
 			break;
 
 		if (strncasecmp(item->key, key, strlen(item->key)) == 0) {
-			printf("calling %p, for key = '%s' and value = '%s'\n", item->callback, key, value);
+			/*
+			 * printf("calling %p, for key = '%s' and value = * '%s'\n",
+			 * 	  item->callback, key, value);
+			 */
 			result = item->callback(session, value);
 			if (!result)
 				return;
@@ -324,8 +327,9 @@ void bti_parse_configfile(struct session *session)
 	char *line = NULL;
 	char *key = NULL;
 	char *value = NULL;
+	char *hashmarker;
 	size_t len = 0;
-	size_t n;
+	ssize_t n;
 	char *c;
 
 	config_file = fopen(session->configfile, "r");
@@ -341,8 +345,29 @@ void bti_parse_configfile(struct session *session)
 		if (line[n - 1] == '\n')
 			line[n - 1] = '\0';
 
-		/* '#' is comment markers, like bash style */
-		*strchrnul(line, '#') = '\0';
+		/*
+		 * '#' is comment markers, like bash style but it is a valid
+		 * character in some fields, so only treat it as a comment
+		 * marker if it occurs at the beginning of the line, or after
+		 * whitespace
+		 */
+		hashmarker = strchrnul(line, '#');
+		if (line == hashmarker)
+			line[0] = '\0';
+		else {
+			while (hashmarker[0] != '\0') {
+				--hashmarker;
+				if (isblank(hashmarker[0]))
+					hashmarker[0] = '\0';
+				else {
+					/*
+					 * false positive; '#' occured
+					 * within a string
+					 */
+					hashmarker = strchrnul(hashmarker+2, '#');
+				}
+			}
+		}
 		c = line;
 		while (isspace(*c))
 			c++;