* 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>
#include <ctype.h>
#include <signal.h>
#include <unistd.h>
+#include <errno.h>
#include "xmalloc.h"
#include "xlog.h"
#include "xio.h"
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;
}
ungetc(c, xfp->x_fp);
return ' ';
}
- if (c == '#')
- c = xskipcomment(xfp);
if (c == '\n')
xfp->x_line++;
return c;
{
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);
}