Ticket #4372: fish_resize_bug.patch

src/subshell/common.c

@@ -1261 +1261 @@
     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)
+    {
+
+        if (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 ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
@@ -1468 +1504 @@
                 feed_subshell (QUIETLY, FALSE);
             }
         }
+        else
+            clear_cwd_pipe ();
+
 
         if (how == QUIETLY)
             write_all (mc_global.tty.subshell_pty, " ", 1);