From 56c387b1b32a36204de6071cc4d192561bb359ed Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 15 Aug 2011 16:05:13 +0000 Subject: * pipe.cc (pipe): Just call _pipe with O_BINARY mode. Move code to generate normalized pathnames from here... (_pipe): ...to here. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/pipe.cc | 24 +++++------------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 67b8441e5..2c97801f9 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2011-08-15 Corinna Vinschen + + * pipe.cc (pipe): Just call _pipe with O_BINARY mode. Move code to + generate normalized pathnames from here... + (_pipe): ...to here. + 2011-08-13 Corinna Vinschen * miscfuncs.cc (CreatePipeOverlapped): New function. diff --git a/winsup/cygwin/pipe.cc b/winsup/cygwin/pipe.cc index 87f79bda2..1dd2c3251 100644 --- a/winsup/cygwin/pipe.cc +++ b/winsup/cygwin/pipe.cc @@ -364,11 +364,11 @@ fhandler_pipe::fstatvfs (struct statvfs *sfs) } extern "C" int -pipe (int filedes[2]) +_pipe (int filedes[2], unsigned int psize, int mode) { fhandler_pipe *fhs[2]; - int res = fhandler_pipe::create (fhs, DEFAULT_PIPEBUFSIZE, O_BINARY); - if (res == 0) + int res = fhandler_pipe::create (fhs, psize, mode); + if (!res) { cygheap_fdnew fdin; cygheap_fdnew fdout (fdin, false); @@ -383,27 +383,13 @@ pipe (int filedes[2]) filedes[1] = fdout; debug_printf ("%d, %d", (int) fdin, (int) fdout); } - return res; } extern "C" int -_pipe (int filedes[2], unsigned int psize, int mode) +pipe (int filedes[2]) { - fhandler_pipe *fhs[2]; - int res = fhandler_pipe::create (fhs, psize, mode); - /* This type of pipe is not interruptible so set the appropriate flag. */ - if (!res) - { - cygheap_fdnew fdin; - cygheap_fdnew fdout (fdin, false); - fdin = fhs[0]; - fdout = fhs[1]; - filedes[0] = fdin; - filedes[1] = fdout; - } - - return res; + return _pipe (filedes, DEFAULT_PIPEBUFSIZE, O_BINARY); } extern "C" int -- cgit v1.2.3