From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tyan0@sourceware.org>
Received: by sourceware.org (Postfix, from userid 7868)
 id 2FA38385841C; Sun, 12 Dec 2021 13:09:33 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2FA38385841C
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Takashi Yano <tyan0@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin/cygwin-3_3-branch] Cygwin: pty: Fix Ctrl-C handling
 for non-cygwin apps in background.
X-Act-Checkin: newlib-cygwin
X-Git-Author: Takashi Yano <takashi.yano@nifty.ne.jp>
X-Git-Refname: refs/heads/cygwin-3_3-branch
X-Git-Oldrev: c54b890bc70f0e506569ac5a438dedb610cffaa8
X-Git-Newrev: ab8608f88f5484e18757cd1ce78c7394b7d0a3c8
Message-Id: <20211212130933.2FA38385841C@sourceware.org>
Date: Sun, 12 Dec 2021 13:09:33 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <https://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Sun, 12 Dec 2021 13:09:33 -0000

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=ab8608f88f5484e18757cd1ce78c7394b7d0a3c8

commit ab8608f88f5484e18757cd1ce78c7394b7d0a3c8
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Sun Dec 12 21:20:47 2021 +0900

    Cygwin: pty: Fix Ctrl-C handling for non-cygwin apps in background.
    
    - With pseudo console enabled, if the non-cygwin app is started in
      the background and put it into the foreground, the process cannot
      be stopped by Ctrl-C. This patch fixes the issue.

Diff:
---
 winsup/cygwin/fhandler_tty.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 4f135839d..37e27f34a 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -2249,9 +2249,12 @@ fhandler_pty_master::write (const void *ptr, size_t len)
 			  &mbp);
 	}
 
-      if ((ti.c_lflag & ISIG) && !(ti.c_lflag & NOFLSH)
-	  && memchr (buf, '\003', nlen))
-	get_ttyp ()->discard_input = true;
+      if ((ti.c_lflag & ISIG) && memchr (buf, '\003', nlen))
+	{
+	  get_ttyp ()->kill_pgrp (SIGINT);
+	  if (!(ti.c_lflag & NOFLSH))
+	    get_ttyp ()->discard_input = true;
+	}
       DWORD n;
       WriteFile (to_slave_nat, buf, nlen, &n, NULL);
       ReleaseMutex (input_mutex);