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

Merge branch '4372_fish_resize'

Browse Source 
* 4372_fish_resize:
  Ticket #4372: fish commands don't work after window resize.
This commit is contained in:
Andrew Borodin 2022-05-22 11:29:15 +03:00
commit aba8102088
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/subshell/common.c
View File

@ -1261,6 +1261,37 @@ subshell_name_quote (const char *s)
return ret; return ret;
} }
/* --------------------------------------------------------------------------------------------- */
/**
* This function checks the pipe from which we receive data about the current working directory.
* If there is any data waiting, we clear it.
*/
static void
clear_cwd_pipe (void)
{
fd_set read_set;
struct timeval wtime = { 0, 0 };
int maxfdp;
FD_ZERO (&read_set);
FD_SET (subshell_pipe[READ], &read_set);
maxfdp = subshell_pipe[READ];
if (select (maxfdp + 1, &read_set, NULL, NULL, &wtime) > 0
&& FD_ISSET (subshell_pipe[READ], &read_set))
{
if (read (subshell_pipe[READ], subshell_cwd, sizeof (subshell_cwd)) <= 0)
{
tcsetattr (STDOUT_FILENO, TCSANOW, &shell_mode);
fprintf (stderr, "read (subshell_pipe[READ]...): %s\r\n", unix_error_string (errno));
exit (EXIT_FAILURE);
}
synchronize ();
}
}
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/*** public functions ****************************************************************************/ /*** public functions ****************************************************************************/
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -1457,7 +1488,9 @@ invoke_subshell (const char *command, int how, vfs_path_t ** new_dir_vpath)
/* data is there, but only if we are using one of the shells that */ /* data is there, but only if we are using one of the shells that */
/* doesn't support keeping command buffer contents, OR if there was */ /* doesn't support keeping command buffer contents, OR if there was */
/* some sort of error. */ /* some sort of error. */
if (!use_persistent_buffer) if (use_persistent_buffer)
clear_cwd_pipe ();
else
{ {
/* We don't need to call feed_subshell here if we are using fish, because of a /* We don't need to call feed_subshell here if we are using fish, because of a
* quirk in the behavior of that particular shell. */ * quirk in the behavior of that particular shell. */