X-Git-Url: http://git.scottworley.com/tl-append/blobdiff_plain/675caf99ba1fa273bb94b7ed471e94ba53ce49e4..7521e30b527409a49b129e344b20a87b7d5edf2b:/tl-append.c

diff --git a/tl-append.c b/tl-append.c
index 1b3a9d0..a3e9a4e 100644
--- a/tl-append.c
+++ b/tl-append.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/file.h>
 #include <time.h>
 #include <unistd.h>
 
@@ -22,18 +23,28 @@ const struct timespec ACKNOWLEDGE_DELAY = {0, 300000000};
 typedef struct {
   int interactive;
   int fcntl_lock;
+  int flock_lock;
 } conf_t;
 
+void usage() {
+  die("usage: tl-append [-i] [--no-fnctl-lock] [--no-flock-lock]");
+}
+
 conf_t parse_command_line(int argc, char *argv[]) {
   conf_t conf;
   conf.interactive = 0;
   conf.fcntl_lock = 1;
+  conf.flock_lock = 1;
 
   for (int i = 1; i < argc; i++) {
     if (strcmp(argv[i], "-i") == 0 && isatty(2))
       conf.interactive = 1;
-    if (strcmp(argv[i], "--no-fnctl-lock") == 0)
+    else if (strcmp(argv[i], "--no-fnctl-lock") == 0)
       conf.fcntl_lock = 0;
+    else if (strcmp(argv[i], "--no-flock-lock") == 0)
+      conf.flock_lock = 0;
+    else
+      usage();
   }
 
   return conf;
@@ -65,7 +76,7 @@ static void write_line(const char *now, FILE *f, const char *line) {
     die("Error writing to output file");
 }
 
-static void take_lock(conf_t *conf, FILE *f) {
+static void take_fcntl_lock(conf_t *conf, FILE *f) {
   if (!conf->fcntl_lock)
     return;
   struct flock lock;
@@ -79,12 +90,34 @@ static void take_lock(conf_t *conf, FILE *f) {
   if (fcntl(fd, F_SETLK, &lock) == 0)
     return;
   if (errno != EACCES && errno != EAGAIN)
-    die_err("Couldn't take lock");
+    die_err("Couldn't take fcntl lock");
   if (fputs(WAITING, stderr) == EOF)
     die("Error writing waiting message");
   if (fcntl(fd, F_SETLKW, &lock) == 0)
     return;
-  die_err("Couldn't take lock");
+  die_err("Couldn't take fcntl lock");
+}
+
+static void take_flock_lock(conf_t *conf, FILE *f) {
+  if (!conf->flock_lock)
+    return;
+  int fd = fileno(f);
+  if (fd == -1)
+    die_err("Couldn't get file descriptor for locking");
+  if (flock(fd, LOCK_EX | LOCK_NB) == 0)
+    return;
+  if (errno != EWOULDBLOCK)
+    die_err("Couldn't take flock lock");
+  if (fputs(WAITING, stderr) == EOF)
+    die("Error writing waiting message");
+  if (flock(fd, LOCK_EX) == 0)
+    return;
+  die_err("Couldn't take flock lock");
+}
+
+static void take_lock(conf_t *conf, FILE *f) {
+  take_fcntl_lock(conf, f);
+  take_flock_lock(conf, f);
 }
 
 static void write_acknowledgment(conf_t *conf) {