Ticket #213: mc_poc.diff

src/command.c

@@ -229 +229 @@
 #ifdef HAVE_SUBSHELL_SUPPORT
         /* Check this early before we clean command line
          * (will be checked again by shell_execute) */
-        if (use_subshell && subshell_state != INACTIVE) {
+        if (use_subshell && subshell_state != INACTIVE
+            && subshell_state != ACTIVE2) {
             message (1, MSG_ERROR,
                      _(" The shell is already running a command "));
             return MSG_NOT_HANDLED;

src/execute.c

@@ -131 +131 @@
                  && !console_flag)) && !quit
 #ifdef HAVE_SUBSHELL_SUPPORT
             && subshell_state != RUNNING_COMMAND
+            && subshell_state != RUNNING_COMMAND2  
 #endif                          /* HAVE_SUBSHELL_SUPPORT */
             ) {
             printf (_("Press any key to continue..."));
@@ -186 +187 @@
 
 #ifdef HAVE_SUBSHELL_SUPPORT
     if (use_subshell)
-        if (subshell_state == INACTIVE)
+        if (subshell_state == INACTIVE || subshell_state == ACTIVE2)
             do_execute (shell, cmd ? cmd : command, flags | EXECUTE_AS_SHELL);
         else
             message (1, MSG_ERROR,

src/main.c

@@ -436 +436 @@
 do_update_prompt (void)
 {
     if (update_prompt) {
-        printf ("%s", subshell_prompt);
+        /* FIXME: quick hack to eliminate 'stacked prompts bug'.
+        Actually should be done with ncurses. */
+        printf ("\033[1K\033[1G%s", subshell_prompt);
         fflush (stdout);
         update_prompt = 0;
     }

src/subshell.c

@@ -123 +123 @@
 static char *pty_buffer;        /* For reading/writing on the subshell's pty */
 static int pty_buffer_size;     /* The buffer grows as needed */
 static int subshell_pipe[2];    /* To pass CWD info from the subshell to MC */
+static int subshell_pipe2[2];   /* To indicate subshell command run */
 static pid_t subshell_pid = 1;  /* The subshell's process ID */
 static char subshell_cwd[MC_MAXPATHLEN+1];  /* One extra char for final '\n' */
 
 /* Subshell type (gleaned from the SHELL environment variable, if available) */
-static enum {BASH, TCSH, ZSH} subshell_type;
+enum subshell_type_enum subshell_type;
 
 /* Flag to indicate whether the subshell is ready for next command */
 static int subshell_ready;
@@ -282 +283 @@
 
     switch (subshell_type) {
     case BASH:
+        close (subshell_pipe[READ]);
         execl (shell, "bash", "-rcfile", init_file, (char *) NULL);
         break;
 
@@ -439 +441 @@
                 use_subshell = FALSE;
                 return;
             }
-        } else /* subshell_type is BASH or ZSH */ if (pipe (subshell_pipe)) {
-            perror (__FILE__": couldn't create pipe");
-            use_subshell = FALSE;
-            return;
-        }
+        } else /* subshell_type is BASH or ZSH */ {
+            if (pipe (subshell_pipe) || pipe (subshell_pipe2)) {
+                perror (__FILE__": couldn't create pipe");
+                use_subshell = FALSE;
+                return;
+            }
+        }
     }
 
     /* Fork the subshell */
@@ -469 +473 @@
     switch (subshell_type) {
     case BASH:
         g_snprintf (precmd, sizeof (precmd),
-                    " PROMPT_COMMAND='pwd>&%d;kill -STOP $$'\n",
-                    subshell_pipe[WRITE]);
+                    " PROMPT_COMMAND='pwd>&%d;kill -STOP $$';"
+                    "trap '[ \"$BASH_COMMAND\" != \"kill -STOP \\$\\$\" ] && echo $BASH_COMMAND>&%d' DEBUG\n",
+                    subshell_pipe[WRITE],
+                    subshell_pipe2[WRITE]);
         break;
 
     case ZSH:
