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

* subshell.c (init_raw_mode): New function, separated from ...

Browse Source 
(invoke_subshell): ... this.
(init_subshell): Initialize raw_mode here instead of delayng it
until invoke_subshell(). Otherwise the current mode may have
been changed by edition_pre_exec(), which caused Ctrl-O to be
ignored on FreeBSD if a command has been run before switching
to the subshell.
This commit is contained in:
Pavel Roskin 2001-04-17 06:51:18 +00:00
parent 900d78c30a
commit 747ebced90
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChangeLog
View File

@ -1,3 +1,13 @@
2001-04-17 Pavel Roskin <proski@gnu.org>
* subshell.c (init_raw_mode): New function, separated from ...
(invoke_subshell): ... this.
(init_subshell): Initialize raw_mode here instead of delayng it
until invoke_subshell(). Otherwise the current mode may have
been changed by edition_pre_exec(), which caused Ctrl-O to be
ignored on FreeBSD if a command has been run before switching
to the subshell.
2001-04-06 Pavel Roskin <proski@gnu.org>
* chmod.c (stat_file): Allow chmod and chown on special files.

27
src/subshell.c
View File

@ -87,6 +87,7 @@
#include "subshell.h"
/* Local functions */
static void init_raw_mode (void);
static int feed_subshell (int how, int fail_on_error);
static void synchronize (void);
static int pty_open_master (char *pty_name);
@ -169,6 +170,11 @@ static volatile int subshell_alive, subshell_stopped;
sanity if we have to exit abruptly */
static struct termios shell_mode;
/* This is a transparent mode for the terminal where MC is running on */
/* It is used when the shell is active, so that the control signals */
/* are delivered to the shell pty */
static struct termios raw_mode;
/* This counter indicates how many characters of prompt we have read */
/* FIXME: try to figure out why this had to become global */
static int prompt_pos;
@ -221,6 +227,10 @@ void init_subshell (void)
/* }}} */
/* Take the current (hopefully pristine) tty mode and make */
/* a raw mode based on it now, before we do anything else with it */
init_raw_mode ();
if (subshell_pty == 0) /* First time through */
{
/* {{{ Find out what type of shell we have */
@ -533,13 +543,10 @@ void init_subshell (void)
}
/* }}} */
/* {{{ invoke_subshell */
int invoke_subshell (const char *command, int how, char **new_dir)
static void init_raw_mode ()
{
/* {{{ Fiddle with terminal modes */
static struct termios raw_mode = {0};
static int initialized = 0;
/* MC calls reset_shell_mode() in pre_exec() to set the real tty to its */
/* original settings. However, here we need to make this tty very raw, */
@ -547,7 +554,7 @@ int invoke_subshell (const char *command, int how, char **new_dir)
/* pty. So, instead of changing the code for execute(), pre_exec(), */
/* etc, we just set up the modes we need here, before each command. */
if (raw_mode.c_iflag == 0) /* First time: initialise `raw_mode' */
if (initialized == 0) /* First time: initialise `raw_mode' */
{
tcgetattr (STDOUT_FILENO, &raw_mode);
raw_mode.c_lflag &= ~ICANON; /* Disable line-editing chars, etc. */
@ -558,7 +565,15 @@ int invoke_subshell (const char *command, int how, char **new_dir)
raw_mode.c_oflag &= ~OPOST; /* Don't postprocess output */
raw_mode.c_cc[VTIME] = 0; /* IE: wait forever, and return as */
raw_mode.c_cc[VMIN] = 1; /* soon as a character is available */
initialized = 1;
}
}
/* {{{ invoke_subshell */
int invoke_subshell (const char *command, int how, char **new_dir)
{
/* {{{ Make the MC terminal transparent */
tcsetattr (STDOUT_FILENO, TCSANOW, &raw_mode);