X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Fxio.c;h=e3d27d2f943546720bc4b3070d33e551cba67a47;hp=1ce515727a0d7330143b4f7df478e12d414aa883;hb=a797fe77beb2748bebfa84e4d1d9033fbd65da57;hpb=89572e84169557fe3c70b5de619c274ceaf7b028

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index 1ce5157..e3d27d2 100644
--- 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;
 }
@@ -95,11 +87,6 @@ xgettok(XFILE *xfp, char sepa, char *tok, int len)
 
 	while (i < len && (c = xgetc(xfp)) != EOF &&
 	       (quoted || (c != sepa && !isspace(c)))) {
-		if (!quoted && i == 0 && c == '#') {
-			c = xskipcomment(xfp);
-			xfp->x_line++;
-			break;
-		}
 		if (c == '"') {
 			quoted = !quoted;
 			continue;
@@ -164,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);
 }