@@ -548 +554 @@
     }
     else  /* MC has passed us a user command */
     {
+        if (subshell_state == ACTIVE2) {
+            /* Send Ctrl-C if something was typed on subshell prompt */
+            subshell_state = RUNNING_COMMAND;
+            write_all (subshell_pty, "\x3", 1);
+            feed_subshell (how, FALSE);
+        }
+
         if (how == QUIETLY)
             write_all (subshell_pty, " ", 1);
         /* FIXME: if command is long (>8KB ?) we go comma */
         write_all (subshell_pty, command, strlen (command));
         write_all (subshell_pty, "\n", 1);
-        subshell_state = RUNNING_COMMAND;
-        subshell_ready = FALSE;
+        subshell_state = RUNNING_COMMAND;
+        subshell_ready = FALSE;
     }
 
     feed_subshell (how, FALSE);
@@ -743 +756 @@
 void
 do_subshell_chdir (const char *directory, int do_update, int reset_prompt)
 {
-    if (!
+    if (subshell_state == ACTIVE2) {
+        /* Send Ctrl-C if something was typed on subshell prompt */
+        subshell_state = RUNNING_COMMAND;
+        write_all (subshell_pty, "\x3", 1);
+        /* FIXME: command prompt with old typed characters should be visible */
+        feed_subshell (VISIBLY, FALSE);
+    } else if (!
         (subshell_state == INACTIVE
          && strcmp (subshell_cwd, current_panel->cwd))) {
         /* We have to repaint the subshell prompt if we read it from
@@ -803 +822 @@
     }
 
     if (reset_prompt)
-        prompt_pos = 0;
+        prompt_pos = 0;
     update_prompt = FALSE;
     /* Make sure that MC never stores the CWD in a silly format */
     /* like /usr////lib/../bin, or the strcmp() above will fail */
@@ -902 +921 @@
         FD_ZERO (&read_set);
         FD_SET (subshell_pty, &read_set);
         FD_SET (subshell_pipe[READ], &read_set);
-        maxfdp = max (subshell_pty, subshell_pipe[READ]);
+        FD_SET (subshell_pipe2[READ], &read_set);
+        maxfdp = max(max (subshell_pty, subshell_pipe[READ]), subshell_pipe2[READ]);
         if (how == VISIBLY) {
             FD_SET (STDIN_FILENO, &read_set);
             maxfdp = max (maxfdp, STDIN_FILENO);
@@ -918 +938 @@
                      unix_error_string (errno));
             exit (1);
         }
-
-        if (FD_ISSET (subshell_pty, &read_set))
+        
+        if (subshell_type == BASH
+            && FD_ISSET (subshell_pipe2[READ], &read_set)) {
+            char buf[255];
+            int s = read (subshell_pipe2[READ], buf, 255);
+            if (0 >= s) {
+                tcsetattr (STDOUT_FILENO, TCSANOW, &shell_mode);
+                fprintf (stderr,
+                         "read (subshell_pipe2[READ], buf...): %s\r\n",
+                         unix_error_string (errno));
+                exit (1);
+            }
+            if (subshell_state == ACTIVE) {
+                subshell_state = RUNNING_COMMAND2;
+                subshell_ready = FALSE;
+            }
+        }
+
+        else if (FD_ISSET (subshell_pty, &read_set))
             /* Read from the subshell, write to stdout */
 
             /* This loop improves performance by reducing context switches
@@ -965 +1002 @@
             subshell_ready = TRUE;
             if (subshell_state == RUNNING_COMMAND) {
                 subshell_state = INACTIVE;
-                return 1;
+                return TRUE;
             }
+            if (subshell_state == RUNNING_COMMAND2 ||
+                subshell_state == ACTIVE2)
+            {
+                subshell_state = INACTIVE;
+            }
         }
 
         else if (FD_ISSET (STDIN_FILENO, &read_set))
@@ -990 +1032 @@
                 }
 
             write_all (subshell_pty, pty_buffer, bytes);
-            subshell_ready = FALSE;
+            subshell_ready = FALSE;
+            if (subshell_type == BASH)
+                subshell_state = ACTIVE2;
         } else {
             return FALSE;
         }

src/subshell.h

@@ -14 +14 @@
 extern int subshell_pty;
 
 /* State of the subshell; see subshell.c for an explanation */
-enum subshell_state_enum {INACTIVE, ACTIVE, RUNNING_COMMAND};
+enum subshell_state_enum {INACTIVE, ACTIVE, RUNNING_COMMAND, ACTIVE2, RUNNING_COMMAND2};
 extern enum subshell_state_enum subshell_state;
 
+enum subshell_type_enum {BASH, TCSH, ZSH};
+extern enum subshell_type_enum subshell_type;
+
 /* Holds the latest prompt captured from the subshell */
 extern char *subshell_prompt;