Rebase to Cygwin runtime v3.6.9

winsup/cygwin/exceptions.cc

@@ -1203,8 +1203,8 @@ ctrl_c_handler (DWORD type)
   if (!pinfo (cygwin_pid (GetCurrentProcessId ())))
     return TRUE;
 
-  if (type == CTRL_C_EVENT && ::cygheap->ctty
-      && !cygheap->ctty->need_console_handler ())
+  if (type == CTRL_C_EVENT && !myself->is_cygwin_inferior_being_debugged ()
+      && ::cygheap->ctty && !cygheap->ctty->need_console_handler ())
     /* Ctrl-C is handled in fhandler_console::cons_master_thread(). */
     return TRUE;
 
@@ -1500,6 +1500,23 @@ _cygtls::handle_SIGCONT ()
   InterlockedAnd ((LONG *) &myself->process_state, ~PID_STOPPED);
 }
 
+inline static bool
+is_stop_or_cont (int sig)
+{
+  switch (sig)
+    {
+    case SIGSTOP:
+    case SIGTSTP:
+    case SIGTTIN:
+    case SIGTTOU:
+    case SIGCONT:
+      return true;
+    default:
+      break;
+    }
+  return false;
+}
+
 int
 sigpacket::process ()
 {
@@ -1653,7 +1670,7 @@ sigpacket::process ()
   thissig.sa_flags &= ~SA_ONSTACK;
 
 dosig:
-  if (have_execed)
+  if (have_execed && (ch_spawn.iscygwin () || !is_stop_or_cont (si.si_signo)))
     {
       switch (si.si_signo)
         {

winsup/cygwin/fhandler/pty.cc

@@ -219,6 +219,7 @@ atexit_func (void)
 	    break;
 	  }
       CloseHandle (h_gdb_inferior);
+      myself->wpid_debuggee_maybe = 0;
     }
 }
 
@@ -255,6 +256,7 @@ CreateProcessA_Hooked
   DuplicateHandle (GetCurrentProcess (), h_gdb_inferior,
 		   GetCurrentProcess (), &h_gdb_inferior,
 		   0, 0, DUPLICATE_SAME_ACCESS);
+  myself->wpid_debuggee_maybe = pi->dwProcessId;
   debug_process = !!(f & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS));
   if (debug_process)
     mutex_timeout = 0; /* to avoid deadlock in GDB */
@@ -294,6 +296,7 @@ CreateProcessW_Hooked
   DuplicateHandle (GetCurrentProcess (), h_gdb_inferior,
 		   GetCurrentProcess (), &h_gdb_inferior,
 		   0, 0, DUPLICATE_SAME_ACCESS);
+  myself->wpid_debuggee_maybe = pi->dwProcessId;
   debug_process = !!(f & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS));
   if (debug_process)
     mutex_timeout = 0; /* to avoid deadlock in GDB */
@@ -1075,9 +1078,6 @@ fhandler_pty_slave::set_switch_to_nat_pipe (void)
     {
       isHybrid = true;
       setup_locale ();
-      myself->exec_dwProcessId = myself->dwProcessId; /* Set this as a marker
-							 for tty::nat_fg()
-							 and process_sigs() */
       bool stdin_is_ptys = GetStdHandle (STD_INPUT_HANDLE) == get_handle ();
       setup_for_non_cygwin_app (false, NULL, stdin_is_ptys);
     }
