Also take flock locks

[tl-append] / tl-append.c

diff --git a/tl-append.c b/tl-append.c
index c4a4ac66d8036a1c3b299f11d6002b99bf0add08..4edd58a80b271edca77f959173f9367cb1092d59 100644 (file)
--- a/tl-append.c
+++ b/tl-append.c
@@ -1,37 +1,51 @@
 #define _POSIX_C_SOURCE 199309L
 
 #include <errno.h>
 #define _POSIX_C_SOURCE 199309L
 
 #include <errno.h>

+#include <fcntl.h>

 #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 "common.h"
 
 #include <time.h>
 #include <unistd.h>
 
 #include "common.h"
 

-const size_t BUF_SIZE = 1024;
+const int BUF_SIZE = 1024;

 
 const char PROMPT[] = "\33[H" /* Move cursor 'home' */
                       "\33[J" /* Clear screen */
                       "> ";
 const char ACKNOWLEDGE[] = "[OK]";
 
 const char PROMPT[] = "\33[H" /* Move cursor 'home' */
                       "\33[J" /* Clear screen */
                       "> ";
 const char ACKNOWLEDGE[] = "[OK]";

+const char WAITING[] = "[Waiting on lock...]\n";

 const struct timespec ACKNOWLEDGE_DELAY = {0, 300000000};
 
 typedef struct {
   int interactive;
 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_t parse_command_line(int argc, char *argv[]) {

-  conf_t conf = {0};
+  conf_t conf;
+  conf.interactive = 0;
+  conf.fcntl_lock = 1;
+  conf.flock_lock = 1;

 
 

-  if (argc == 2 && strcmp(argv[1], "-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;
 }
 

-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) {
     if (fputs(PROMPT, stderr) == EOF)
       die("I/O error writing prompt");
   if (fgets(buf, BUF_SIZE, stdin) == NULL) {


@@ -45,9 +59,7 @@ static void read_line(conf_t conf, char *buf) {
   }
 }
 
   }
 }
 

-static void write_line(conf_t conf, const char *line) {
-  const char *now = encode_time(time(NULL));
-  FILE *f = fopen(FILENAME, "a");
+static void write_line(const char *now, FILE *f, const char *line) {

   if (f == NULL)
     die_err("Error opening output file");
   if (fputs(now, f) == EOF)
   if (f == NULL)
     die_err("Error opening output file");
   if (fputs(now, f) == EOF)


@@ -56,9 +68,54 @@ static void write_line(conf_t conf, const char *line) {
     die("Error writing to output file");
   if (fputs(line, f) == EOF)
     die("Error writing to output file");
     die("Error writing to output file");
   if (fputs(line, f) == EOF)
     die("Error writing to output file");

-  if (fclose(f) != 0)
-    die_err("Error closing output file");
-  if (conf.interactive) {
+}
+
+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;
+  lock.l_start = 0;
+  lock.l_len = 0;
+  int fd = fileno(f);
+  if (fd == -1)
+    die_err("Couldn't get file descriptor for locking");
+  if (fcntl(fd, F_SETLK, &lock) == 0)
+    return;
+  if (errno != EACCES && errno != EAGAIN)
+    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 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) {

     if (fputs(ACKNOWLEDGE, stderr) == EOF)
       die("Error writing acknowledgment");
     if (nanosleep(&ACKNOWLEDGE_DELAY, NULL) == -1 && errno != EINTR)
     if (fputs(ACKNOWLEDGE, stderr) == EOF)
       die("Error writing acknowledgment");
     if (nanosleep(&ACKNOWLEDGE_DELAY, NULL) == -1 && errno != EINTR)


@@ -66,11 +123,24 @@ static void 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(conf, f);
+  write_line(now, f, line);
+
+  if (fclose(f) != 0)
+    die_err("Error closing output file");
+
+  write_acknowledgment(conf);
+}
+

 int main(int argc, char *argv[]) {
   conf_t conf = parse_command_line(argc, argv);
   char buf[BUF_SIZE];
 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)) {
-    write_line(conf, buf);
+  for (read_line(&conf, buf); buf[0]; read_line(&conf, buf)) {
+    lock_and_write_line(&conf, buf);

   }
   return 0;
 }
   }
   return 0;
 }