summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Yano via Cygwin-patches <cygwin-patches@cygwin.com>2021-03-23 20:50:28 +0900
committerCorinna Vinschen <corinna@vinschen.de>2021-03-23 13:18:19 +0100
commitef05e8bdae87b9a72a709a7a7054543aab45992a (patch)
treec375698251d9227b01e324724e5fb0779a217f1c
parentd10d0d9b03f858b10fa4b9a5dd0dd0c5364ca439 (diff)
downloadcygnal-ef05e8bdae87b9a72a709a7a7054543aab45992a.tar.gz
cygnal-ef05e8bdae87b9a72a709a7a7054543aab45992a.tar.bz2
cygnal-ef05e8bdae87b9a72a709a7a7054543aab45992a.zip
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.
-rw-r--r--winsup/cygwin/fhandler_tty.cc12
1 files 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