diff options
author | Christopher Faylor <me@cgf.cx> | 2001-08-07 00:01:42 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2001-08-07 00:01:42 +0000 |
commit | 96a3f4ae6884bbf0c2e96d8ab332c3fad85613bf (patch) | |
tree | 68d8717111e5f046c192a1dd0f0dbd2481367f20 /winsup/cygwin/pipe.cc | |
parent | 386abb05d958a410c90cd4b7ea25187c7f6f1fbc (diff) | |
download | cygnal-96a3f4ae6884bbf0c2e96d8ab332c3fad85613bf.tar.gz cygnal-96a3f4ae6884bbf0c2e96d8ab332c3fad85613bf.tar.bz2 cygnal-96a3f4ae6884bbf0c2e96d8ab332c3fad85613bf.zip |
* cygheap.cc (cygheap_root::set): Avoid treating '/' specially.
* fhandler.cc (fhandler_base::fcntl): Only set specific O_NDELAY style flag
passed in from application.
* fhandler_socket.cc (fhandler_socket::fcntl): Ditto.
* fhandler.h: Set constant for future use.
* winsup.h: Define OLD_O_NDELAY only for old programs.
* include/cygwin/version.h: Define CYGWIN_VERSION_CHECK_FOR_OLD_O_NONBLOCK.
Diffstat (limited to 'winsup/cygwin/pipe.cc')
-rw-r--r-- | winsup/cygwin/pipe.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/winsup/cygwin/pipe.cc b/winsup/cygwin/pipe.cc index e111ba1a8..4f0bd54d4 100644 --- a/winsup/cygwin/pipe.cc +++ b/winsup/cygwin/pipe.cc @@ -1,6 +1,6 @@ /* pipe.cc: pipe for Cygwin. - Copyright 1996, 1998, 1999, 2000 Cygnus Solutions. + Copyright 1996, 1998, 1999, 2000, 2001 Cygnus Solutions. This file is part of Cygwin. @@ -22,7 +22,7 @@ details. */ static int make_pipe (int fildes[2], unsigned int psize, int mode) { - SetResourceLock(LOCK_FD_LIST,WRITE_LOCK|READ_LOCK," make_pipe"); + SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "make_pipe"); HANDLE r, w; int fdr = -1, fdw = -1; @@ -37,8 +37,8 @@ make_pipe (int fildes[2], unsigned int psize, int mode) __seterrno (); else { - fhandler_base *fhr = cygheap->fdtab.build_fhandler (fdr, FH_PIPER, "/dev/piper"); - fhandler_base *fhw = cygheap->fdtab.build_fhandler (fdw, FH_PIPEW, "/dev/pipew"); + fhandler_pipe *fhr = (fhandler_pipe *) cygheap->fdtab.build_fhandler (fdr, FH_PIPER, "/dev/piper"); + fhandler_pipe *fhw = (fhandler_pipe *) cygheap->fdtab.build_fhandler (fdw, FH_PIPEW, "/dev/pipew"); int binmode = mode & O_TEXT ? 0 : 1; fhr->init (r, GENERIC_READ, binmode); @@ -56,7 +56,7 @@ make_pipe (int fildes[2], unsigned int psize, int mode) } syscall_printf ("%d = make_pipe ([%d, %d], %d, %p)", res, fdr, fdw, psize, mode); - ReleaseResourceLock(LOCK_FD_LIST,WRITE_LOCK|READ_LOCK," make_pipe"); + ReleaseResourceLock(LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "make_pipe"); return res; } @@ -81,11 +81,11 @@ int dup (int fd) { int res; - SetResourceLock(LOCK_FD_LIST,WRITE_LOCK|READ_LOCK," dup"); + SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "dup"); res = dup2 (fd, cygheap->fdtab.find_unused_handle ()); - ReleaseResourceLock(LOCK_FD_LIST,WRITE_LOCK|READ_LOCK," dup"); + ReleaseResourceLock(LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "dup"); return res; } |