Fix comment parsing (again)

Bruce Fields noticed that I broke comment parsing...

as xskip() is always called before xgettok(), that is the
best place to put xskipcomment and still maintain proper
semantics of xskip and xgettok.

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index 1ce515727a0d7330143b4f7df478e12d414aa883..221cce6ef2babdf35d96330e6399dd5d35679a3f 100644 (file)
--- a/support/nfs/xio.c
+++ b/support/nfs/xio.c
@@ -95,11 +95,6 @@ xgettok(XFILE *xfp, char sepa, char *tok, int len)
 
        while (i < len && (c = xgetc(xfp)) != EOF &&
               (quoted || (c != sepa && !isspace(c)))) {
-               if (!quoted && i == 0 && c == '#') {
-                       c = xskipcomment(xfp);
-                       xfp->x_line++;
-                       break;
-               }
                if (c == '"') {
                        quoted = !quoted;
                        continue;
@@ -164,7 +159,12 @@ xskip(XFILE *xfp, char *str)
 {
        int     c;
 
-       while ((c = xgetc(xfp)) != EOF && strchr(str, c));
+       while ((c = xgetc(xfp)) != EOF) {
+               if (c == '#')
+                       c = xskipcomment(xfp);
+               if (strchr(str, c) == NULL)
+                       break;
+       }
        xungetc(c, xfp);
 }