@@ -1109,6 +1109,7 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
 	{
 	  CloseHandle (h_gdb_inferior);
 	  h_gdb_inferior = NULL;
+	  myself->wpid_debuggee_maybe = 0;
 	  mutex_timeout = INFINITE;
 	  if (isHybrid)
 	    {
@@ -1137,23 +1138,24 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
 	      else
 		hand_over_only (get_ttyp ());
 	      ReleaseMutex (pipe_sw_mutex);
+
+	      HANDLE input_handle_nat, output_handle_nat;
 	      if (need_restore_handles)
 		{
 		  pinfo p (get_ttyp ()->master_pid);
 		  HANDLE pty_owner =
 		    OpenProcess (PROCESS_DUP_HANDLE, FALSE, p->dwProcessId);
 		  if (pty_owner)
 		    {
-		      CloseHandle (get_handle_nat ());
 		      DuplicateHandle (pty_owner,
 				       get_ttyp ()->from_master_nat (),
-				       GetCurrentProcess (), &get_handle_nat (),
+				       GetCurrentProcess (),
+				       &input_handle_nat,
 				       0, TRUE, DUPLICATE_SAME_ACCESS);
-		      CloseHandle (get_output_handle_nat ());
 		      DuplicateHandle (pty_owner,
 				       get_ttyp ()->to_master_nat (),
 				       GetCurrentProcess (),
-				       &get_output_handle_nat (),
+				       &output_handle_nat,
 				       0, TRUE, DUPLICATE_SAME_ACCESS);
 		      CloseHandle (pty_owner);
 		    }
@@ -1177,11 +1179,12 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
 		      CloseHandle (repl.to_master); /* not used. */
 		      CloseHandle (repl.to_slave_nat); /* not used. */
 		      CloseHandle (repl.to_slave); /* not used. */
-		      CloseHandle (get_handle_nat ());
-		      set_handle_nat (repl.from_master_nat);
-		      CloseHandle (get_output_handle_nat ());
-		      set_output_handle_nat (repl.to_master_nat);
+		      input_handle_nat = repl.from_master_nat;
+		      output_handle_nat = repl.to_master_nat;
 		    }
+
+		  /* Restore nat handles in all pty slave instances */
+		  replace_nat_handles (input_handle_nat, output_handle_nat);
 		}
 	      myself->exec_dwProcessId = 0;
 	      isHybrid = false;
@@ -2183,6 +2186,8 @@ fhandler_pty_master::close (int flag)
 ssize_t
 fhandler_pty_master::write (const void *ptr, size_t len)
 {
+  size_t orig_len = len;
+
   ssize_t ret;
   char *p = (char *) ptr;
   termios &ti = tc ()->ti;
@@ -2193,6 +2198,8 @@ fhandler_pty_master::write (const void *ptr, size_t len)
 
   push_process_state process_state (PID_TTYOU);
 
+  get_ttyp ()->discard_input = false;
+
   if (get_ttyp ()->pcon_start)
     { /* Reaches here when pseudo console initialization is on going. */
       /* Pseudo condole support uses "CSI6n" to get cursor position.
@@ -2203,19 +2210,22 @@ fhandler_pty_master::write (const void *ptr, size_t len)
       static char wpbuf[wpbuf_len];
       static int ixput = 0;
       static int state = 0;
+      static DWORD wp_tid = 0;
 
       DWORD n;
       WaitForSingleObject (input_mutex, mutex_timeout);
-      for (size_t i = 0; i < len; i++)
+      len = 0;
+      for (size_t i = 0; i < orig_len; i++)
 	{
 	  if (p[i] == '\033')
 	    {
 	      if (ixput)
 		line_edit (wpbuf, ixput, ti, &ret);
 	      ixput = 0;
 	      state = 1;
+	      wp_tid = _my_tls.thread_id;
 	    }
-	  if (state == 1)
+	  if (state == 1 && wp_tid == _my_tls.thread_id)
 	    {
 	      if (ixput < wpbuf_len)
 		wpbuf[ixput++] = p[i];
@@ -2229,27 +2239,32 @@ fhandler_pty_master::write (const void *ptr, size_t len)
 	    }
 	  else
 	    line_edit (p + i, 1, ti, &ret);
-	  if (state == 1 && p[i] == 'R')
+	  len = orig_len - i - 1;
+	  ptr = p + i + 1;
+	  if (state == 1 && wp_tid == _my_tls.thread_id && p[i] == 'R')
 	    state = 2;
-	}
-      if (state == 2)
-	{
-	  /* req_xfer_input is true if "ESC[6n" was sent just for
-	     triggering transfer_input() in master. In this case,
-	     the responce sequence should not be written. */
-	  if (!get_ttyp ()->req_xfer_input)
-	    WriteFile (to_slave_nat, wpbuf, ixput, &n, NULL);
-	  ixput = 0;
-	  state = 0;
-	  get_ttyp ()->req_xfer_input = false;
-	  get_ttyp ()->pcon_start = false;
+	  if (state == 2)
+	    {
+	      /* req_xfer_input is true if "ESC[6n" was sent just for
+		 triggering transfer_input() in master. In this case,
+		 the response sequence should not be written. */
+	      if (!get_ttyp ()->req_xfer_input)
+		WriteFile (to_slave_nat, wpbuf, ixput, &n, NULL);
+	      ixput = 0;
+	      state = 0;
+	      wp_tid = 0;
+	      get_ttyp ()->req_xfer_input = false;
+	      get_ttyp ()->pcon_start = false;
+	      break;
+	    }
 	}
       ReleaseMutex (input_mutex);
 
       if (!get_ttyp ()->pcon_start)
 	{ /* Pseudo console initialization has been done in above code. */
 	  pinfo pp (get_ttyp ()->pcon_start_pid);
 	  if (get_ttyp ()->switch_to_nat_pipe
+	      && pp && pp->pgid == get_ttyp ()->getpgid ()
 	      && get_ttyp ()->pty_input_state_eq (tty::to_cyg))
 	    {
 	      /* This accept_input() call is needed in order to transfer input
@@ -2267,8 +2282,8 @@ fhandler_pty_master::write (const void *ptr, size_t len)
 	    }
 	  get_ttyp ()->pcon_start_pid = 0;
 	}
-
-      return len;
+      if (len == 0)
+	return orig_len;
     }
 
   /* Write terminal input to to_slave_nat pipe instead of output_handle
@@ -2353,10 +2368,11 @@ fhandler_pty_master::write (const void *ptr, size_t len)
 	}
 
       DWORD n;
-      WriteFile (to_slave_nat, buf, nlen, &n, NULL);
+      if (nlen)
+	WriteFile (to_slave_nat, buf, nlen, &n, NULL);
       ReleaseMutex (input_mutex);
 
-      return len;
+      return orig_len;
     }
 
   /* The code path reaches here when pseudo console is not activated
@@ -2380,8 +2396,8 @@ fhandler_pty_master::write (const void *ptr, size_t len)
   ReleaseMutex (input_mutex);
 
   if (status > line_edit_signalled && status != line_edit_pipe_full)
-    ret = -1;
-  return ret;
+    return -1;
+  return orig_len - len + ret;
 }
 
 void
@@ -2885,6 +2901,39 @@ fhandler_pty_master::pty_master_fwd_thread (const master_fwd_thread_param_t *p)
 	    else
 	      state = 0;
 
+	  /* Remove CSI ? 9001 h/l (win32-input-mode) */
+	  /* Remove CSI ? 1004 h/l (focus report) */
+	  int arg = 0;
+	  state = 0;
+	  for (DWORD i = 0; i < rlen; i++)
+	    if (outbuf[i] == '\033')
+	      {
+		start_at = i;
+		state = 1;
+		continue;
+	      }
+	    else if ((state == 1 && outbuf[i] == '[')
+		     || (state == 2 && outbuf[i] == '?'))
+	      {
+		state ++;
+		continue;
+	      }
+	    else if (state == 3 && isdigit (outbuf[i]))
+	      arg = arg * 10 + (outbuf[i] - '0');
+	    else if (state == 3 && outbuf[i] == ';')
+	      arg = 0;
+	    else if (state == 3 && (arg == 9001 || arg == 1004)
+		     && (outbuf[i] == 'h' || outbuf[i] == 'l'))
+	      {
+		memmove (&outbuf[start_at], &outbuf[i+1], rlen-i-1);
+		rlen = wlen = start_at + rlen - i - 1;
+		state = 0;
+		i = start_at - 1;
+		continue;
+	      }
+	    else
+	      state = 0;
+
 	  /* Remove OSC Ps ; ? BEL/ST */
 	  state = 0;
 	  for (DWORD i = 0; i < rlen; i++)
@@ -3504,7 +3553,7 @@ fhandler_pty_slave::setup_pseudoconsole ()
 				      PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE,
 				      hpcon, sizeof (hpcon), NULL, NULL))
 
-	goto cleanup_heap;
+	goto cleanup_proc_thread_attr;
 
       hello = CreateEvent (&sec_none, true, false, NULL);
       goodbye = CreateEvent (&sec_none, true, false, NULL);
@@ -3595,26 +3644,8 @@ fhandler_pty_slave::setup_pseudoconsole ()
   while (false);
 
 skip_create:
-  do
-    {
-      /* Fixup handles */
-      HANDLE orig_input_handle_nat = get_handle_nat ();
-      HANDLE orig_output_handle_nat = get_output_handle_nat ();
-      cygheap_fdenum cfd (false);
-      while (cfd.next () >= 0)
-	if (cfd->get_device () == get_device ())
-	  {
-	    fhandler_base *fh = cfd;
-	    fhandler_pty_slave *ptys = (fhandler_pty_slave *) fh;
-	    if (ptys->get_handle_nat () == orig_input_handle_nat)
-	      ptys->set_handle_nat (hpConIn);
-	    if (ptys->get_output_handle_nat () == orig_output_handle_nat)
-	      ptys->set_output_handle_nat (hpConOut);
-	  }
-      CloseHandle (orig_input_handle_nat);
-      CloseHandle (orig_output_handle_nat);
-    }
-  while (false);
+  /* Fixup handles in all PTY-slave instances */
+  replace_nat_handles (hpConIn, hpConOut);
 
   if (!process_alive (get_ttyp ()->nat_pipe_owner_pid))
     get_ttyp ()->nat_pipe_owner_pid = myself->exec_dwProcessId;
@@ -3691,6 +3722,8 @@ fhandler_pty_slave::setup_pseudoconsole ()
   CloseHandle (goodbye);
   CloseHandle (hr);
   CloseHandle (hw);
+cleanup_proc_thread_attr:
+  DeleteProcThreadAttributeList (si.lpAttributeList);
 cleanup_heap:
   HeapFree (GetProcessHeap (), 0, si.lpAttributeList);
 cleanup_pseudo_console:
@@ -4453,3 +4486,31 @@ fhandler_pty_common::resume_from_temporarily_attach (DWORD resume_pid)
     }
   release_attach_mutex ();
 }
