X-Git-Url: http://git.scottworley.com/tl-append/blobdiff_plain/d212cd99e7ef72e0add4ef772e328835a972ae6b..9b76e9d2c7bdd413e36432b64a0022852a484dea:/tl-append.c diff --git a/tl-append.c b/tl-append.c index 4edd58a..edea9e9 100644 --- a/tl-append.c +++ b/tl-append.c @@ -26,6 +26,10 @@ typedef struct { int flock_lock; } conf_t; +void usage() { + die("usage: tl-append [-i] [-C dir] [--no-fnctl-lock] [--no-flock-lock]"); +} + conf_t parse_command_line(int argc, char *argv[]) { conf_t conf; conf.interactive = 0; @@ -35,10 +39,18 @@ conf_t parse_command_line(int argc, char *argv[]) { 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; - if (strcmp(argv[i], "--no-flock-lock") == 0) + else if (strcmp(argv[i], "--no-flock-lock") == 0) conf.flock_lock = 0; + else if (strcmp(argv[i], "-C") == 0) { + if (i + 1 >= argc) + die("-C requires a directory"); + if (chdir(argv[i + 1]) == -1) + die_err("Couldn't change directory"); + i++; + } else + usage(); } return conf; @@ -124,7 +136,7 @@ static void write_acknowledgment(conf_t *conf) { } static void lock_and_write_line(conf_t *conf, const char *line) { - const char *now = encode_time(time(NULL)); + char *now = encode_time(time(NULL)); FILE *f = fopen(FILENAME, "a"); take_lock(conf, f); @@ -133,6 +145,7 @@ static void lock_and_write_line(conf_t *conf, const char *line) { if (fclose(f) != 0) die_err("Error closing output file"); + free(now); write_acknowledgment(conf); }