diff options
| author | Greg Banks <gnb@melbourne.sgi.com> | 2006-07-03 14:21:48 +1000 |
|---|---|---|
| committer | Greg Banks <gnb@melbourne.sgi.com> | 2006-07-03 14:21:48 +1000 |
| commit | 940c7c304d4a43c00c27529cdddc7c87db6eef87 (patch) | |
| tree | b2d1f4d190afd1c21e8e31eada9d6e58cfa0f93b /support/nfs/xio.c | |
| parent | b90d201551aaa712c011c3d5de900fad714a26a6 (diff) | |
| parent | a503848d423fe1681879936da7b526b15f7eca23 (diff) | |
| download | nfs-utils-940c7c304d4a43c00c27529cdddc7c87db6eef87.tar.gz nfs-utils-940c7c304d4a43c00c27529cdddc7c87db6eef87.tar.xz nfs-utils-940c7c304d4a43c00c27529cdddc7c87db6eef87.zip | |
Merge branch 'master' of git://linux-nfs.org/nfs-utils
Diffstat (limited to 'support/nfs/xio.c')
| -rw-r--r-- | support/nfs/xio.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/support/nfs/xio.c b/support/nfs/xio.c index 1ce5157..221cce6 100644 --- 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); } |