summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/poll.cc
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2001-04-18 21:10:15 +0000
committerChristopher Faylor <me@cgf.cx>2001-04-18 21:10:15 +0000
commit0381fec68f46471d29d3b87c5361e05fcdeb2cd5 (patch)
tree718cfaf2d3d8734c48f8957892329c0e8fc2fbfc /winsup/cygwin/poll.cc
parenta2d47fe9d983ec85075172211172af9e5ab4054f (diff)
downloadcygnal-0381fec68f46471d29d3b87c5361e05fcdeb2cd5.tar.gz
cygnal-0381fec68f46471d29d3b87c5361e05fcdeb2cd5.tar.bz2
cygnal-0381fec68f46471d29d3b87c5361e05fcdeb2cd5.zip
Throughout, change fdtab references to cygheap->fdtab.
* child_info.h (cygheap_exec_info): Eliminate special fdtab stuff. * spawn.cc (spawn_guts): Ditto. * cygheap.cc (cygheap_init): Initialize fdtab, if appropriate. * cygheap.h (CYGHEAPSIZE): Include size of init_cygheap. (_cmalloc_entry): Include fdtab here. * dtable.h (dtable): Declare/define new methods. * dtable.cc (dtable::vfork_child_fixup): New method. (dtable::fixup_after_exec): Remove unneeded extra arguments. * dcrt0.cc (dll_crt0_1): Ditto. * environ.cc (getwinenv): Use case sensitive comparison. (winenv): Make a copy of environment cache to avoid realloc problems when duplicate environment variables exist in the environment. (From Egor Duda) * net.cc (cygwin_socket): Revert Apr 14 change. * include/sys/file.h: Protect against previous X_OK definition. * passwd.cc: Eliminate passwd_sem throughout. * security.cc: Ditto. * cygwin.din: Export New functions. * passwd.cc (read_etc_passwd): Make race safe. (getpwuid_r): New function. (getpwnam_r): New function.
Diffstat (limited to 'winsup/cygwin/poll.cc')
-rw-r--r--winsup/cygwin/poll.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/poll.cc b/winsup/cygwin/poll.cc
index f3c9ef6d7..4a216ad63 100644
--- a/winsup/cygwin/poll.cc
+++ b/winsup/cygwin/poll.cc
@@ -14,6 +14,7 @@
#include <errno.h>
#include "fhandler.h"
#include "dtable.h"
+#include "cygheap.h"
#include "cygerrno.h"
#include "sigproc.h"
@@ -49,7 +50,7 @@ poll (struct pollfd *fds, unsigned int nfds, int timeout)
memset (except_fds, 0, fds_size);
for (unsigned int i = 0; i < nfds; ++i)
- if (!fdtab.not_open (fds[i].fd))
+ if (!cygheap->fdtab.not_open (fds[i].fd))
{
FD_SET (fds[i].fd, open_fds);
if (fds[i].events & POLLIN)
@@ -67,7 +68,7 @@ poll (struct pollfd *fds, unsigned int nfds, int timeout)
{
if (!FD_ISSET (fds[i].fd, open_fds))
fds[i].revents = POLLNVAL;
- else if (fdtab.not_open(fds[i].fd))
+ else if (cygheap->fdtab.not_open(fds[i].fd))
fds[i].revents = POLLHUP;
else if (ret < 0)
fds[i].revents = POLLERR;