+2001-10-30 Christopher Faylor <cgf@redhat.com>
+
+ * dtable.cc (dtable::dup2): Add some debugging. Use methods from
+ passed in class rather than cygheap->fdtab.
+ * fhandler_socket.cc (fhandler_socket::fixup_before_fork_exec): Add
+ more debugging output.
+ (fhandler_socket::dup): Allocate new space for prot_info_ptr for
+ duplicated entry.
+ * syscalls.cc (stat_worker): Always delete fh if it has been created.
+
2001-10-29 Corinna Vinschen <corinna@vinschen.de>
* security.cc (is_group_member): Call NetLocalGroupGetMembers() for
goto done;
}
+ debug_printf ("newfh->io_handle %p, oldfh->io_handle %p", newfh->get_io_handle (), fds[oldfd]->get_io_handle ());
SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "dup");
if (newfd < 0)
goto done;
}
- if ((size_t) newfd >= cygheap->fdtab.size)
+ if ((size_t) newfd >= size)
{
int inc_size = NOFILE_INCR * ((newfd + NOFILE_INCR - 1) / NOFILE_INCR) -
- cygheap->fdtab.size;
- cygheap->fdtab.extend (inc_size);
+ size;
+ extend (inc_size);
}
if (!not_open (newfd))
debug_printf ("Without Winsock 2.0");
}
else if (!WSADuplicateSocketA (get_socket (), win_proc_id, prot_info_ptr))
- debug_printf ("WSADuplicateSocket went fine, dwServiceFlags1=%d",
- prot_info_ptr->dwServiceFlags1);
+ debug_printf ("WSADuplicateSocket went fine, sock %p, win_proc_id %d, prot_info_ptr %p",
+ get_socket (), win_proc_id, prot_info_ptr);
else
{
- debug_printf ("WSADuplicateSocket error");
+ debug_printf ("WSADuplicateSocket error, sock %p, win_proc_id %d, prot_info_ptr %p",
+ get_socket (), win_proc_id, prot_info_ptr);
set_winsock_errno ();
}
}
}
else
{
- debug_printf ("WSASocket went fine %p", new_sock);
+ debug_printf ("WSASocket went fine new_sock %p, old_sock %p", new_sock, get_io_handle ());
set_io_handle ((HANDLE) new_sock);
}
fhandler_socket *fhs = (fhandler_socket *) child;
fhs->addr_family = addr_family;
fhs->set_io_handle (get_io_handle ());
+
+ fhs->prot_info_ptr = (LPWSAPROTOCOL_INFOA)
+ cmalloc (HEAP_BUF, sizeof (WSAPROTOCOL_INFOA));
fhs->fixup_before_fork_exec (GetCurrentProcessId ());
if (winsock2_active)
{
setsockopt (get_socket (), SOL_SOCKET, SO_LINGER,
(const char *)&linger, sizeof linger);
- if (closesocket (get_socket ()))
- {
- set_winsock_errno ();
- res = -1;
- }
+ while (closesocket (get_socket ())
+ && WSAGetLastError () == WSAEWOULDBLOCK)
+ continue;
close_secret_event ();