gui: Simplify display command execution.

[paraslash.git] / gui.c

diff --git a/gui.c b/gui.c
index 49f595137ac4c18315ba36e9fa5ffbdef2f69663..e03fb28752511778a8c1a1b4d73e898b4e854578 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -1079,14 +1079,6 @@ check_return:
        case COMMAND_MODE:
                ret = wgetch(top.win);
                if (ret != ERR && ret != KEY_RESIZE) {
-                       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);
                        return -1;
@@ -1104,19 +1096,23 @@ check_return:
        goto repeat;
 }
 
-/*
- * read from command pipe and print data to bot window
- */
-static void send_output(void)
+/* read from command pipe and print data to bot window */
+static void exec_and_display_cmd(const char *cmd)
 {
-       int ret;
+       int ret, fds[3] = {0, 1, 1};
 
-       ret = mark_fd_nonblocking(command_fds[0]);
+       outputf(COLOR_COMMAND, "%s", cmd);
+       ret = para_exec_cmdline_pid(&cmd_pid, cmd, fds);
+       if (ret < 0)
+               return;
+       ret = mark_fd_nonblocking(fds[1]);
        if (ret < 0)
                goto fail;
-       ret = mark_fd_nonblocking(command_fds[1]);
+       ret = mark_fd_nonblocking(fds[2]);
        if (ret < 0)
                goto fail;
+       command_fds[0] = fds[1];
+       command_fds[1] = fds[2];
        if (do_select(COMMAND_MODE) >= 0)
                PARA_INFO_LOG("command complete\n");
        else
@@ -1131,34 +1127,18 @@ fail:
 
 static void para_cmd(char *cmd)
 {
-       int ret, fds[3] = {0, 1, 1};
-       char *c = make_message(BINDIR "/para_client -- %s", cmd);
+       char *c;
 
-       outputf(COLOR_COMMAND, "%s", c);
        print_in_bar(COLOR_MSG, "executing client command, hit any key to abort\n");
-       ret = para_exec_cmdline_pid(&cmd_pid, c, fds);
+       c = make_message(BINDIR "/para_client -- %s", cmd);
+       exec_and_display_cmd(c);
        free(c);
-       if (ret < 0)
-               return;
-       command_fds[0] = fds[1];
-       command_fds[1] = fds[2];
-       send_output();
 }
 
-/*
- * exec command and print output to bot win
- */
 static void display_cmd(char *cmd)
 {
-       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;
-       command_fds[0] = fds[1];
-       command_fds[1] = fds[2];
-       send_output();
+       exec_and_display_cmd(cmd);
 }
 
 /*