From: Benny Halevy Date: Mon, 17 Aug 2009 11:12:03 +0000 (-0400) Subject: Added support for line comments parsing which should X-Git-Tag: nfs-utils-1-2-1-rc4~1 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=4d0175ad400ec56456765a15829557f1d541866a;p=nfs-utils.git Added support for line comments parsing which should help with readability with in the configuration file. Signed-off-by: Steve Dickson --- diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c index b19b739..6bf4237 100644 --- a/support/nfs/conffile.c +++ b/support/nfs/conffile.c @@ -219,9 +219,6 @@ conf_parse_line(int trans, char *line, size_t sz) /* Lines starting with '#' or ';' are comments. */ ln++; - if (*line == '#' || *line == ';') - return; - /* Ignore blank lines */ if (*line == '\0') return; @@ -230,6 +227,9 @@ conf_parse_line(int trans, char *line, size_t sz) while (isblank(*line)) line++; + if (*line == '#' || *line == ';') + return; + /* '[section]' parsing... */ if (*line == '[') { line++; @@ -296,9 +296,23 @@ conf_parse_line(int trans, char *line, size_t sz) } line[strcspn (line, " \t=")] = '\0'; val = line + i + 1 + strspn (line + i + 1, " \t"); + + /* Skip trailing comments, if any */ + for (j = 0; j < sz - (val - line); j++) { + if (val[j] == '#' || val[j] == ';') { + val[j] = '\0'; + break; + } + } + /* Skip trailing whitespace, if any */ - for (j = sz - (val - line) - 1; j > 0 && isspace(val[j]); j--) - val[j] = '\0'; + for (j--; j > 0; j--) { + if (isspace(val[j])) + val[j] = '\0'; + else + break; + } + /* XXX Perhaps should we not ignore errors? */ conf_set(trans, section, arg, line, val, 0, 0); return;