X-Git-Url: http://git.scottworley.com/tl-append/blobdiff_plain/b56e29cbdf58c1baa75e3340ff25c493329f2b9e..d212cd99e7ef72e0add4ef772e328835a972ae6b:/tl-append.c

diff --git a/tl-append.c b/tl-append.c
index 0650721..4edd58a 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>
 
@@ -21,19 +22,30 @@ const struct timespec ACKNOWLEDGE_DELAY = {0, 300000000};
 
 typedef struct {
   int interactive;
+  int fcntl_lock;
+  int flock_lock;
 } conf_t;
 
 conf_t parse_command_line(int argc, char *argv[]) {
-  conf_t conf = {0};
-
-  if (argc == 2 && strcmp(argv[1], "-i") == 0 && isatty(2))
-    conf.interactive = 1;
+  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)
+      conf.fcntl_lock = 0;
+    if (strcmp(argv[i], "--no-flock-lock") == 0)
+      conf.flock_lock = 0;
+  }
 
   return conf;
 }
 
-static void read_line(conf_t conf, char *buf) {
-  if (conf.interactive)
+static void read_line(conf_t *conf, char *buf) {
+  if (conf->interactive)
     if (fputs(PROMPT, stderr) == EOF)
       die("I/O error writing prompt");
   if (fgets(buf, BUF_SIZE, stdin) == NULL) {
@@ -58,7 +70,9 @@ static void write_line(const char *now, FILE *f, const char *line) {
     die("Error writing to output file");
 }
 
-static void take_lock(FILE *f) {
+static void take_fcntl_lock(conf_t *conf, FILE *f) {
+  if (!conf->fcntl_lock)
+    return;
   struct flock lock;
   lock.l_type = F_WRLCK;
   lock.l_whence = SEEK_SET;
@@ -70,16 +84,38 @@ static void take_lock(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) {
-  if (conf.interactive) {
+static void write_acknowledgment(conf_t *conf) {
+  if (conf->interactive) {
     if (fputs(ACKNOWLEDGE, stderr) == EOF)
       die("Error writing acknowledgment");
     if (nanosleep(&ACKNOWLEDGE_DELAY, NULL) == -1 && errno != EINTR)
@@ -87,11 +123,11 @@ static void write_acknowledgment(conf_t conf) {
   }
 }
 
-static void lock_and_write_line(conf_t conf, const char *line) {
+static void lock_and_write_line(conf_t *conf, const char *line) {
   const char *now = encode_time(time(NULL));
   FILE *f = fopen(FILENAME, "a");
 
-  take_lock(f);
+  take_lock(conf, f);
   write_line(now, f, line);
 
   if (fclose(f) != 0)
@@ -103,8 +139,8 @@ static void lock_and_write_line(conf_t conf, const char *line) {
 int main(int argc, char *argv[]) {
   conf_t conf = parse_command_line(argc, argv);
   char buf[BUF_SIZE];
-  for (read_line(conf, buf); buf[0]; read_line(conf, buf)) {
-    lock_and_write_line(conf, buf);
+  for (read_line(&conf, buf); buf[0]; read_line(&conf, buf)) {
+    lock_and_write_line(&conf, buf);
   }
   return 0;
 }