It appears that a recent glibc update now enforces the requirement for a mode

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

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index 3850aab65995170404267d4b3426c9cb92d732fc..f21f5f058f9d15c5fdccb601cc68e7a44fab4a7f 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>
@@ -52,13 +54,19 @@ xflock(char *fname, char *type)
 {
        struct sigaction sa, oldsa;
        int             readonly = !strcmp(type, "r");
+       mode_t  mode = (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
        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) {
+       if (readonly)
+               fd = open(fname, O_RDONLY);
+       else
+               fd = open(fname, (O_RDWR|O_CREAT), mode);
+       if (fd < 0) {
                xlog(L_WARNING, "could not open %s for locking", fname);
                return -1;
        }
+
        sa.sa_handler = doalarm;
        sa.sa_flags = 0;
        sigemptyset(&sa.sa_mask);
@@ -136,8 +144,6 @@ xgetc(XFILE *xfp)
                ungetc(c, xfp->x_fp);
                return ' ';
        }
-       if (c == '#')
-               c = xskipcomment(xfp);
        if (c == '\n')
                xfp->x_line++;
        return c;
@@ -159,7 +165,12 @@ xskip(XFILE *xfp, char *str)
 {
        int     c;
 
-       while ((c = xgetc(xfp)) != EOF && strchr(str, c));
+       while ((c = xgetc(xfp)) != EOF) {
+               if (c == '#')
+                       c = xskipcomment(xfp);
+               if (strchr(str, c) == NULL)
+                       break;
+       }
        xungetc(c, xfp);
 }