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

* subshell.c: Partly revert previous patch to preserve translated strings.

Browse Source
This commit is contained in:
Pavel Roskin 2004-03-05 08:08:13 +00:00
parent 0899d3f580
commit d78f9b9bf0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/subshell.c
View File

@ -419,14 +419,13 @@ init_subshell (void)
if ((subshell_pipe[READ] = open (tcsh_fifo, O_RDWR)) == -1 if ((subshell_pipe[READ] = open (tcsh_fifo, O_RDWR)) == -1
|| (subshell_pipe[WRITE] = || (subshell_pipe[WRITE] =
open (tcsh_fifo, O_RDWR)) == -1) { open (tcsh_fifo, O_RDWR)) == -1) {
fprintf (stderr, _("Cannot open named pipe %s: %s\r\n"), fprintf (stderr, _("Cannot open named pipe %s\n"), tcsh_fifo);
tcsh_fifo, unix_error_string (errno)); perror (__FILE__": open");
use_subshell = FALSE; use_subshell = FALSE;
return; return;
} }
} else /* subshell_type is BASH or ZSH */ if (pipe (subshell_pipe)) { } else /* subshell_type is BASH or ZSH */ if (pipe (subshell_pipe)) {
fprintf (stderr, _("Cannot create pipe pair: %s\r\n"), perror (__FILE__": couldn't create pipe");
unix_error_string (errno));
use_subshell = FALSE; use_subshell = FALSE;
return; return;
} }
@ -790,7 +789,7 @@ do_subshell_chdir (const char *directory, int do_update, int reset_prompt)
if (subshell_alive && strcmp (subshell_cwd, current_panel->cwd) if (subshell_alive && strcmp (subshell_cwd, current_panel->cwd)
&& strcmp (current_panel->cwd, ".")) && strcmp (current_panel->cwd, "."))
fprintf (stderr, _("Warning: Cannot change to %s.\r\n"), fprintf (stderr, _("Warning: Cannot change to %s.\n"),
current_panel->cwd); current_panel->cwd);
if (reset_prompt) if (reset_prompt)