diff options
author | Christopher Faylor <me@cgf.cx> | 2001-03-05 06:28:25 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2001-03-05 06:28:25 +0000 |
commit | 95a8465ba0fb3ea0fb9033e4823b1f65c4554f27 (patch) | |
tree | 1d9cd02f71759975598d27cf3728af23592c90b0 /winsup/cygwin/dlfcn.cc | |
parent | 658b5db941bcace10daa2d17e8c1158030a4fc8c (diff) | |
download | newlib-95a8465ba0fb3ea0fb9033e4823b1f65c4554f27.zip newlib-95a8465ba0fb3ea0fb9033e4823b1f65c4554f27.tar.gz newlib-95a8465ba0fb3ea0fb9033e4823b1f65c4554f27.tar.bz2 |
* dlopen.c (dlopen): Return NULL when name is NULL (suggested by
chrisiasci@aol.com).
* cygwin.din: Add a new, internally used export - _check_for_executable.
* dcrt0.cc (dll_crt0_1): Set _check_for_executable for older binaries. Pass
user_data to premain functions.
* fhandler.cc (fhandler_disk_file::open): Only check for executable if the
linked program is intereested in the executable bit.
(fhandler_disk_file::check_execable_p): Delete.
* fhandler.h (executable_states): New enumeration of various states of
executable bit caring.
(fhandler_base::set_execable_p): New method.
* fhandler_termios.cc (fhandler_termios::line_edit): Flag when a signal has
been sent to the tty. Return -1 when this is so.
* fhandler_console.cc (fhandler_console::read): Return -1 when signal sending
character encountered.
* path.cc (path_conv::check): Record when path refers to a disk device. Move
executable extension check here.
(check_sysfile): Accomodate new EXEC path states.
(has_suffix): Remove.
(next_suffix): Remove.
(class suffix_scan): New clas.
(suffix_scan::has): New method.
(suffix_scan:next): New method.
(symlink_info::check): Use suffix_scan method to control for scanning for
suffixes.
* path.h (path_conv::exec_state): New method.
* perprocess.h: Make "C" friendly.
* include/cygwin/version.h: Define CYGWIN_VERSION_CHECK_FOR_S_IEXEC. Bump
CYGWIN_VERSION_API_MINOR.
* include/sys/cygwin.h: Change premain declarations.
* winsup.h: Move __cplusplus test to after builtin defines.
Diffstat (limited to 'winsup/cygwin/dlfcn.cc')
-rw-r--r-- | winsup/cygwin/dlfcn.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/winsup/cygwin/dlfcn.cc b/winsup/cygwin/dlfcn.cc index 73c44f1..f553ef8 100644 --- a/winsup/cygwin/dlfcn.cc +++ b/winsup/cygwin/dlfcn.cc @@ -14,9 +14,9 @@ details. */ #include <unistd.h> #include <ctype.h> #include "fhandler.h" +#include "perprocess.h" #include "path.h" #include "thread.h" -#include "perprocess.h" #include "dlfcn.h" #include "dll_init.h" @@ -166,19 +166,15 @@ dlopen (const char *name, int) { SetResourceLock(LOCK_DLL_LIST,READ_LOCK|WRITE_LOCK," dlopen"); - void *ret = 0; + void *ret; if (!name) - { - /* handle for the current module */ - ret = (void *) GetModuleHandle (NULL); - } + ret = (void *) GetModuleHandle (NULL); /* handle for the current module */ else { /* handle for the named library */ const char *fullpath = get_full_path_of_dll (name); - if (fullpath) - ret = (void *) LoadLibrary (fullpath); + ret = fullpath ? (void *) LoadLibrary (fullpath) : NULL; } if (!ret) |