From 4d72d741a66ebac700d067c623a5c050e416de14 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sat, 14 Aug 2004 00:35:27 +0000 Subject: indent --- Makefile | 10 +-- watch.c | 303 +++++++++++++++++++++++++++++++++------------------------------ 2 files changed, 163 insertions(+), 150 deletions(-) diff --git a/Makefile b/Makefile index 91079da..4a9e34d 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ # $Id$ -PROG= watch -BINDIR= /usr/local/bin -MAN= watch.1 -DPADD= ${LIBCURSES} -LDADD= -lcurses +PROG= watch +BINDIR= /usr/local/bin +MAN= watch.1 +DPADD= ${LIBCURSES} +LDADD= -lcurses . include diff --git a/watch.c b/watch.c index 9ab14df..4549096 100644 --- a/watch.c +++ b/watch.c @@ -30,7 +30,7 @@ #include static char *copyright = "(c) 2003 demon "; -static char *version = "0.4"; +static char *version = "0.4"; extern char *__progname; unsigned int period = 2; @@ -45,179 +45,192 @@ void die(); void usage(); struct buf { - char *b_val; - unsigned int b_size; + char *b_val; + unsigned int b_size; }; -int main (int argc, char **argv) { - unsigned int a_len; - unsigned int c_len; - int hold_curs; - char ch; - struct buf cmd; - - signal(SIGINT, die); - signal(SIGTERM, die); - signal(SIGHUP, die); - signal(SIGWINCH, resize); - - while ((ch = getopt(argc, argv, "s:vn")) != -1) - switch (ch) { - case 'v': - (void)fprintf(stderr, "%s %s %s\n", __progname, version, copyright); - exit(1); - break; - case 's': - period = atoi(optarg); - if(period < 1) - usage(); - break; - case 'n': - n_flag=1; - break; - case '?': - default: +int +main(int argc, char **argv) +{ + unsigned int a_len; + unsigned int c_len; + int hold_curs; + char ch; + struct buf cmd; + + signal(SIGINT, die); + signal(SIGTERM, die); + signal(SIGHUP, die); + signal(SIGWINCH, resize); + + while ((ch = getopt(argc, argv, "s:vn")) != -1) + switch (ch) { + case 'v': + (void) fprintf(stderr, "%s %s %s\n", + __progname, version, copyright); + exit(1); + break; + case 's': + period = atoi(optarg); + if (period < 1) + usage(); + break; + case 'n': + n_flag = 1; + break; + case '?': + default: + usage(); + } + argc -= optind; + argv += optind; + + if (*argv) { + cmd.b_size = strlen(*argv) + 1; + if (!(cmd.b_val = (char *) malloc(cmd.b_size))) + perror("malloc"); + memcpy(cmd.b_val, *argv, strlen(*argv)); + + while (*++argv) { + a_len = strlen(*argv); + cmd.b_size += a_len + 1; + if (!(cmd.b_val = (char *) realloc(cmd.b_val, + cmd.b_size))) + perror("realloc"); + c_len = strlen(cmd.b_val); + cmd.b_val[c_len] = ' '; + memcpy(cmd.b_val + c_len + 1, *argv, a_len); + } + + initscr(); + hold_curs = curs_set(0); + if (has_colors()) + color_flag = 1; + + loop(cmd.b_val); + + curs_set(hold_curs); + endwin(); + + free(cmd.b_val); + cmd.b_size = 0; + + } else usage(); - } - argc -= optind; - argv += optind; - - if(*argv) { - cmd.b_size = strlen(*argv) + 1; - if(!(cmd.b_val = (char *)malloc(cmd.b_size))) - perror("malloc"); - memcpy(cmd.b_val, *argv, strlen(*argv)); - - while(*++argv) { - a_len = strlen(*argv); - cmd.b_size += a_len + 1; - if(!(cmd.b_val = (char *)realloc(cmd.b_val, cmd.b_size))) - perror("realloc"); - c_len = strlen(cmd.b_val); - cmd.b_val[c_len] = ' '; - memcpy(cmd.b_val + c_len + 1, *argv, a_len); - } - - initscr(); - hold_curs = curs_set(0); - if(has_colors()) - color_flag = 1; - - loop(cmd.b_val); - - curs_set(hold_curs); - endwin(); - - free(cmd.b_val); - cmd.b_size = 0; - - } else - usage(); - - exit(0); -} - -void loop(char *cmd) { - unsigned int char_count; - unsigned int line_count; - char ch; - FILE *pipe; - - while(!die_flag) { - char_count = 0; - line_count = 0; - clear(); - - if(!n_flag) { - title(cmd); - line_count += 2; - } + exit(0); +} - pipe = popen(cmd, "r"); +void +loop(char *cmd) +{ + unsigned int char_count; + unsigned int line_count; + char ch; + FILE *pipe; - while((ch = fgetc(pipe)) != EOF) { - if((ch == '\0') || (ch == '\n')) { - line_count++; + while (!die_flag) { char_count = 0; - } - - if(line_count >= LINES) - break; - - if(char_count < COLS) { - printw("%c",ch); - char_count++; - } + line_count = 0; + + clear(); + + if (!n_flag) { + title(cmd); + line_count += 2; + } + pipe = popen(cmd, "r"); + + while ((ch = fgetc(pipe)) != EOF) { + if ((ch == '\0') || (ch == '\n')) { + line_count++; + char_count = 0; + } + if (line_count >= LINES) + break; + + if (char_count < COLS) { + printw("%c", ch); + char_count++; + } + } + + pclose(pipe); + refresh(); + sleep(period); } - - pclose(pipe); - refresh(); - sleep(period); - } } -void title(char *cmd) { - unsigned int t_len; - unsigned int t_len2; +void +title(char *cmd) +{ + unsigned int t_len; + unsigned int t_len2; - time_t tval = time(NULL); + time_t tval = time(NULL); - struct buf title; - struct tm *tm = localtime(&tval); + struct buf title; + struct tm *tm = localtime(&tval); - title.b_size = COLS + 1; - if(!(title.b_val = (char *)malloc(title.b_size))) - perror("malloc"); + title.b_size = COLS + 1; + if (!(title.b_val = (char *) malloc(title.b_size))) + perror("malloc"); - snprintf(title.b_val, COLS," Every %ds : %s", period, cmd); + snprintf(title.b_val, COLS, " Every %ds : %s", period, cmd); - t_len = strlen(title.b_val); - t_len2 = COLS - t_len; + t_len = strlen(title.b_val); + t_len2 = COLS - t_len; - if(t_len2 > 0) - memset(title.b_val + t_len, ' ', t_len2); + if (t_len2 > 0) + memset(title.b_val + t_len, ' ', t_len2); - if(t_len2 < 12) - title.b_val[COLS - 12] = '>'; + if (t_len2 < 12) + title.b_val[COLS - 12] = '>'; - t_len = strlen(title.b_val); + t_len = strlen(title.b_val); - snprintf(title.b_val + t_len - 11, 12, " %.2d:%.2d:%.2d ", + snprintf(title.b_val + t_len - 11, 12, " %.2d:%.2d:%.2d ", tm->tm_hour, tm->tm_min, tm->tm_sec); - title.b_val[COLS] = '\0'; + title.b_val[COLS] = '\0'; - if(color_flag) - attron(A_REVERSE); - - printw("%s", title.b_val); - - if(color_flag) - attroff(A_REVERSE); + if (color_flag) + attron(A_REVERSE); - free(title.b_val); - title.b_size = 0; + printw("%s", title.b_val); - move(2,0); + if (color_flag) + attroff(A_REVERSE); + + free(title.b_val); + title.b_size = 0; + + move(2, 0); } -void resize() { - struct winsize ws; +void +resize() +{ + struct winsize ws; - if(!ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws)) { - LINES = ws.ws_row; - COLS = ws.ws_col; - resizeterm(LINES, COLS); - clear(); - } + if (!ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *) &ws)) { + LINES = ws.ws_row; + COLS = ws.ws_col; + resizeterm(LINES, COLS); + clear(); + } } -void die() { - die_flag=1; +void +die() +{ + die_flag = 1; } -void usage() { - (void)fprintf(stderr, "Usage: %s [-v] [-n] [-s ] command\n", __progname); - exit (1); +void +usage() +{ + (void) fprintf(stderr, "Usage: %s [-v] [-n] [-s ] command\n", + __progname); + exit(1); } -- cgit v1.2.3