X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=support%2Fnfs%2Fxio.c;h=1ce515727a0d7330143b4f7df478e12d414aa883;hb=4e2bae795e5eaf9922f0b966ab5df64994c836a2;hp=9bb5100d09f4e392f12a6816ead5c62e17df1c54;hpb=8d53a2630763f8f639d2de2ddd26282bff1c7cad;p=nfs-utils.git

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index 9bb5100..1ce5157 100644
--- a/support/nfs/xio.c
+++ b/support/nfs/xio.c
@@ -6,7 +6,9 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/fcntl.h>
 #include <string.h>
@@ -93,6 +95,11 @@ 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;
@@ -136,8 +143,6 @@ xgetc(XFILE *xfp)
 		ungetc(c, xfp->x_fp);
 		return ' ';
 	}
-	if (c == '#')
-		c = xskipcomment(xfp);
 	if (c == '\n')
 		xfp->x_line++;
 	return c;
@@ -160,7 +165,7 @@ xskip(XFILE *xfp, char *str)
 	int	c;
 
 	while ((c = xgetc(xfp)) != EOF && strchr(str, c));
-	ungetc(c, xfp->x_fp);
+	xungetc(c, xfp);
 }
 
 char