* autoload.cc (LoadFuncEx): Define via new LoadFuncEx2 macro.
(LoadFuncEx2): Adapted from LoadFuncEx. Provides control of return value for nonexistent function. (NtQueryObject): Declare. (IsDebuggerPresent): Declare via LoadFuncEx2 and always return true if not available. * debug.h (being_debugged): Just rely on IsDebuggerPresent return value. * dtable.cc (handle_to_fn): New function. (dtable::init_std_file_from_handle): Attempt to derive std handle's name via handle_to_fn. (dtable::build_fhandler_from_name): Fill in what we can in path_conv structure when given a handle and path doesn't exist. * fhandler.cc (fhandler_base::open): Don't set the file pointer here. Use pc->exists () to determine if file exists rather than calling GetFileAttributes again. * fhandler.h (fhandler_base::exec_state_isknown): New method. (fhandler_base::fstat_helper): Add extra arguments to declaration. (fhandler_base::fstat_by_handle): Declare new method. (fhandler_base::fstat_by_name): Declare new method. * fhandler_disk_file (num_entries): Make __stdcall. (fhandler_base::fstat_by_handle): Define new method. (fhandler_base::fstat_by_name): Define new method. (fhandler_base:fstat): Call fstat_by_{handle,name} as appropriate. (fhandler_disk_file::fstat_helper): Accept extra arguments for filling out stat structure. Move handle or name specific stuff to new methods above. (fhandler_disk_file::open): Use real_path->exists rather than calling GetFileAttributes again. * ntdll.h (FILE_NAME_INFORMATION): Define new structure. (OBJECT_INFORMATION_CLASS): Partially define new enum. (OBJECT_NAME_INFORMATION): Define new structure. (NtQueryInformationFile): New declaration. (NtQueryObject): New declaration. * path.cc (path_conv::fillin): Define new method. * path.h (path_conv::fillin): Declare new method. (path_conv::drive_thpe): Rename from 'get_drive_type'. (path_conv::volser): Declare new method. (path_conv::volname): Declare new method. (path_conv::root_dir): Declare new method. * syscalls.cc (fstat64): Send real path_conv to fstat as second argument.
This commit is contained in:
@@ -50,51 +50,51 @@ poll (struct pollfd *fds, unsigned int nfds, int timeout)
|
||||
memset (write_fds, 0, fds_size);
|
||||
memset (except_fds, 0, fds_size);
|
||||
|
||||
int invalid_fds = 0;
|
||||
for (unsigned int i = 0; i < nfds; ++i)
|
||||
{
|
||||
fds[i].revents = 0;
|
||||
if (!cygheap->fdtab.not_open(fds[i].fd))
|
||||
{
|
||||
if (fds[i].events & POLLIN)
|
||||
FD_SET(fds[i].fd, read_fds);
|
||||
if (fds[i].events & POLLOUT)
|
||||
FD_SET(fds[i].fd, write_fds);
|
||||
if (fds[i].events & POLLPRI)
|
||||
FD_SET(fds[i].fd, except_fds);
|
||||
}
|
||||
else if (fds[i].fd >= 0)
|
||||
{
|
||||
++invalid_fds;
|
||||
fds[i].revents = POLLNVAL;
|
||||
}
|
||||
}
|
||||
int invalid_fds = 0;
|
||||
for (unsigned int i = 0; i < nfds; ++i)
|
||||
{
|
||||
fds[i].revents = 0;
|
||||
if (!cygheap->fdtab.not_open(fds[i].fd))
|
||||
{
|
||||
if (fds[i].events & POLLIN)
|
||||
FD_SET(fds[i].fd, read_fds);
|
||||
if (fds[i].events & POLLOUT)
|
||||
FD_SET(fds[i].fd, write_fds);
|
||||
if (fds[i].events & POLLPRI)
|
||||
FD_SET(fds[i].fd, except_fds);
|
||||
}
|
||||
else if (fds[i].fd >= 0)
|
||||
{
|
||||
++invalid_fds;
|
||||
fds[i].revents = POLLNVAL;
|
||||
}
|
||||
}
|
||||
|
||||
if (invalid_fds)
|
||||
return invalid_fds;
|
||||
if (invalid_fds)
|
||||
return invalid_fds;
|
||||
|
||||
int ret = cygwin_select (max_fd + 1, read_fds, write_fds, except_fds, timeout < 0 ? NULL : &tv);
|
||||
int ret = cygwin_select (max_fd + 1, read_fds, write_fds, except_fds, timeout < 0 ? NULL : &tv);
|
||||
|
||||
if (ret > 0)
|
||||
for (unsigned int i = 0; i < nfds; ++i)
|
||||
{
|
||||
if (fds[i].fd >= 0)
|
||||
{
|
||||
if (cygheap->fdtab.not_open(fds[i].fd))
|
||||
fds[i].revents = POLLHUP;
|
||||
else
|
||||
{
|
||||
if (FD_ISSET(fds[i].fd, read_fds))
|
||||
fds[i].revents |= POLLIN;
|
||||
if (FD_ISSET(fds[i].fd, write_fds))
|
||||
fds[i].revents |= POLLOUT;
|
||||
if (FD_ISSET(fds[i].fd, read_fds) && FD_ISSET(fds[i].fd, write_fds))
|
||||
fds[i].revents |= POLLERR;
|
||||
if (FD_ISSET(fds[i].fd, except_fds))
|
||||
fds[i].revents |= POLLPRI;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ret > 0)
|
||||
for (unsigned int i = 0; i < nfds; ++i)
|
||||
{
|
||||
if (fds[i].fd >= 0)
|
||||
{
|
||||
if (cygheap->fdtab.not_open(fds[i].fd))
|
||||
fds[i].revents = POLLHUP;
|
||||
else
|
||||
{
|
||||
if (FD_ISSET(fds[i].fd, read_fds))
|
||||
fds[i].revents |= POLLIN;
|
||||
if (FD_ISSET(fds[i].fd, write_fds))
|
||||
fds[i].revents |= POLLOUT;
|
||||
if (FD_ISSET(fds[i].fd, read_fds) && FD_ISSET(fds[i].fd, write_fds))
|
||||
fds[i].revents |= POLLERR;
|
||||
if (FD_ISSET(fds[i].fd, except_fds))
|
||||
fds[i].revents |= POLLPRI;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user