From 96fbecf492a660afbe7cbd5d45ae1dbe02f3acbf Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sat, 4 Jan 2014 22:16:22 +0000 Subject: [PATCH] gui: Rename cmd_task to exec_task. The term "command" currently means either a gui command handler or the process which is executing as a result of a defined key map. Avoid this confusion by using the word only for command handlers. This commit also simplifies exec_cmd() and exec_para() slightly by moving the "hit any key to abort" message into the common function exec_and_display(). --- gui.c | 134 +++++++++++++++++++++++++++------------------------------- 1 file changed, 63 insertions(+), 71 deletions(-) diff --git a/gui.c b/gui.c index c817bf31..8d84e463 100644 --- a/gui.c +++ b/gui.c @@ -44,16 +44,16 @@ static struct ringbuffer *bot_win_rb; static unsigned scroll_position; -static pid_t cmd_pid; +static pid_t exec_pid; -static int command_fds[2] = {-1, -1}; +static int exec_fds[2] = {-1, -1}; static struct gui_args_info conf; static int loglevel; -enum cmd_status { - CMDS_IDLE, /* no command running */ - CMDS_DCMD, /* para or display command running */ - CMDS_XCMD, /* external command running */ +enum exec_status { + EXEC_IDLE, /* no command running */ + EXEC_DCMD, /* para or display command running */ + EXEC_XCMD, /* external command running */ }; /** @@ -133,7 +133,7 @@ struct status_task { #define COMMAND_BUF_SIZE 32768 -struct cmd_task { +struct exec_task { struct task task; char command_buf[2][COMMAND_BUF_SIZE]; /* stdout/stderr of command */ int cbo[2]; /* command buf offsets */ @@ -481,7 +481,7 @@ static __printf_2_3 void curses_log(int ll, const char *fmt,...) msg[bytes - 1] = '\0'; /* cut trailing newline */ rb_add_entry(color, msg); wrefresh(bot.win); - } else if (cmd_pid <= 0) /* no external command running */ + } else if (exec_pid <= 0) /* no external command running */ vfprintf(stderr, fmt, ap); va_end(ap); } @@ -774,8 +774,8 @@ reap_next_child: ret = para_reap_child(&pid); if (ret <= 0) return; - if (pid == cmd_pid) { - cmd_pid = 0; + if (pid == exec_pid) { + exec_pid = 0; init_curses(); print_in_bar(COLOR_MSG, " "); } @@ -918,40 +918,40 @@ static int signal_post_select(struct sched *s, __a_unused struct task *t) return 1; } -static enum cmd_status cmd_status(void) +static enum exec_status exec_status(void) { - if (command_fds[0] >= 0 || command_fds[1] >= 0) - return CMDS_DCMD; - if (cmd_pid > 0) - return CMDS_XCMD; - return CMDS_IDLE; + if (exec_fds[0] >= 0 || exec_fds[1] >= 0) + return EXEC_DCMD; + if (exec_pid > 0) + return EXEC_XCMD; + return EXEC_IDLE; } -static void command_pre_select(struct sched *s, __a_unused struct task *t) +static void exec_pre_select(struct sched *s, __a_unused struct task *t) { - enum cmd_status cmds = cmd_status(); + enum exec_status es = exec_status(); - if (cmds != CMDS_DCMD) + if (es != EXEC_DCMD) return; - if (command_fds[0] >= 0) - para_fd_set(command_fds[0], &s->rfds, &s->max_fileno); - if (command_fds[1] >= 0) - para_fd_set(command_fds[1], &s->rfds, &s->max_fileno); + if (exec_fds[0] >= 0) + para_fd_set(exec_fds[0], &s->rfds, &s->max_fileno); + if (exec_fds[1] >= 0) + para_fd_set(exec_fds[1], &s->rfds, &s->max_fileno); } -static int command_post_select(struct sched *s, struct task *t) +static int exec_post_select(struct sched *s, struct task *t) { - struct cmd_task *ct = container_of(t, struct cmd_task, task); + struct exec_task *ct = container_of(t, struct exec_task, task); int i, ret; - enum cmd_status cmds = cmd_status(); + enum exec_status es = exec_status(); - if (cmds != CMDS_DCMD) + if (es != EXEC_DCMD) return 0; for (i = 0; i < 2; i++) { size_t sz; - if (command_fds[i] < 0) + if (exec_fds[i] < 0) continue; - ret = read_nonblock(command_fds[i], + ret = read_nonblock(exec_fds[i], ct->command_buf[i] + ct->cbo[i], COMMAND_BUF_SIZE - 1 - ct->cbo[i], &s->rfds, &sz); ct->cbo[i] += sz; @@ -962,15 +962,15 @@ static int command_post_select(struct sched *s, struct task *t) wrefresh(bot.win); ct->flags[i] = 0; } - if (ret < 0 || cmd_pid == 0) { + if (ret < 0 || exec_pid == 0) { if (ret < 0) PARA_NOTICE_LOG("closing command fd %d: %s", i, para_strerror(-ret)); - close(command_fds[i]); - command_fds[i] = -1; + close(exec_fds[i]); + exec_fds[i] = -1; ct->flags[i] = 0; ct->cbo[i] = 0; - if (command_fds[!i] < 0) /* both fds closed */ + if (exec_fds[!i] < 0) /* both fds closed */ return 1; } if (ct->cbo[i] == COMMAND_BUF_SIZE - 1) { @@ -984,19 +984,17 @@ static int command_post_select(struct sched *s, struct task *t) static void input_pre_select(struct sched *s, __a_unused struct task *t) { - enum cmd_status cmds = cmd_status(); - - if (cmds != CMDS_XCMD) + if (exec_status() != EXEC_XCMD) para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno); } /* read from command pipe and print data to bot window */ -static void exec_and_display_cmd(const char *cmd) +static void exec_and_display(const char *file_and_args) { int ret, fds[3] = {0, 1, 1}; - outputf(COLOR_COMMAND, "%s", cmd); - ret = para_exec_cmdline_pid(&cmd_pid, cmd, fds); + outputf(COLOR_COMMAND, "%s", file_and_args); + ret = para_exec_cmdline_pid(&exec_pid, file_and_args, fds); if (ret < 0) return; ret = mark_fd_nonblocking(fds[1]); @@ -1005,42 +1003,36 @@ static void exec_and_display_cmd(const char *cmd) ret = mark_fd_nonblocking(fds[2]); if (ret < 0) goto fail; - command_fds[0] = fds[1]; - command_fds[1] = fds[2]; + exec_fds[0] = fds[1]; + exec_fds[1] = fds[2]; + print_in_bar(COLOR_MSG, "hit any key to abort\n"); return; fail: PARA_ERROR_LOG("%s\n", para_strerror(-ret)); - close(command_fds[0]); - close(command_fds[1]); + close(exec_fds[0]); + close(exec_fds[1]); } -static void para_cmd(char *cmd) +static void exec_para(const char *args) { - char *c; - - print_in_bar(COLOR_MSG, "executing client command, hit any key to abort\n"); - c = make_message(BINDIR "/para_client -- %s", cmd); - exec_and_display_cmd(c); - free(c); -} + char *file_and_args; -static void display_cmd(char *cmd) -{ - print_in_bar(COLOR_MSG, "executing display command, hit any key to abort"); - exec_and_display_cmd(cmd); + file_and_args = make_message(BINDIR "/para_client -- %s", args); + exec_and_display(file_and_args); + free(file_and_args); } /* * shutdown curses and stat pipe before executing external commands */ -static void external_cmd(char *cmd) +static void exec_external(char *file_and_args) { int fds[3] = {-1, -1, -1}; - if (cmd_pid) + if (exec_pid) return; shutdown_curses(); - para_exec_cmdline_pid(&cmd_pid, cmd, fds); + para_exec_cmdline_pid(&exec_pid, file_and_args, fds); } static void handle_command(int c) @@ -1061,11 +1053,11 @@ static void handle_command(int c) continue; } if (*handler == 'd') - display_cmd(arg); + exec_and_display(arg); else if (*handler == 'x') - external_cmd(arg); + exec_external(arg); else if (*handler == 'p') - para_cmd(arg); + exec_para(arg); else if (*handler == 'i') { int num = find_cmd_byname(arg); if (num >= 0) @@ -1088,19 +1080,19 @@ static void handle_command(int c) static int input_post_select(__a_unused struct sched *s, __a_unused struct task *t) { int ret; - enum cmd_status cmds = cmd_status(); + enum exec_status exs = exec_status(); - if (cmds == CMDS_XCMD) + if (exs == EXEC_XCMD) return 0; ret = wgetch(top.win); if (ret == ERR || ret == KEY_RESIZE) return 0; - if (cmds == CMDS_IDLE) { + if (exs == EXEC_IDLE) { handle_command(ret); return 0; } - if (cmd_pid != 0) - kill(cmd_pid, SIGTERM); + if (exec_pid != 0) + kill(exec_pid, SIGTERM); return 0; } @@ -1386,11 +1378,11 @@ static int setup_tasks_and_schedule(void) .tv_usec = (conf.timeout_arg % 1000) * 1000, }, }; - struct cmd_task cmd_task = { + struct exec_task exec_task = { .task = { - .status = "cmd", - .pre_select = command_pre_select, - .post_select = command_post_select, + .status = "exec", + .pre_select = exec_pre_select, + .post_select = exec_post_select, }, }; struct status_task status_task = { @@ -1422,7 +1414,7 @@ static int setup_tasks_and_schedule(void) para_install_sighandler(SIGWINCH); para_install_sighandler(SIGUSR1); - register_task(&sched, &cmd_task.task); + register_task(&sched, &exec_task.task); register_task(&sched, &status_task.task); register_task(&sched, &input_task.task); register_task(&sched, &signal_task.task); -- 2.39.5