From a8dead44763a156e02937eb7f7e4788795ed735d Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 6 Dec 2004 19:20:24 +0000 Subject: [PATCH] * pinfo.h (proc_pipe::*): Delete class. * pinfo.cc (proc_pipe::*): Ditto. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/pinfo.cc | 34 ---------------------------------- winsup/cygwin/pinfo.h | 14 -------------- 3 files changed, 5 insertions(+), 48 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 51a4675f0..760a3b5af 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2004-12-06 Christopher Faylor + + * pinfo.h (proc_pipe::*): Delete class. + * pinfo.cc (proc_pipe::*): Ditto. + 2004-12-05 Christopher Faylor * fork.cc (fork_parent): Reinstate "childhProc" protection. Don't diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc index eac27e9dd..a26336c98 100644 --- a/winsup/cygwin/pinfo.cc +++ b/winsup/cygwin/pinfo.cc @@ -767,40 +767,6 @@ proc_waiter (void *arg) return 0; } -void -proc_pipe::set (bool closeem) -{ - myself.lock (); - if (!CreatePipe (&in, &out, &sec_none_nih, 16)) - { - system_printf ("couldn't create pipe, %E"); - return; - } - /* Duplicate the write end of the pipe into the subprocess. Make it inheritable - so that all of the execed children get it. */ - if (!DuplicateHandle (hMainProc, out, hMainProc, &out, 0, TRUE, - DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE)) - { - CloseHandle (in); - in = out = NULL; - system_printf ("couldn't make handle %p noninheritable, %E", out); - return; - } - _closeem = closeem; -} - -proc_pipe::~proc_pipe () -{ - if (_closeem) - { - if (in) - CloseHandle (in); - if (out) - CloseHandle (out); - } - myself.unlock (); -} - /* function to set up the process pipe and kick off proc_waiter */ int pinfo::wait () diff --git a/winsup/cygwin/pinfo.h b/winsup/cygwin/pinfo.h index 76f5f7795..d4034e154 100644 --- a/winsup/cygwin/pinfo.h +++ b/winsup/cygwin/pinfo.h @@ -179,20 +179,6 @@ public: void set_acl(); }; -class proc_pipe -{ - bool _closeem; -public: - HANDLE in; - HANDLE out; - void set (bool); - proc_pipe (bool closeem) {set (closeem);} - proc_pipe () : _closeem (false), in (NULL), out (NULL) {}; - void close () {_closeem = true;} - ~proc_pipe (); - int operator == (int x) {return (int) in == x;} -}; - #define ISSTATE(p, f) (!!((p)->process_state & f)) #define NOTSTATE(p, f) (!((p)->process_state & f))