+
+void
+fhandler_pty_slave::replace_nat_handles (HANDLE new_input, HANDLE new_output)
+{
+  HANDLE orig_input_handle_nat = get_handle_nat();
+  HANDLE orig_output_handle_nat = get_output_handle_nat();
+  cygheap_fdenum cfd (false);
+  while (cfd.next () >= 0)
+    if (cfd->get_device () == get_device ())
+      {
+	fhandler_base *fh = cfd;
+	fhandler_pty_slave *ptys = (fhandler_pty_slave *) fh;
+	if (ptys->get_handle_nat () == orig_input_handle_nat)
+	  ptys->set_handle_nat (new_input);
+	if (ptys->get_output_handle_nat () == orig_output_handle_nat)
+	  ptys->set_output_handle_nat (new_output);
+      }
+  if (cygheap->ctty->get_device () == get_device ())
+    {
+      fhandler_pty_slave *ptys = (fhandler_pty_slave *) cygheap->ctty;
+      if (ptys->get_handle_nat () == orig_input_handle_nat)
+	ptys->set_handle_nat (new_input);
+      if (ptys->get_output_handle_nat () == orig_output_handle_nat)
+	ptys->set_output_handle_nat (new_output);
+    }
+  CloseHandle (orig_input_handle_nat);
+  CloseHandle (orig_output_handle_nat);
+}