X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=x5%2Fkhatus.c;h=6ecb1e7c5ef4c6f9e0b6497fbc206d4220327a25;hb=fb8745ba18e5b96680cd612d6a0be78cfcd7eaf3;hp=7f4954276f20aaa9cb1f3b085b16815fd90f5166;hpb=f277f4054175356c8e0dba7f86c84b1d7f4bd689;p=khatus.git diff --git a/x5/khatus.c b/x5/khatus.c index 7f49542..6ecb1e7 100644 --- a/x5/khatus.c +++ b/x5/khatus.c @@ -18,6 +18,11 @@ #define fatal(args...) {fprintf(stderr, "[fatal] " args); exit(EXIT_FAILURE);} #define usage(args...) {print_usage(); fatal("[usage] " args);} +#define ERRMSG "ERROR" + +static const char errmsg[] = ERRMSG; +static const int errlen = sizeof(ERRMSG) - 1; + char *argv0; /* TODO: Convert fifo list to fifo array. */ @@ -173,14 +178,20 @@ void parse_opts_opt(Config *cfg, int argc, char *argv[], int i) { switch (argv[i][1]) { - case 'i': parse_opts_opt_i(cfg, argc, argv, ++i); break; /* TODO: Generic set_int */ - case 's': parse_opts_opt_s(cfg, argc, argv, ++i); break; /* TODO: Generic set_str */ - case 'x': { + case 'i': + /* TODO: Generic set_int */ + parse_opts_opt_i(cfg, argc, argv, ++i); + break; + case 's': + /* TODO: Generic set_str */ + parse_opts_opt_s(cfg, argc, argv, ++i); + break; + case 'x': cfg->output_to_x_root_window = 1; opts_parse_any(cfg, argc, argv, ++i); break; - } - default : usage("Option \"%s\" is invalid\n", argv[i]); + default : + usage("Option \"%s\" is invalid\n", argv[i]); } } @@ -222,8 +233,11 @@ opts_parse_any(Config *cfg, int argc, char *argv[], int i) { if (i < argc) { switch (argv[i][0]) { - case '-': parse_opts_opt(cfg, argc, argv, i); break; - default : parse_opts_spec(cfg, argc, argv, i); + case '-': + parse_opts_opt(cfg, argc, argv, i); + break; + default : + parse_opts_spec(cfg, argc, argv, i); } } } @@ -244,7 +258,23 @@ opts_parse(Config *cfg, int argc, char *argv[]) } void -read_one(Fifo *f, char *buf) +fifo_read_error(Fifo *f, char *buf) +{ + char *b; + int i; + + b = buf + f->pos; + /* Copy as much of the error message as possible. + * EXCLUDING the reminating \0. */ + for (i = 0; i < errlen && i < f->width; i++) + b[i] = errmsg[i]; + /* Any remaining slots: */ + for (; i < f->width; i++) + b[i] = '_'; +} + +void +fifo_read_one(Fifo *f, char *buf) { ssize_t current; ssize_t total; @@ -255,18 +285,21 @@ read_one(Fifo *f, char *buf) total = 0; c = '\0'; b = buf + f->pos; - memset(b, ' ', f->width); while ((current = read(f->fd, &c, 1)) && c != '\n' && c != '\0' && total++ < f->width) *b++ = c; - if (current == -1) + if (current == -1) { error("Failed to read: \"%s\". Error: %s\n", f->name, strerror(errno)); + fifo_read_error(f, buf); + } else + while (total++ < f->width) + *b++ = ' '; /* TODO Record timestamp read */ close(f->fd); f->fd = -1; } void -read_all(Config *cfg, char *buf) +fifo_read_all(Config *cfg, char *buf) { fd_set fds; int maxfd = -1; @@ -277,16 +310,25 @@ read_all(Config *cfg, char *buf) /* TODO: Check TTL */ for (Fifo *f = cfg->fifos; f; f = f->next) { /* TODO: Create the FIFO if it doesn't already exist. */ - if (lstat(f->name, &st) < 0) - fatal("Cannot stat \"%s\". Error: %s\n", f->name, strerror(errno)); - if (!(st.st_mode & S_IFIFO)) - fatal("\"%s\" is not a FIFO\n", f->name); + if (lstat(f->name, &st) < 0) { + error("Cannot stat \"%s\". Error: %s\n", f->name, strerror(errno)); + fifo_read_error(f, buf); + continue; + } + if (!(st.st_mode & S_IFIFO)) { + error("\"%s\" is not a FIFO\n", f->name); + fifo_read_error(f, buf); + continue; + } debug("opening: %s\n", f->name); if (f->fd < 0) f->fd = open(f->name, O_RDONLY | O_NONBLOCK); - if (f->fd == -1) + if (f->fd == -1) { /* TODO: Consider backing off retries for failed fifos. */ - fatal("Failed to open \"%s\"\n", f->name); + error("Failed to open \"%s\"\n", f->name); + fifo_read_error(f, buf); + continue; + } if (f->fd > maxfd) maxfd = f->fd; FD_SET(f->fd, &fds); @@ -300,7 +342,7 @@ read_all(Config *cfg, char *buf) for (Fifo *f = cfg->fifos; f; f = f->next) { if (FD_ISSET(f->fd, &fds)) { debug("reading: %s\n", f->name); - read_one(f, buf); + fifo_read_one(f, buf); } } } @@ -312,10 +354,12 @@ main(int argc, char *argv[]) int nfifos = 0; int seplen = 0; int prefix = 0; + int errors = 0; char *buf; Config cfg0 = defaults; Config *cfg = &cfg0; Display *display = NULL; + struct stat st; argv0 = argv[0]; @@ -325,10 +369,26 @@ main(int argc, char *argv[]) if (cfg->fifos == NULL) usage("No fifo specs were given!\n"); + /* 1st pass to check file existence and type */ + for (Fifo *f = cfg->fifos; f; f = f->next) { + if (lstat(f->name, &st) < 0) { + error("Cannot stat \"%s\". Error: %s\n", f->name, strerror(errno)); + errors++; + continue; + } + if (!(st.st_mode & S_IFIFO)) { + error("\"%s\" is not a FIFO\n", f->name); + errors++; + continue; + } + } + if (errors) + fatal("Encountered errors with the given file paths. See log.\n"); + width = cfg->total_width; seplen = strlen(cfg->separator); - /* 1st pass to make space for separators */ + /* 2nd pass to make space for separators */ for (Fifo *f = cfg->fifos; f; f = f->next) { f->pos += prefix; prefix += seplen; @@ -340,7 +400,7 @@ main(int argc, char *argv[]) fatal("[memory] Failed to allocate buffer of %d bytes", width); memset(buf, ' ', width); buf[width] = '\0'; - /* 2nd pass to set the separators */ + /* 3rd pass to set the separators */ for (Fifo *f = cfg->fifos; f; f = f->next) { if (f->pos) { /* Skip the first, left-most */ /* Copying only seplen ensures we omit the '\0' byte. */ @@ -355,10 +415,10 @@ main(int argc, char *argv[]) for (;;) { /* TODO: Check TTL and maybe blank-out */ /* TODO: How to trigger TTL check? On select? Alarm signal? */ - /* TODO: Set timeout on read_all based on diff of last time of - * read_all and desired time of next TTL check. + /* TODO: Set timeout on fifo_read_all based on diff of last time of + * fifo_read_all and desired time of next TTL check. * */ - read_all(cfg, buf); + fifo_read_all(cfg, buf); if (cfg->output_to_x_root_window) { if (XStoreName(display, DefaultRootWindow(display), buf) < 0) fatal("XStoreName failed.\n");