2001-09-12 NeilBrown <neilb@cse.unsw.edu.au>

[nfs-utils.git] / support / nfs / xio.c

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index cfdb1d1256b2c6b16a80d7b0f4dcbf0a95250dcb..9bb5100d09f4e392f12a6816ead5c62e17df1c54 100644 (file)
--- 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;
        int     c = 0;
+       int     quoted=0;
 
-       while (i < len && (c = xgetc(xfp)) != EOF && c != sepa && !isspace(c))
+       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)