2001-11-26 TAKAI Kousuke <takai@vlsi.kuee.kyoto-u.ac.jp>

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

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index 0a250fc4e05d7005cfe7f20adfde9a072b793f7f..3850aab65995170404267d4b3426c9cb92d732fc 100644 (file)
--- a/support/nfs/xio.c
+++ b/support/nfs/xio.c
@@ -29,7 +29,7 @@ xfopen(char *fname, char *type)
                return NULL;
        xfp = (XFILE *) xmalloc(sizeof(*xfp));
        xfp->x_fp = fp;
-       xfp->x_line = 0;
+       xfp->x_line = 1;
 
        return xfp;
 }
@@ -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;