[PATCH] Cygwin: pty: Rename input named pipes.

Takashi Yano takashi.yano@nifty.ne.jp
Sun Mar 21 03:59:53 GMT 2021


- Currently, the name of input pipe is "ptyNNNN-from-master" for
  cygwin process, and "ptyNNNN-to-slave" for non-cygwin process.
  These are not only inconsistent with output pipes but also very
  confusing.
  With this patch, these are renamed to "ptyNNNN-from-master-cyg"
  and "ptyNNNN-from-master" respectively.
---
 winsup/cygwin/fhandler_tty.cc | 2 +-
 winsup/cygwin/tty.cc          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 643a357ad..02e94efcc 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -2787,7 +2787,7 @@ fhandler_pty_master::setup ()
       goto err;
     }
 
-  __small_sprintf (pipename, "pty%d-to-slave", unit);
+  __small_sprintf (pipename, "pty%d-from-master", 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
diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc
index 3c016315c..269b87735 100644
--- a/winsup/cygwin/tty.cc
+++ b/winsup/cygwin/tty.cc
@@ -159,8 +159,8 @@ tty::not_allocated (HANDLE& r, HANDLE& w)
 {
   /* Attempt to open the from-master side of the tty.  If it is accessible
      then it exists although we may not have privileges to actually use it. */
-  char pipename[sizeof("ptyNNNN-from-master")];
-  __small_sprintf (pipename, "pty%d-from-master", get_minor ());
+  char pipename[sizeof("ptyNNNN-from-master-cyg")];
+  __small_sprintf (pipename, "pty%d-from-master-cyg", get_minor ());
   /* fhandler_pipe::create returns 0 when creation succeeds */
   return fhandler_pipe::create (&sec_none, &r, &w,
 				fhandler_pty_common::pipesize, pipename,
-- 
2.30.1



More information about the Cygwin-patches mailing list