Contemplate the possibility of multiple command line flags

[tl-append] / tl-append.c

diff --git a/tl-append.c b/tl-append.c
index 0650721f3fc90c32ee5d43d7449901bbe188cd90..6cc068a718627416e929d7adf046484d01064489 100644 (file)
--- a/tl-append.c
+++ b/tl-append.c
@@ -24,16 +24,19 @@ typedef struct {
 } 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;

 
 

-  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;
+  }

 
   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) {


@@ -78,8 +81,8 @@ static void take_lock(FILE *f) {
   die_err("Couldn't take lock");
 }
 
   die_err("Couldn't take lock");
 }
 

-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)
     if (fputs(ACKNOWLEDGE, stderr) == EOF)
       die("Error writing acknowledgment");
     if (nanosleep(&ACKNOWLEDGE_DELAY, NULL) == -1 && errno != EINTR)


@@ -87,7 +90,7 @@ 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");
 
   const char *now = encode_time(time(NULL));
   FILE *f = fopen(FILENAME, "a");
 


@@ -103,8 +106,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];
 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;
 }
   }
   return 0;
 }