Merge pull request #19 from amir/master

[gregoa/bti.git] / config.c

diff --git a/config.c b/config.c
index 346fed8ceaacc83d4b86d2c7f68424a9d4df9f35..2b510b90276d8a31bfa9c9ccbfaa23c12bfb65f0 100644 (file)
--- a/config.c
+++ b/config.c
@@ -327,6 +327,7 @@ void bti_parse_configfile(struct session *session)
        char *line = NULL;
        char *key = NULL;
        char *value = NULL;
        char *line = NULL;
        char *key = NULL;
        char *value = NULL;

+       char *hashmarker;

        size_t len = 0;
        ssize_t n;
        char *c;
        size_t len = 0;
        ssize_t n;
        char *c;


@@ -344,8 +345,30 @@ void bti_parse_configfile(struct session *session)
                if (line[n - 1] == '\n')
                        line[n - 1] = '\0';
 
                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 = strchr(line, '#');
+               if (line == hashmarker)
+                       line[0] = '\0';
+               else {
+                       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))
                        c++;
                c = line;
                while (isspace(*c))
                        c++;