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

Merge commit 'origin/231_bg_shell_fish_support'

Browse Source 
* commit 'origin/231_bg_shell_fish_support':
  Start on fish (Friendly Interactive SHell) support.
This commit is contained in:
Sergei Trofimovich 2009-06-19 14:27:18 +03:00
commit 1b5ae972bb
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/subshell.c
View File

@ -133,7 +133,12 @@ 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) */
static enum {BASH, TCSH, ZSH} subshell_type;
static enum {
BASH,
TCSH,
ZSH,
FISH,
} subshell_type;
/* Flag to indicate whether the subshell is ready for next command */
static int subshell_ready;
@ -258,6 +263,7 @@ init_subshell_child (const char *pty_name)
/* TODO: Find a way to pass initfile to TCSH and ZSH */
case TCSH:
case ZSH:
case FISH:
break;
default:
@ -302,6 +308,10 @@ init_subshell_child (const char *pty_name)
execl (shell, "zsh", "-Z", "-g", (char *) NULL);
break;
case FISH:
execl (shell, "fish", (char *) NULL);
break;
}
/* If we get this far, everything failed miserably */
@ -395,6 +405,8 @@ init_subshell (void)
subshell_type = TCSH;
else if (strstr (shell, "/bash") || getenv ("BASH"))
subshell_type = BASH;
else if (strstr (shell, "/fish"))
subshell_type = FISH;
else {
use_subshell = FALSE;
return;
@ -492,6 +504,12 @@ init_subshell (void)
"alias precmd 'echo $cwd:q >>%s;kill -STOP $$'\n",
tcsh_fifo);
break;
case FISH:
g_snprintf (precmd, sizeof (precmd),
"function fish_prompt ; pwd>&%d;kill -STOP %%self; end\n",
subshell_pipe[WRITE], subshell_pipe[WRITE]);
break;
}
write_all (subshell_pty, precmd, strlen (precmd));
@ -712,13 +730,20 @@ subshell_name_quote (const char *s)
{
char *ret, *d;
const char *su, *n;
const char quote_cmd_start[] = "\"`printf \"%b\" '";
const char quote_cmd_end[] = "'`\"";
const char *quote_cmd_start, *quote_cmd_end;
int c;
if (subshell_type == FISH) {
quote_cmd_start = "(printf \"%b\" '";
quote_cmd_end = "')";
} else {
quote_cmd_start = "\"`printf \"%b\" '";
quote_cmd_end = "'`\"";
}
/* Factor 5 because we need \, 0 and 3 other digits per character. */
d = ret = g_malloc (1 + (5 * strlen (s)) + (sizeof(quote_cmd_start) - 1)
+ (sizeof(quote_cmd_end) - 1));
d = ret = g_malloc (1 + (5 * strlen (s)) + (strlen(quote_cmd_start))
+ (strlen(quote_cmd_end)));
if (!d)
return NULL;
@ -730,7 +755,7 @@ subshell_name_quote (const char *s)
/* Copy the beginning of the command to the buffer */
strcpy (d, quote_cmd_start);
d += sizeof(quote_cmd_start) - 1;
d += strlen(quote_cmd_start);
/*
* Print every character except digits and letters as a backslash-escape