X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Fxio.c;h=3850aab65995170404267d4b3426c9cb92d732fc;hp=db5e2c3aa500e2378c711707b55b1b62e7e62327;hb=77c32fa565d6af59cbeb8601e08efa9af6ef3d81;hpb=a7f1a3f9ffe6c2effeec20809d89a9dcf4234495

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index db5e2c3..3850aab 100644
--- a/support/nfs/xio.c
+++ b/support/nfs/xio.c
@@ -83,14 +83,32 @@ xfunlock(int fd)
 	close(fd);
 }
 
+#define isoctal(x) (isdigit(x) && ((x)<'8'))
 int
 xgettok(XFILE *xfp, char sepa, char *tok, int len)
 {
 	int	i = 0;
-	char	c = 0;
-
-	while (i < len && (c = xgetc(xfp)) != EOF && c != sepa && !isspace(c))
+	int	c = 0;
+	int 	quoted=0;
+
+	while (i < len && (c = xgetc(xfp)) != EOF &&
+	       (quoted || (c != sepa && !isspace(c)))) {
+		if (c == '"') {
+			quoted = !quoted;
+			continue;
+		}
 		tok[i++] = c;
+		if (i >= 4 &&
+		    tok[i-4] == '\\' &&
+		    isoctal(tok[i-3]) &&
+		    isoctal(tok[i-2]) &&
+		    isoctal(tok[i-1]) &&
+		    ((tok[i]=0),
+		     (c = strtol(tok+i-3,NULL, 8)) < 256)) {
+			i -= 4;
+			tok[i++] = c;
+		}
+	}	
 	if (c == '\n')
 		xungetc(c, xfp);
 	if (!i)
@@ -101,10 +119,10 @@ xgettok(XFILE *xfp, char sepa, char *tok, int len)
 	return 1;
 }
 
-char
+int
 xgetc(XFILE *xfp)
 {
-	char	c = getc(xfp->x_fp);
+	int	c = getc(xfp->x_fp);
 
 	if (c == EOF)
 		return c;
@@ -139,16 +157,16 @@ xungetc(int c, XFILE *xfp)
 void
 xskip(XFILE *xfp, char *str)
 {
-	char	c;
+	int	c;
 
 	while ((c = xgetc(xfp)) != EOF && strchr(str, c));
-	ungetc(c, xfp->x_fp);
+	xungetc(c, xfp);
 }
 
 char
 xskipcomment(XFILE *xfp)
 {
-	char	c;
+	int	c;
 
 	while ((c = getc(xfp->x_fp)) != EOF && c != '\n');
 	return c;