X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=6e44b09d37cc574846f1de0a4d325e586c69dad0;hp=a3c07ec796bd9d179ef633b3d81d91c14b42c834;hb=e90c6c0a;hpb=d49cd9a91015766cb19d7d43bb04048265925fe5 diff --git a/gui.c b/gui.c index a3c07ec7..6e44b09d 100644 --- a/gui.c +++ b/gui.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2011 Andre Noll + * Copyright (C) 1998-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -50,10 +50,10 @@ static struct ringbuffer *bot_win_rb; static unsigned scroll_position; -static int cmd_died, curses_active; +static int curses_active; static pid_t cmd_pid; -static int command_pipe = -1; +static int command_fds[2]; static int stat_pipe = -1; static struct gui_args_info conf; @@ -287,14 +287,20 @@ static char *configfile_exists(void) return file_exists(tmp)? tmp: NULL; } -/* - * print num spaces to curses window - */ +/* Print given number of spaces to curses window. */ static void add_spaces(WINDOW* win, unsigned int num) { - while (num > 0) { - num--; - waddstr(win, " "); + char space[] = " "; + unsigned sz = sizeof(space); + + while (num >= sz) { + waddstr(win, space); + num -= sz; + } + if (num > 0) { + assert(num < sz); + space[num] = '\0'; + waddstr(win, space); } } @@ -336,11 +342,14 @@ static int align_str(WINDOW* win, char *str, unsigned int len, __printf_2_3 static void print_in_bar(int color, const char *fmt,...) { char *msg; + va_list ap; if (!curses_active) return; wattron(in.win, COLOR_PAIR(color)); - PARA_VSPRINTF(fmt, msg); + va_start(ap, fmt); + xvasprintf(&msg, fmt, ap); + va_end(ap); wmove(in.win, 0, 0); align_str(in.win, msg, sb.cols, LEFT); free(msg); @@ -471,28 +480,33 @@ static void rb_add_entry(int color, char *msg) __printf_2_3 static void outputf(int color, const char* fmt,...) { char *msg; + va_list ap; if (!curses_active) return; - PARA_VSPRINTF(fmt, msg); + va_start(ap, fmt); + xvasprintf(&msg, fmt, ap); + va_end(ap); rb_add_entry(color, msg); wrefresh(bot.win); } -static int add_output_line(char *line, __a_unused void *data) +static int add_output_line(char *line, void *data) { + int color = *(int *)data? COLOR_ERRMSG : COLOR_OUTPUT; if (!curses_active) return 1; - rb_add_entry(COLOR_OUTPUT, para_strdup(line)); + rb_add_entry(color, para_strdup(line)); return 1; } static int loglevel; -__printf_2_3 void para_log(int ll, const char *fmt,...) +__printf_2_3 void curses_log(int ll, const char *fmt,...) { int color; char *msg; + va_list ap; if (ll < loglevel || !curses_active) return; @@ -505,11 +519,14 @@ __printf_2_3 void para_log(int ll, const char *fmt,...) default: color = COLOR_ERRMSG; } - PARA_VSPRINTF(fmt, msg); + va_start(ap, fmt); + xvasprintf(&msg, fmt, ap); + va_end(ap); chop(msg); rb_add_entry(color, msg); wrefresh(bot.win); } +__printf_2_3 void (*para_log)(int, const char*, ...) = curses_log; static void setup_signal_handling(void) { @@ -522,7 +539,8 @@ static void setup_signal_handling(void) para_sigaction(SIGHUP, SIG_IGN); } -__noreturn static void do_exit(int ret) +/* kill every process in the process group and exit */ +__noreturn static void kill_pg_and_die(int ret) { para_sigaction(SIGTERM, SIG_IGN); kill(0, SIGTERM); @@ -541,7 +559,7 @@ static void shutdown_curses(void) __noreturn static void finish(int ret) { shutdown_curses(); - do_exit(ret); + kill_pg_and_die(ret); } /* @@ -556,7 +574,7 @@ __noreturn __printf_2_3 static void msg_n_exit(int ret, const char* fmt, ...) va_start(argp, fmt); vfprintf(outfd, fmt, argp); va_end(argp); - do_exit(ret); + kill_pg_and_die(ret); } static void print_welcome(void) @@ -823,10 +841,8 @@ reap_next_child: ret = para_reap_child(&pid); if (ret <= 0) return; - if (pid == cmd_pid) { + if (pid == cmd_pid) cmd_pid = 0; - cmd_died = 1; - } goto reap_next_child; } @@ -940,15 +956,16 @@ static int open_stat_pipe(void) return ret; } +#define COMMAND_BUF_SIZE 32768 + /* * This is the core select loop. Besides the (internal) signal * pipe, the following other fds are checked according to the mode: * * GETCH_MODE: check stdin, return when key is pressed * - * COMMAND_MODE: check command_pipe and stdin. Return when a screen full - * of output has been read or when other end has closed command pipe or - * when any key is pressed. + * COMMAND_MODE: check command fds and stdin. Return when peer has closed both + * stdout and stderr or when any key is pressed. * * EXTERNAL_MODE: Check only signal pipe. Used when an external command * is running. During that time curses is disabled. Returns when @@ -957,11 +974,11 @@ static int open_stat_pipe(void) static int do_select(int mode) { fd_set rfds; - int ret; - int max_fileno; - char command_buf[4096] = ""; - int cbo = 0; /* command buf offset */ + int ret, i, max_fileno; + char command_buf[2][COMMAND_BUF_SIZE] = {"", ""}; + int cbo[2] = {0, 0}; /* command buf offsets */ struct timeval tv; + repeat: tv.tv_sec = conf.timeout_arg / 1000; tv.tv_usec = (conf.timeout_arg % 1000) * 1000; @@ -975,8 +992,14 @@ repeat: /* signal pipe */ para_fd_set(signal_pipe, &rfds, &max_fileno); /* command pipe only for COMMAND_MODE */ - if (command_pipe >= 0 && mode == COMMAND_MODE) - para_fd_set(command_pipe, &rfds, &max_fileno); + if (mode == COMMAND_MODE) { + if (command_fds[0] >= 0) + para_fd_set(command_fds[0], &rfds, &max_fileno); + if (command_fds[1] >= 0) + para_fd_set(command_fds[1], &rfds, &max_fileno); + } + if (mode == GETCH_MODE || mode == COMMAND_MODE) + para_fd_set(STDIN_FILENO, &rfds, &max_fileno); ret = para_select(max_fileno + 1, &rfds, NULL, &tv); if (ret <= 0) goto check_return; /* skip fd checks */ @@ -985,21 +1008,32 @@ repeat: if (ret > 0) handle_signal(ret); /* read command pipe if ready */ - if (command_pipe >= 0 && mode == COMMAND_MODE) { - size_t sz; - ret = read_nonblock(command_pipe, command_buf + cbo, - sizeof(command_buf) - 1 - cbo, &rfds, &sz); - cbo += sz; - sz = cbo; - cbo = for_each_line(command_buf, cbo, &add_output_line, NULL); - if (sz != cbo) - wrefresh(bot.win); - if (ret < 0) { - PARA_NOTICE_LOG("closing command pipe: %s", - para_strerror(-ret)); - close(command_pipe); - command_pipe = -1; - return 0; + if (mode == COMMAND_MODE) { + for (i = 0; i < 2; i++) { + size_t sz; + if (command_fds[i] < 0) + continue; + ret = read_nonblock(command_fds[i], + command_buf[i] + cbo[i], + COMMAND_BUF_SIZE - 1 - cbo[i], &rfds, &sz); + cbo[i] += sz; + sz = cbo[i]; + cbo[i] = for_each_line(command_buf[i], cbo[i], + add_output_line, &i); + if (sz != cbo[i]) + wrefresh(bot.win); + if (ret < 0) { + PARA_NOTICE_LOG("closing command fd %d: %s", + i, para_strerror(-ret)); + close(command_fds[i]); + command_fds[i] = -1; + if (command_fds[!i] < 0) /* both fds closed */ + return 0; + } + if (cbo[i] == COMMAND_BUF_SIZE - 1) { + PARA_NOTICE_LOG("discarding overlong line"); + cbo[i] = 0; + } } } ret = read_stat_pipe(&rfds); @@ -1018,9 +1052,13 @@ check_return: case COMMAND_MODE: ret = wgetch(top.win); if (ret != ERR && ret != KEY_RESIZE) { - if (command_pipe) { - close(command_pipe); - command_pipe = -1; + if (command_fds[0] >= 0) { + close(command_fds[0]); + command_fds[0] = -1; + } + if (command_fds[1] >= 0) { + close(command_fds[1]); + command_fds[1] = -1; } if (cmd_pid) kill(cmd_pid, SIGTERM); @@ -1033,10 +1071,8 @@ check_return: return ret; break; case EXTERNAL_MODE: - if (cmd_died) { - cmd_died = 0; + if (cmd_pid == 0) return 0; - } } goto repeat; } @@ -1044,28 +1080,31 @@ check_return: /* * read from command pipe and print data to bot window */ -static int send_output(void) +static void send_output(void) { int ret; - if (command_pipe < 0) - return 0; - ret = mark_fd_nonblocking(command_pipe); - if (ret < 0) { - close(command_pipe); - return ret; - } + ret = mark_fd_nonblocking(command_fds[0]); + if (ret < 0) + goto fail; + ret = mark_fd_nonblocking(command_fds[1]); + if (ret < 0) + goto fail; if (do_select(COMMAND_MODE) >= 0) PARA_INFO_LOG("command complete"); else PARA_NOTICE_LOG("command aborted"); print_in_bar(COLOR_MSG, " "); - return 1; + return; +fail: + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + close(command_fds[0]); + close(command_fds[1]); } -static int client_cmd_cmdline(char *cmd) +static void para_cmd(char *cmd) { - int ret, fds[3] = {0, 1, 0}; + int ret, fds[3] = {0, 1, 1}; char *c = make_message(BINDIR "/para_client -- %s", cmd); outputf(COLOR_COMMAND, "%s", c); @@ -1073,41 +1112,42 @@ static int client_cmd_cmdline(char *cmd) ret = para_exec_cmdline_pid(&cmd_pid, c, fds); free(c); if (ret < 0) - return -1; - command_pipe = fds[1]; - return send_output(); + return; + command_fds[0] = fds[1]; + command_fds[1] = fds[2]; + send_output(); } /* * exec command and print output to bot win */ -static int display_cmd(char *cmd) +static void display_cmd(char *cmd) { - int fds[3] = {0, 1, 0}; + int fds[3] = {0, 1, 1}; print_in_bar(COLOR_MSG, "executing display command, hit any key to abort"); outputf(COLOR_COMMAND, "%s", cmd); if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0) - return -1; - command_pipe = fds[1]; - return send_output(); + return; + command_fds[0] = fds[1]; + command_fds[1] = fds[2]; + send_output(); } /* * shutdown curses and stat pipe before executing external commands */ -static int external_cmd(char *cmd) +static void external_cmd(char *cmd) { int fds[3] = {-1, -1, -1}; if (cmd_pid) - return -1; + return; shutdown_curses(); - para_exec_cmdline_pid(&cmd_pid, cmd, fds); - cmd_died = 0; + if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0) + return; do_select(EXTERNAL_MODE); init_curses(); - return 0; } static void print_scroll_msg(void) @@ -1426,7 +1466,7 @@ static void handle_command(int c) else if (*handler == 'x') external_cmd(arg); else if (*handler == 'p') - client_cmd_cmdline(arg); + para_cmd(arg); else if (*handler == 'i') { int num = find_cmd_byname(arg); if (num >= 0) @@ -1454,8 +1494,7 @@ int main(int argc, char *argv[]) _argc = argc; _argv = argv; - if (gui_cmdline_parser(argc, argv, &conf) != 0) - exit(EXIT_FAILURE); + gui_cmdline_parser(argc, argv, &conf); /* exits on errors */ HANDLE_VERSION_FLAG("gui", conf); cf = configfile_exists(); if (!cf && conf.config_file_given) {