Mountd should use separate lockfiles

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

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index 9bb5100d09f4e392f12a6816ead5c62e17df1c54..5e2e1e95e7228d42ef81ed8b1f44bc7cc2db2d13 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>
@@ -15,6 +17,7 @@
 #include <ctype.h>
 #include <signal.h>
 #include <unistd.h>
+#include <errno.h>
 #include "xmalloc.h"
 #include "xlog.h"
 #include "xio.h"
@@ -55,10 +58,16 @@ 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|O_CREAT))) < 0) {
-               xlog(L_WARNING, "could not open %s for locking", fname);
+       if (readonly)
+               fd = open(fname, (O_RDONLY|O_CREAT), 0600);
+       else
+               fd = open(fname, (O_RDWR|O_CREAT), 0600);
+       if (fd < 0) {
+               xlog(L_WARNING, "could not open %s for locking: errno %d (%s)",
+                               fname, errno, strerror(errno));
                return -1;
        }
+
        sa.sa_handler = doalarm;
        sa.sa_flags = 0;
        sigemptyset(&sa.sa_mask);
@@ -66,7 +75,8 @@ xflock(char *fname, char *type)
        alarm(10);
        if (fcntl(fd, F_SETLKW, &fl) < 0) {
                alarm(0);
-               xlog(L_WARNING, "failed to lock %s", fname);
+               xlog(L_WARNING, "failed to lock %s: errno %d (%s)",
+                               fname, errno, strerror(errno));
                close(fd);
                fd = 0;
        } else {
@@ -136,8 +146,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 +167,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