From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 36793385701F; Tue, 23 Mar 2021 12:19:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 36793385701F 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: Rename input/output named pipes. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano via Cygwin-patches X-Git-Refname: refs/heads/master X-Git-Oldrev: d10d0d9b03f858b10fa4b9a5dd0dd0c5364ca439 X-Git-Newrev: ef05e8bdae87b9a72a709a7a7054543aab45992a Message-Id: <20210323121901.36793385701F@sourceware.org> Date: Tue, 23 Mar 2021 12:19:01 +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: Tue, 23 Mar 2021 12:19:01 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=ef05e8bdae87b9a72a709a7a7054543aab45992a commit ef05e8bdae87b9a72a709a7a7054543aab45992a Author: Takashi Yano via Cygwin-patches Date: Tue Mar 23 20:50:28 2021 +0900 Cygwin: pty: Rename input/output named pipes. - Currently, names of output pipes are "pty%d-to-master" and "pty%d- to-master-cyg" and names of input pipes are "pty%d-to-slave" and "pty%d-from-master". With this patch, these pipes are renamed to "pty%d-to-master-nat", "pty%d-to-master", "pty%d-from-master-nat" and "pty%d-from-master" respectively. Diff: --- winsup/cygwin/fhandler_tty.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 643a357ad..d755f7d87 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -2768,26 +2768,26 @@ fhandler_pty_master::setup () termios_printf ("can't set output_handle(%p) to non-blocking mode", get_output_handle ()); - char pipename[sizeof ("ptyNNNN-to-master-cyg")]; - __small_sprintf (pipename, "pty%d-to-master", unit); + char pipename[sizeof ("ptyNNNN-from-master-nat")]; + __small_sprintf (pipename, "pty%d-to-master-nat", unit); res = fhandler_pipe::create (&sec_none, &from_slave, &to_master, fhandler_pty_common::pipesize, pipename, 0); if (res) { - errstr = "output pipe"; + errstr = "output pipe for non-cygwin apps"; goto err; } - __small_sprintf (pipename, "pty%d-to-master-cyg", unit); + __small_sprintf (pipename, "pty%d-to-master", unit); res = fhandler_pipe::create (&sec_none, &get_handle (), &to_master_cyg, fhandler_pty_common::pipesize, pipename, 0); if (res) { - errstr = "output pipe for cygwin"; + errstr = "output pipe"; goto err; } - __small_sprintf (pipename, "pty%d-to-slave", unit); + __small_sprintf (pipename, "pty%d-from-master-nat", unit); /* FILE_FLAG_OVERLAPPED is specified here in order to prevent PeekNamedPipe() from blocking in transfer_input(). Accordig to the official document, in order to access the handle