From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 0E4D1386EC42; Sun, 31 May 2020 08:39:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0E4D1386EC42 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pty: Revise the code which prevents undesired window title. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano via Cygwin-patches X-Git-Refname: refs/heads/master X-Git-Oldrev: ac1f63ef2812093ce0e053dd505b44c55c3d47d6 X-Git-Newrev: d212bdc40096fde87b086290ac34b1cc6517b19f Message-Id: <20200531083931.0E4D1386EC42@sourceware.org> Date: Sun, 31 May 2020 08:39:31 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 08:39:31 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=d212bdc40096fde87b086290ac34b1cc6517b19f commit d212bdc40096fde87b086290ac34b1cc6517b19f Author: Takashi Yano via Cygwin-patches Date: Sun May 31 14:53:20 2020 +0900 Cygwin: pty: Revise the code which prevents undesired window title. - In current pty, the window title can not be set from non-cygwin program due to the code which prevents overwriting the window title to "cygwin-console-helper.exe" in fhandler_pty_master::pty_ master_fwd_thread(). This patch fixes the issue. Diff: --- winsup/cygwin/fhandler_tty.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index c3d49968d..e434b7878 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -3313,9 +3313,14 @@ fhandler_pty_master::pty_master_fwd_thread () } else if (state == 4 && outbuf[i] == '\a') { - memmove (&outbuf[start_at], &outbuf[i+1], rlen-i-1); + const char *helper_str = "\\bin\\cygwin-console-helper.exe"; + if (memmem (&outbuf[start_at], i + 1 - start_at, + helper_str, strlen (helper_str))) + { + memmove (&outbuf[start_at], &outbuf[i+1], rlen-i-1); + rlen = wlen = start_at + rlen - i - 1; + } state = 0; - rlen = wlen = start_at + rlen - i - 1; continue; } else if (outbuf[i] == '\a')