X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Fxio.c;h=49ee6bc2eac3da43fc0d0dccd4330f7ccf38edaf;hp=de51a15c0a8d4b6d30d4f7c77a1b284057671e7b;hb=6a66bb69d8fdb43f0abb58fd74566461f0e96633;hpb=4ea2edafb88ba0280b3bf4eba6c3a3402aaade76 diff --git a/support/nfs/xio.c b/support/nfs/xio.c index de51a15..49ee6bc 100644 --- a/support/nfs/xio.c +++ b/support/nfs/xio.c @@ -92,7 +92,7 @@ xgettok(XFILE *xfp, char sepa, char *tok, int len) while (i < len && (c = xgetc(xfp)) != EOF && c != sepa && !isspace(c)) tok[i++] = c; if (c == '\n') - xungetc(c, xfp->x_fp); + xungetc(c, xfp); if (!i) return 0; if (i >= len || (sepa && c != sepa)) @@ -128,11 +128,12 @@ xgetc(XFILE *xfp) void xungetc(int c, XFILE *xfp) { - if (c != EOF) { - ungetc(c, xfp->x_fp); - if (c == '\n') - xfp->x_line--; - } + if (c == EOF) + return; + + ungetc(c, xfp->x_fp); + if (c == '\n') + xfp->x_line--; } void