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

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index 9bb5100..221cce6 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>
@@ -136,8 +138,6 @@ xgetc(XFILE *xfp)
 		ungetc(c, xfp->x_fp);
 		return ' ';
 	}
-	if (c == '#')
-		c = xskipcomment(xfp);
 	if (c == '\n')
 		xfp->x_line++;
 	return c;
@@ -159,8 +159,13 @@ xskip(XFILE *xfp, char *str)
 {
 	int	c;
 
-	while ((c = xgetc(xfp)) != EOF && strchr(str, c));
-	ungetc(c, xfp->x_fp);
+	while ((c = xgetc(xfp)) != EOF) {
+		if (c == '#')
+			c = xskipcomment(xfp);
+		if (strchr(str, c) == NULL)
+			break;
+	}
+	xungetc(c, xfp);
 }
 
 char