* fhandler.cc (fhandler_base::fork_fixup): Don't protect handle.
* dlfcn.cc: Fix to confirm to coding standards. Reorganize includes throughout to accomodate new cygheap.h usage. * cygheap.h (cygheap_fdmanip): New class: simplifies locking and retrieval of fds from cygheap->fdtab. (cygheap_fdget): Ditto. (cygheap_fdnew): Ditto. * fcntl.cc (_fcntl): Use new method to lock fdtab and retrieve info. * ioctl.cc (ioctl): Ditto. * mmap.cc (mmap): Ditto. * net.cc: Ditto, throughout. * passwd.cc (getpass): Ditto. * path.cc (fchdir): Ditto. * pipe.cc (make_pipe): Ditto. * sec_acl.cc (facl): Ditto. * syscalls.cc: Ditto, throughout. * termios.cc: Ditto, throughout.
This commit is contained in:
@@ -22,8 +22,8 @@ details. */
|
||||
#include "dll_init.h"
|
||||
#include "cygerrno.h"
|
||||
|
||||
#define _dl_error _reent_winsup()->_dl_error
|
||||
#define _dl_buffer _reent_winsup()->_dl_buffer
|
||||
#define _dl_error _reent_winsup ()->_dl_error
|
||||
#define _dl_buffer _reent_winsup ()->_dl_buffer
|
||||
|
||||
static void __stdcall
|
||||
set_dl_error (const char *str)
|
||||
@@ -85,7 +85,7 @@ get_full_path_of_dll (const char* str, char *name)
|
||||
void *
|
||||
dlopen (const char *name, int)
|
||||
{
|
||||
SetResourceLock(LOCK_DLL_LIST,READ_LOCK|WRITE_LOCK," dlopen");
|
||||
SetResourceLock (LOCK_DLL_LIST, READ_LOCK | WRITE_LOCK, "dlopen");
|
||||
|
||||
void *ret;
|
||||
|
||||
@@ -110,7 +110,7 @@ dlopen (const char *name, int)
|
||||
set_dl_error ("dlopen");
|
||||
debug_printf ("ret %p", ret);
|
||||
|
||||
ReleaseResourceLock(LOCK_DLL_LIST,READ_LOCK|WRITE_LOCK," dlopen");
|
||||
ReleaseResourceLock (LOCK_DLL_LIST, READ_LOCK | WRITE_LOCK, "dlopen");
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ dlsym (void *handle, const char *name)
|
||||
int
|
||||
dlclose (void *handle)
|
||||
{
|
||||
SetResourceLock(LOCK_DLL_LIST,READ_LOCK|WRITE_LOCK," dlclose");
|
||||
SetResourceLock (LOCK_DLL_LIST, READ_LOCK | WRITE_LOCK, "dlclose");
|
||||
|
||||
int ret = -1;
|
||||
void *temphandle = (void *) GetModuleHandle (NULL);
|
||||
@@ -137,7 +137,7 @@ dlclose (void *handle)
|
||||
set_dl_error ("dlclose");
|
||||
CloseHandle ((HMODULE) temphandle);
|
||||
|
||||
ReleaseResourceLock(LOCK_DLL_LIST,READ_LOCK|WRITE_LOCK," dlclose");
|
||||
ReleaseResourceLock (LOCK_DLL_LIST, READ_LOCK | WRITE_LOCK, "dlclose");
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user