JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* dtable.cc (dtable::dup2): Add some debugging. Use methods from passed in

Browse Source 
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.
This commit is contained in:
Christopher Faylor 2001-10-30 07:43:46 +00:00
parent 3d4b75dec2
commit 19ba6f2195
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,13 @@
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> 2001-10-29 Corinna Vinschen <corinna@vinschen.de>
* security.cc (is_group_member): Call NetLocalGroupGetMembers() for * security.cc (is_group_member): Call NetLocalGroupGetMembers() for

7
winsup/cygwin/dtable.cc
View File

@ -383,6 +383,7 @@ dtable::dup2 (int oldfd, int newfd)
goto done; 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"); SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "dup");
if (newfd < 0) if (newfd < 0)
@ -392,11 +393,11 @@ dtable::dup2 (int oldfd, int newfd)
goto done; 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) - int inc_size = NOFILE_INCR * ((newfd + NOFILE_INCR - 1) / NOFILE_INCR) -
cygheap->fdtab.size; size;
cygheap->fdtab.extend (inc_size); extend (inc_size);
} }
if (!not_open (newfd)) if (!not_open (newfd))

20
winsup/cygwin/fhandler_socket.cc
View File

@ -169,11 +169,12 @@ fhandler_socket::fixup_before_fork_exec (DWORD win_proc_id)
debug_printf ("Without Winsock 2.0"); debug_printf ("Without Winsock 2.0");
} }
else if (!WSADuplicateSocketA (get_socket (), win_proc_id, prot_info_ptr)) else if (!WSADuplicateSocketA (get_socket (), win_proc_id, prot_info_ptr))
debug_printf ("WSADuplicateSocket went fine, dwServiceFlags1=%d", debug_printf ("WSADuplicateSocket went fine, sock %p, win_proc_id %d, prot_info_ptr %p",
prot_info_ptr->dwServiceFlags1); get_socket (), win_proc_id, prot_info_ptr);
else 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 (); set_winsock_errno ();
} }
} }
@ -203,7 +204,7 @@ fhandler_socket::fixup_after_fork (HANDLE parent)
} }
else 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); set_io_handle ((HANDLE) new_sock);
} }
@ -230,6 +231,9 @@ fhandler_socket::dup (fhandler_base *child)
fhandler_socket *fhs = (fhandler_socket *) child; fhandler_socket *fhs = (fhandler_socket *) child;
fhs->addr_family = addr_family; fhs->addr_family = addr_family;
fhs->set_io_handle (get_io_handle ()); 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 ()); fhs->fixup_before_fork_exec (GetCurrentProcessId ());
if (winsock2_active) if (winsock2_active)
{ {
@ -287,11 +291,9 @@ fhandler_socket::close ()
setsockopt (get_socket (), SOL_SOCKET, SO_LINGER, setsockopt (get_socket (), SOL_SOCKET, SO_LINGER,
(const char *)&linger, sizeof linger); (const char *)&linger, sizeof linger);
if (closesocket (get_socket ())) while (closesocket (get_socket ())
{ && WSAGetLastError () == WSAEWOULDBLOCK)
set_winsock_errno (); continue;
res = -1;
}
close_secret_event (); close_secret_event ();

3
winsup/cygwin/syscalls.cc
View File

@ -1026,10 +1026,11 @@ stat_worker (const char *name, struct stat *buf, int nofollow, path_conv *pc)
pc, (DWORD) real_path); pc, (DWORD) real_path);
memset (buf, 0, sizeof (struct stat)); memset (buf, 0, sizeof (struct stat));
res = fh->fstat (buf, pc); res = fh->fstat (buf, pc);
delete fh;
} }
done: done:
if (fh)
delete fh;
MALLOC_CHECK; MALLOC_CHECK;
syscall_printf ("%d = (%s, %p)", res, name, buf); syscall_printf ("%d = (%s, %p)", res, name, buf);
return res; return res;