mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-09 21:12:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed formatting after autoformatting.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2010-08-29 16:38:00 +04:00
parent e967125920
commit 9f702e82ef
1 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/subshell.c
View File

@ -110,12 +110,10 @@ static const char subshell_switch_key = XCTRL ('o') & 255;
* INACTIVE: the default state; awaiting a command * INACTIVE: the default state; awaiting a command
* ACTIVE: remain in the shell until the user hits `subshell_switch_key' * ACTIVE: remain in the shell until the user hits `subshell_switch_key'
* RUNNING_COMMAND: return to MC when the current command finishes */ * RUNNING_COMMAND: return to MC when the current command finishes */
enum subshell_state_enum enum subshell_state_enum subshell_state;
subshell_state;
/* Holds the latest prompt captured from the subshell */ /* Holds the latest prompt captured from the subshell */
char * char *subshell_prompt = NULL;
subshell_prompt = NULL;
/* Initial length of the buffer for the subshell's prompt */ /* Initial length of the buffer for the subshell's prompt */
#define INITIAL_PROMPT_SIZE 10 #define INITIAL_PROMPT_SIZE 10
@ -127,62 +125,53 @@ static const char subshell_switch_key = XCTRL ('o') & 255;
#define PTY_BUFFER_SIZE BUF_SMALL /* Arbitrary; but keep it >= 80 */ #define PTY_BUFFER_SIZE BUF_SMALL /* Arbitrary; but keep it >= 80 */
/* For pipes */ /* For pipes */
enum enum
{ {
READ = 0, WRITE = 1 }; READ = 0,
WRITE = 1
};
static char static char pty_buffer[PTY_BUFFER_SIZE] = "\0"; /* For reading/writing on the subshell's pty */
pty_buffer[PTY_BUFFER_SIZE] = "\0"; /* For reading/writing on the subshell's pty */ static int subshell_pipe[2]; /* To pass CWD info from the subshell to MC */
static int static pid_t subshell_pid = 1; /* The subshell's process ID */
subshell_pipe[2]; /* To pass CWD info from the subshell to MC */ static char subshell_cwd[MC_MAXPATHLEN + 1]; /* One extra char for final '\n' */
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) */ /* Subshell type (gleaned from the SHELL environment variable, if available) */
static enum static enum
{ {
BASH, BASH,
TCSH, TCSH,
ZSH, ZSH,
FISH FISH
} subshell_type; } subshell_type;
/* Flag to indicate whether the subshell is ready for next command */ /* Flag to indicate whether the subshell is ready for next command */
static int static int subshell_ready;
subshell_ready;
/* The following two flags can be changed by the SIGCHLD handler. This is */ /* The following two flags can be changed by the SIGCHLD handler. This is */
/* OK, because the `int' type is updated atomically on all known machines */ /* OK, because the `int' type is updated atomically on all known machines */
static volatile int static volatile int subshell_alive, subshell_stopped;
subshell_alive,
subshell_stopped;
/* We store the terminal's initial mode here so that we can configure /* We store the terminal's initial mode here so that we can configure
the pty similarly, and also so we can restore the real terminal to the pty similarly, and also so we can restore the real terminal to
sanity if we have to exit abruptly */ sanity if we have to exit abruptly */
static struct termios static struct termios shell_mode;
shell_mode;
/* This is a transparent mode for the terminal where MC is running on */ /* 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 */ /* It is used when the shell is active, so that the control signals */
/* are delivered to the shell pty */ /* are delivered to the shell pty */
static struct termios static struct termios raw_mode;
raw_mode;
/* This counter indicates how many characters of prompt we have read */ /* This counter indicates how many characters of prompt we have read */
/* FIXME: try to figure out why this had to become global */ /* FIXME: try to figure out why this had to become global */
static int static int prompt_pos;
prompt_pos;
/* /*
* Write all data, even if the write() call is interrupted. * Write all data, even if the write() call is interrupted.
*/ */
static static ssize_t
ssize_t write_all (int fd, const void *buf, size_t count)
write_all (int fd, const void *buf, size_t count)
{ {
ssize_t ret; ssize_t ret;
ssize_t written = 0; ssize_t written = 0;