mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '213_busy_shell'

Browse Source 
* 213_busy_shell:
  Ticket #213 [mc-ru-fork] patch for fix bug 'The shell is already running a command'
This commit is contained in:
Slava Zanko 2009-10-16 15:29:09 +03:00
commit 890f268bf0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/subshell.c
View File

@ -573,7 +573,8 @@ int invoke_subshell (const char *command, int how, char **new_dir)
subshell_state = ACTIVE; subshell_state = ACTIVE;
/* FIXME: possibly take out this hack; the user can /* FIXME: possibly take out this hack; the user can
re-play it by hitting C-hyphen a few times! */ re-play it by hitting C-hyphen a few times! */
write_all (subshell_pty, " \b", 2); /* Hack to make prompt reappear */ if (subshell_ready)
write_all (subshell_pty, " \b", 2); /* Hack to make prompt reappear */
} }
} }
else /* MC has passed us a user command */ else /* MC has passed us a user command */
@ -1052,7 +1053,9 @@ feed_subshell (int how, int fail_on_error)
} }
write_all (subshell_pty, pty_buffer, bytes); write_all (subshell_pty, pty_buffer, bytes);
subshell_ready = FALSE;
if (pty_buffer[bytes-1] == '\n' || pty_buffer[bytes-1] == '\r')
subshell_ready = FALSE;
} else { } else {
return FALSE; return FALSE;
} }