Also take flock locks

[tl-append] / tl-append.c

diff --git a/tl-append.c b/tl-append.c
index 6cc068a718627416e929d7adf046484d01064489..4edd58a80b271edca77f959173f9367cb1092d59 100644 (file)
--- a/tl-append.c
+++ b/tl-append.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <sys/file.h>

 #include <time.h>
 #include <unistd.h>
 
 #include <time.h>
 #include <unistd.h>
 


@@ -21,15 +22,23 @@ const struct timespec ACKNOWLEDGE_DELAY = {0, 300000000};
 
 typedef struct {
   int interactive;
 
 typedef struct {
   int interactive;

+  int fcntl_lock;
+  int flock_lock;

 } conf_t;
 
 conf_t parse_command_line(int argc, char *argv[]) {
   conf_t conf;
   conf.interactive = 0;
 } conf_t;
 
 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;
 
   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;
   }
 
   return conf;


@@ -61,7 +70,9 @@ static void write_line(const char *now, FILE *f, const char *line) {
     die("Error writing to output file");
 }
 
     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;
   struct flock lock;
   lock.l_type = F_WRLCK;
   lock.l_whence = SEEK_SET;


@@ -73,12 +84,34 @@ static void take_lock(FILE *f) {
   if (fcntl(fd, F_SETLK, &lock) == 0)
     return;
   if (errno != EACCES && errno != EAGAIN)
   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;
   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) {
 }
 
 static void write_acknowledgment(conf_t *conf) {


@@ -94,7 +127,7 @@ static void lock_and_write_line(conf_t *conf, const char *line) {
   const char *now = encode_time(time(NULL));
   FILE *f = fopen(FILENAME, "a");
 
   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)
   write_line(now, f, line);
 
   if (fclose(f) != 0)