libexport.a: Allow client_init() to fail instead of exit

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

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index 4a3f18176296c59db7cf91067d7bc0e989a1909b..e3d27d2f943546720bc4b3070d33e551cba67a47 100644 (file)
--- a/support/nfs/xio.c
+++ b/support/nfs/xio.c
@@ -17,6 +17,7 @@
 #include <ctype.h>
 #include <signal.h>
 #include <unistd.h>
+#include <errno.h>
 #include "xmalloc.h"
 #include "xlog.h"
 #include "xio.h"
@@ -43,38 +44,29 @@ xfclose(XFILE *xfp)
        xfree(xfp);
 }
 
-static void
-doalarm(int sig)
-{
-       return;
-}
-
 int
 xflock(char *fname, char *type)
 {
-       struct sigaction sa, oldsa;
        int             readonly = !strcmp(type, "r");
        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);
-       sigaction(SIGALRM, &sa, &oldsa);
-       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 {
-               alarm(0);
+               fd = -1;
        }
-       sigaction(SIGALRM, &oldsa, NULL);
 
        return fd;
 }
@@ -138,8 +130,6 @@ xgetc(XFILE *xfp)
                ungetc(c, xfp->x_fp);
                return ' ';
        }
-       if (c == '#')
-               c = xskipcomment(xfp);
        if (c == '\n')
                xfp->x_line++;
        return c;
@@ -161,7 +151,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);
 }