diff options
author | Christopher Faylor <me@cgf.cx> | 2001-09-24 21:50:44 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2001-09-24 21:50:44 +0000 |
commit | 35f879a6d0b6c24045570cf882d1474e1ab0de00 (patch) | |
tree | 958334eb496e1b3d8f1311d572d78092717787b7 /winsup/cygwin/syscalls.cc | |
parent | 4367ec036fabc17ed167b798449537d2a05dda71 (diff) | |
download | cygnal-35f879a6d0b6c24045570cf882d1474e1ab0de00.tar.gz cygnal-35f879a6d0b6c24045570cf882d1474e1ab0de00.tar.bz2 cygnal-35f879a6d0b6c24045570cf882d1474e1ab0de00.zip |
* fhandler.h (fhandler_pipe::hit_eof): New method.
(writepipe_exists): New class element.
(orig_pid): Ditto.
(id): Ditto.
(is_slow): Eliminate.
* pipe.cc (fhandler_pipe::set_close_on_exec): Set inheritance on
writepipe_exists, if it exists.
(fhandler_pipe::hit_eof): New method, modelled after tty.
(fhandler_pipe::dup): Duplicate writepipe_exists, if it exists.
(make_pipe): Set up a dummy event for pipes on windows 9x. The nonexistence
of this event means that the write side of the pipe has closed.
(_dup): Move to syscalls.cc
(_dup2): Ditto.
* dtable.cc (dtable::build_fhandler): Fill out set_names here, if appropriate.
* syscalls.cc (_open): Call set_names in build_fhandler.
Diffstat (limited to 'winsup/cygwin/syscalls.cc')
-rw-r--r-- | winsup/cygwin/syscalls.cc | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 559582bfd..9f5c8ac88 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -81,6 +81,25 @@ check_ttys_fds (void) return res; } +int +dup (int fd) +{ + int res; + 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"); + + return res; +} + +int +dup2 (int oldfd, int newfd) +{ + return cygheap->fdtab.dup2 (oldfd, newfd); +} + extern "C" int _unlink (const char *ourname) { @@ -489,17 +508,13 @@ _open (const char *unix_path, int flags, ...) path_conv pc; if (!(fh = cygheap->fdtab.build_fhandler (fd, unix_path, NULL, &pc))) res = -1; // errno already set - else + else if (!fh->open (pc, flags, (mode & 07777) & ~cygheap->umask)) { - fh->set_name (unix_path, pc.get_win32 ()); - if (!fh->open (pc, flags, (mode & 07777) & ~cygheap->umask)) - { - cygheap->fdtab.release (fd); - res = -1; - } - else if ((res = fd) <= 2) - set_std_handle (res); + cygheap->fdtab.release (fd); + res = -1; } + else if ((res = fd) <= 2) + set_std_handle (res); } ReleaseResourceLock (LOCK_FD_LIST,WRITE_LOCK|READ_LOCK," open"); } |