Merge pull request #19 from amir/master

[gregoa/bti.git] / config.c

diff --git a/config.c b/config.c
index 42a038422e0e7231d6bf42e9345610a18bf428d9..2b510b90276d8a31bfa9c9ccbfaa23c12bfb65f0 100644 (file)
--- a/config.c
+++ b/config.c
@@ -351,13 +351,23 @@ void bti_parse_configfile(struct session *session)
                 * marker if it occurs at the beginning of the line, or after
                 * whitespace
                 */
-               hashmarker = strchrnul(line, '#');
+               hashmarker = strchr(line, '#');
                if (line == hashmarker)
                        line[0] = '\0';
                else {
-                       --hashmarker;
-                       if (isblank(hashmarker[0]))
-                               hashmarker[0] = '\0';
+                       while (hashmarker != NULL) {
+                               --hashmarker;
+                               if (isblank(hashmarker[0])) {
+                                       hashmarker[0] = '\0';
+                                       break;
+                               } else {
+                                       /*
+                                        * false positive; '#' occured
+                                        * within a string
+                                        */
+                                       hashmarker = strchr(hashmarker+2, '#');
+                               }
+                       }
                }
                c = line;
                while (isspace(*c))