Cleanup xlog logging code to be safe and usable for all

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

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index 1bcd41bc8b1a9eb46bc21af60f5168276ff5688f..0453ca7c0ba305122ff5353267659336fd16f9ab 100644 (file)
--- 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>
@@ -29,7 +31,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;
 }
@@ -55,7 +57,7 @@ xflock(char *fname, char *type)
        struct flock    fl = { readonly? F_RDLCK : F_WRLCK, SEEK_SET, 0, 0, 0 };
        int             fd;
 
-       if ((fd = open(fname, readonly? O_RDONLY : O_RDWR)) < 0) {
+       if ((fd = open(fname, readonly? O_RDONLY : (O_RDWR|O_CREAT), 0644)) < 0) {
                xlog(L_WARNING, "could not open %s for locking", fname);
                return -1;
        }
@@ -83,16 +85,34 @@ 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')
-               ungetc(c, xfp->x_fp);
+               xungetc(c, xfp);
        if (!i)
                return 0;
        if (i >= len || (sepa && c != sepa))
@@ -101,10 +121,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;
@@ -118,33 +138,40 @@ xgetc(XFILE *xfp)
                ungetc(c, xfp->x_fp);
                return ' ';
        }
-       if (c == '#')
-               c = xskipcomment(xfp);
        if (c == '\n')
                xfp->x_line++;
        return c;
 }
 
 void
-xungetc(char c, XFILE *xfp)
+xungetc(int c, XFILE *xfp)
 {
-       if (c != EOF)
-               ungetc(c, xfp->x_fp);
+       if (c == EOF)
+               return;
+
+       ungetc(c, xfp->x_fp);
+       if (c == '\n')
+               xfp->x_line--;
 }
 
 void
 xskip(XFILE *xfp, char *str)
 {
-       char    c;
+       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
 xskipcomment(XFILE *xfp)
 {
-       char    c;
+       int     c;
 
        while ((c = getc(xfp->x_fp)) != EOF && c != '\n');
        return c;