mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* execute.c (do_execute): Make static. Print end of line after 

"Press any key to continue" and user's keystroke, but before
restoring the panels.  Eliminate last_paused variable.  Don't
print fake prompt if there is no command.
This commit is contained in:
Pavel Roskin 2003-06-22 10:15:04 +00:00
parent b0b8f65cdc
commit 6f5bb55e2b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,5 +1,10 @@
2003-06-22 Pavel Roskin <proski@gnu.org>
* execute.c (do_execute): Make static. Print end of line after
"Press any key to continue" and user's keystroke, but before
restoring the panels. Eliminate last_paused variable. Don't
print fake prompt if there is no command.
* text.c: Eliminate. Move colors to color.c and clr_scr() to
layout.c.
* main.c (restore_console): Eliminate, use handle_console().

15
src/execute.c
View File

@ -29,9 +29,6 @@
#include "execute.h"
/* to show nice prompts */
static int last_paused = 0;
static void
edition_post_exec (void)
{
@ -88,7 +85,7 @@ pre_exec (void)
}
void
static void
do_execute (const char *shell, const char *command, int flags)
{
#ifdef HAVE_SUBSHELL_SUPPORT
@ -107,9 +104,8 @@ do_execute (const char *shell, const char *command, int flags)
if (console_flag)
handle_console (CONSOLE_RESTORE);
if (!use_subshell && !(flags & EXECUTE_INTERNAL && command)) {
printf ("%s%s%s\n", last_paused ? "\r\n" : "", prompt, command);
last_paused = 0;
if (!use_subshell && command && !(flags & EXECUTE_INTERNAL)) {
printf ("%s%s\n", prompt, command);
}
#ifdef HAVE_SUBSHELL_SUPPORT
if (use_subshell && !(flags & EXECUTE_INTERNAL)) {
@ -133,11 +129,12 @@ do_execute (const char *shell, const char *command, int flags)
&& subshell_state != RUNNING_COMMAND
#endif /* HAVE_SUBSHELL_SUPPORT */
) {
printf ("%s\r\n", _("Press any key to continue..."));
last_paused = 1;
printf (_("Press any key to continue..."));
fflush (stdout);
mc_raw_mode ();
getch ();
printf ("\r\n");
fflush (stdout);
}
if (console_flag) {
if (output_lines && keybar_visible) {