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

Ticket #213 [mc-ru-fork] patch for fix bug 'The shell is already running a command'

Browse Source 
Test case:

- run mc
- press CTRL+o (hide panels)
- press 'space' key
- press 'backspace' key
- press CTRL+o (show panels)
- type 'ls' and press 'enter' key

Fix issue: Now 'busy shell' status toggle on if user will press 'Enter' key.
Old behavior: User was press any key into subshell and 'busy shell' status toggle on.

Also, patch will enter new behavior:
 * run mc
 * press ctrl+o (hide panels)
 * type 'cat ' and don't press 'Enter' key
 * press ctrl+o (show panels)
 * type 'ls' and press enter

You'll see:
cat: ls: File not found.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2009-10-14 11:45:56 +03:00
parent b48b53729f
commit 4db3447eed
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;
/* FIXME: possibly take out this hack; the user can
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 */
@ -1052,7 +1053,9 @@ feed_subshell (int how, int fail_on_error)
}
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 {
return FALSE;
}