2005-02-04 08:35:37 -05:00
|
|
|
/* -*- C -*-
|
|
|
|
* $Id$
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <ruby.h>
|
|
|
|
#include "dl.h"
|
|
|
|
|
|
|
|
VALUE rb_cDLHandle;
|
|
|
|
|
2009-03-17 00:48:03 -04:00
|
|
|
#ifdef HAVE_WINDOWS_H
|
|
|
|
# ifndef _WIN32_WCE
|
|
|
|
static void *
|
|
|
|
w32_coredll(void)
|
|
|
|
{
|
|
|
|
MEMORY_BASIC_INFORMATION m;
|
|
|
|
memset(&m, 0, sizeof(m));
|
|
|
|
if( !VirtualQuery(_errno, &m, sizeof(m)) ) return NULL;
|
|
|
|
return m.AllocationBase;
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
|
|
|
|
static int
|
|
|
|
w32_dlclose(void *ptr)
|
|
|
|
{
|
|
|
|
# ifndef _WIN32_WCE
|
|
|
|
if( ptr == w32_coredll() ) return 0;
|
|
|
|
# endif
|
|
|
|
if( FreeLibrary((HMODULE)ptr) ) return 0;
|
|
|
|
return errno = rb_w32_map_errno(GetLastError());
|
|
|
|
}
|
|
|
|
#define dlclose(ptr) w32_dlclose(ptr)
|
|
|
|
#endif
|
|
|
|
|
2005-02-04 08:35:37 -05:00
|
|
|
void
|
|
|
|
dlhandle_free(struct dl_handle *dlhandle)
|
|
|
|
{
|
2009-03-16 21:15:35 -04:00
|
|
|
if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){
|
|
|
|
dlclose(dlhandle->ptr);
|
|
|
|
}
|
2005-02-04 08:35:37 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_dlhandle_close(VALUE self)
|
|
|
|
{
|
2009-03-16 21:15:35 -04:00
|
|
|
struct dl_handle *dlhandle;
|
2005-02-04 08:35:37 -05:00
|
|
|
|
2009-03-16 21:15:35 -04:00
|
|
|
Data_Get_Struct(self, struct dl_handle, dlhandle);
|
|
|
|
dlhandle->open = 0;
|
|
|
|
return INT2NUM(dlclose(dlhandle->ptr));
|
2005-02-04 08:35:37 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_dlhandle_s_allocate(VALUE klass)
|
|
|
|
{
|
2009-03-16 21:15:35 -04:00
|
|
|
VALUE obj;
|
|
|
|
struct dl_handle *dlhandle;
|
2005-02-04 08:35:37 -05:00
|
|
|
|
2009-03-16 21:15:35 -04:00
|
|
|
obj = Data_Make_Struct(rb_cDLHandle, struct dl_handle, 0,
|
|
|
|
dlhandle_free, dlhandle);
|
|
|
|
dlhandle->ptr = 0;
|
|
|
|
dlhandle->open = 0;
|
|
|
|
dlhandle->enable_close = 0;
|
2005-02-04 08:35:37 -05:00
|
|
|
|
2009-03-16 21:15:35 -04:00
|
|
|
return obj;
|
2005-02-04 08:35:37 -05:00
|
|
|
}
|
|
|
|
|
2009-05-23 08:49:00 -04:00
|
|
|
static VALUE
|
|
|
|
predefined_dlhandle(void *handle)
|
|
|
|
{
|
|
|
|
VALUE obj = rb_dlhandle_s_allocate(rb_cDLHandle);
|
|
|
|
struct dl_handle *dlhandle = DATA_PTR(obj);
|
|
|
|
|
|
|
|
dlhandle->ptr = handle;
|
|
|
|
dlhandle->open = 1;
|
|
|
|
OBJ_FREEZE(obj);
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2005-02-04 08:35:37 -05:00
|
|
|
VALUE
|
|
|
|
rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
|
|
|
|
{
|
2009-03-16 21:15:35 -04:00
|
|
|
void *ptr;
|
|
|
|
struct dl_handle *dlhandle;
|
|
|
|
VALUE lib, flag;
|
|
|
|
char *clib;
|
|
|
|
int cflag;
|
|
|
|
const char *err;
|
|
|
|
|
|
|
|
switch( rb_scan_args(argc, argv, "02", &lib, &flag) ){
|
|
|
|
case 0:
|
|
|
|
clib = NULL;
|
|
|
|
cflag = RTLD_LAZY | RTLD_GLOBAL;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
|
|
|
|
cflag = RTLD_LAZY | RTLD_GLOBAL;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
|
|
|
|
cflag = NUM2INT(flag);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
rb_bug("rb_dlhandle_new");
|
|
|
|
}
|
2005-02-04 08:35:37 -05:00
|
|
|
|
2009-03-01 21:01:48 -05:00
|
|
|
#if defined(HAVE_WINDOWS_H)
|
2009-03-16 21:15:35 -04:00
|
|
|
if( !clib ){
|
|
|
|
HANDLE rb_libruby_handle(void);
|
|
|
|
ptr = rb_libruby_handle();
|
|
|
|
}
|
2009-03-17 00:48:03 -04:00
|
|
|
else if( STRCASECMP(clib, "libc") == 0
|
|
|
|
# ifdef RUBY_COREDLL
|
|
|
|
|| STRCASECMP(clib, RUBY_COREDLL) == 0
|
|
|
|
|| STRCASECMP(clib, RUBY_COREDLL".dll") == 0
|
|
|
|
# endif
|
|
|
|
){
|
|
|
|
# ifdef _WIN32_WCE
|
|
|
|
ptr = dlopen("coredll.dll", cflag);
|
|
|
|
# else
|
|
|
|
ptr = w32_coredll();
|
|
|
|
# endif
|
|
|
|
}
|
2009-03-16 21:15:35 -04:00
|
|
|
else
|
2009-03-01 21:01:48 -05:00
|
|
|
#endif
|
2009-03-16 21:15:35 -04:00
|
|
|
ptr = dlopen(clib, cflag);
|
2005-02-04 08:35:37 -05:00
|
|
|
#if defined(HAVE_DLERROR)
|
2009-03-16 21:15:35 -04:00
|
|
|
if( !ptr && (err = dlerror()) ){
|
|
|
|
rb_raise(rb_eDLError, "%s", err);
|
|
|
|
}
|
2005-02-04 08:35:37 -05:00
|
|
|
#else
|
2009-03-16 21:15:35 -04:00
|
|
|
if( !ptr ){
|
|
|
|
err = dlerror();
|
|
|
|
rb_raise(rb_eDLError, "%s", err);
|
|
|
|
}
|
2005-02-04 08:35:37 -05:00
|
|
|
#endif
|
2009-03-16 21:15:35 -04:00
|
|
|
Data_Get_Struct(self, struct dl_handle, dlhandle);
|
|
|
|
if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){
|
|
|
|
dlclose(dlhandle->ptr);
|
|
|
|
}
|
|
|
|
dlhandle->ptr = ptr;
|
|
|
|
dlhandle->open = 1;
|
|
|
|
dlhandle->enable_close = 0;
|
|
|
|
|
|
|
|
if( rb_block_given_p() ){
|
|
|
|
rb_ensure(rb_yield, self, rb_dlhandle_close, self);
|
|
|
|
}
|
|
|
|
|
|
|
|
return Qnil;
|
2005-02-04 08:35:37 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_dlhandle_enable_close(VALUE self)
|
|
|
|
{
|
2009-03-16 21:15:35 -04:00
|
|
|
struct dl_handle *dlhandle;
|
2005-02-04 08:35:37 -05:00
|
|
|
|
2009-03-16 21:15:35 -04:00
|
|
|
Data_Get_Struct(self, struct dl_handle, dlhandle);
|
|
|
|
dlhandle->enable_close = 1;
|
|
|
|
return Qnil;
|
2005-02-04 08:35:37 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_dlhandle_disable_close(VALUE self)
|
|
|
|
{
|
2009-03-16 21:15:35 -04:00
|
|
|
struct dl_handle *dlhandle;
|
2005-02-04 08:35:37 -05:00
|
|
|
|
2009-03-16 21:15:35 -04:00
|
|
|
Data_Get_Struct(self, struct dl_handle, dlhandle);
|
|
|
|
dlhandle->enable_close = 0;
|
|
|
|
return Qnil;
|
2005-02-04 08:35:37 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_dlhandle_to_i(VALUE self)
|
|
|
|
{
|
2009-03-16 21:15:35 -04:00
|
|
|
struct dl_handle *dlhandle;
|
2005-02-04 08:35:37 -05:00
|
|
|
|
2009-03-16 21:15:35 -04:00
|
|
|
Data_Get_Struct(self, struct dl_handle, dlhandle);
|
|
|
|
return PTR2NUM(dlhandle);
|
2005-02-04 08:35:37 -05:00
|
|
|
}
|
|
|
|
|
2009-05-23 08:49:00 -04:00
|
|
|
static VALUE dlhandle_sym(void *handle, const char *symbol);
|
|
|
|
|
2005-02-04 08:35:37 -05:00
|
|
|
VALUE
|
|
|
|
rb_dlhandle_sym(VALUE self, VALUE sym)
|
|
|
|
{
|
2005-02-07 04:45:02 -05:00
|
|
|
struct dl_handle *dlhandle;
|
|
|
|
const char *name;
|
2005-02-08 04:18:16 -05:00
|
|
|
|
2005-02-07 04:45:02 -05:00
|
|
|
rb_secure(2);
|
2005-02-04 08:35:37 -05:00
|
|
|
|
2009-03-11 07:13:40 -04:00
|
|
|
name = StringValuePtr(sym);
|
2005-02-04 08:35:37 -05:00
|
|
|
|
2005-02-07 04:45:02 -05:00
|
|
|
Data_Get_Struct(self, struct dl_handle, dlhandle);
|
|
|
|
if( ! dlhandle->open ){
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eDLError, "closed handle");
|
2005-02-07 04:45:02 -05:00
|
|
|
}
|
2005-02-04 08:35:37 -05:00
|
|
|
|
2009-05-23 08:49:00 -04:00
|
|
|
return dlhandle_sym(dlhandle->ptr, StringValueCStr(sym));
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef RTLD_NEXT
|
|
|
|
#define RTLD_NEXT NULL
|
|
|
|
#endif
|
|
|
|
#ifndef RTLD_DEFAULT
|
|
|
|
#define RTLD_DEFAULT NULL
|
|
|
|
#endif
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_dlhandle_s_sym(VALUE self, VALUE sym)
|
|
|
|
{
|
|
|
|
rb_secure(2);
|
|
|
|
return dlhandle_sym(RTLD_NEXT, StringValueCStr(sym));
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
dlhandle_sym(void *handle, const char *name)
|
|
|
|
{
|
|
|
|
#if defined(HAVE_DLERROR)
|
|
|
|
const char *err;
|
|
|
|
# define CHECK_DLERROR if( err = dlerror() ){ func = 0; }
|
|
|
|
#else
|
|
|
|
# define CHECK_DLERROR
|
|
|
|
#endif
|
|
|
|
void (*func)() = dlsym(handle, name);
|
|
|
|
|
2005-02-08 04:18:16 -05:00
|
|
|
CHECK_DLERROR;
|
2009-03-11 00:03:14 -04:00
|
|
|
#if defined(FUNC_STDCALL)
|
2005-02-08 04:18:16 -05:00
|
|
|
if( !func ){
|
2009-03-11 00:06:57 -04:00
|
|
|
int i;
|
2009-03-01 20:50:56 -05:00
|
|
|
int len = strlen(name);
|
|
|
|
char *name_n;
|
|
|
|
#if defined(__CYGWIN__) || defined(_WIN32) || defined(__MINGW32__)
|
2005-02-07 04:45:02 -05:00
|
|
|
{
|
|
|
|
char *name_a = (char*)xmalloc(len+2);
|
|
|
|
strcpy(name_a, name);
|
2009-03-11 00:03:14 -04:00
|
|
|
name_n = name_a;
|
2005-02-07 04:45:02 -05:00
|
|
|
name_a[len] = 'A';
|
|
|
|
name_a[len+1] = '\0';
|
|
|
|
func = dlsym(handle, name_a);
|
2005-02-08 04:18:16 -05:00
|
|
|
CHECK_DLERROR;
|
2009-03-11 00:03:14 -04:00
|
|
|
if( func ) goto found;
|
2009-03-01 20:50:56 -05:00
|
|
|
name_n = xrealloc(name_a, len+6);
|
2005-02-07 04:45:02 -05:00
|
|
|
}
|
|
|
|
#else
|
2009-03-01 20:50:56 -05:00
|
|
|
name_n = (char*)xmalloc(len+6);
|
|
|
|
#endif
|
|
|
|
memcpy(name_n, name, len);
|
|
|
|
name_n[len++] = '@';
|
2005-02-07 04:45:02 -05:00
|
|
|
for( i = 0; i < 256; i += 4 ){
|
2009-03-01 20:50:56 -05:00
|
|
|
sprintf(name_n + len, "%d", i);
|
2005-02-07 04:45:02 -05:00
|
|
|
func = dlsym(handle, name_n);
|
2005-02-08 04:18:16 -05:00
|
|
|
CHECK_DLERROR;
|
2009-03-01 20:50:56 -05:00
|
|
|
if( func ) break;
|
2005-02-07 04:45:02 -05:00
|
|
|
}
|
2009-03-01 20:50:56 -05:00
|
|
|
if( func ) goto found;
|
|
|
|
name_n[len-1] = 'A';
|
|
|
|
name_n[len++] = '@';
|
|
|
|
for( i = 0; i < 256; i += 4 ){
|
|
|
|
sprintf(name_n + len, "%d", i);
|
|
|
|
func = dlsym(handle, name_n);
|
|
|
|
CHECK_DLERROR;
|
|
|
|
if( func ) break;
|
|
|
|
}
|
2009-03-11 00:03:14 -04:00
|
|
|
found:
|
|
|
|
xfree(name_n);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if( !func ){
|
|
|
|
rb_raise(rb_eDLError, "unknown symbol \"%s\"", name);
|
2005-02-07 04:45:02 -05:00
|
|
|
}
|
2005-02-04 08:35:37 -05:00
|
|
|
|
2005-02-07 04:45:02 -05:00
|
|
|
return PTR2NUM(func);
|
2005-02-04 08:35:37 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-09 02:25:14 -04:00
|
|
|
Init_dlhandle(void)
|
2005-02-04 08:35:37 -05:00
|
|
|
{
|
|
|
|
rb_cDLHandle = rb_define_class_under(rb_mDL, "Handle", rb_cObject);
|
|
|
|
rb_define_alloc_func(rb_cDLHandle, rb_dlhandle_s_allocate);
|
2009-05-23 08:49:00 -04:00
|
|
|
rb_define_singleton_method(rb_cDLHandle, "sym", rb_dlhandle_s_sym, 1);
|
|
|
|
rb_define_singleton_method(rb_cDLHandle, "[]", rb_dlhandle_s_sym, 1);
|
|
|
|
rb_define_const(rb_cDLHandle, "NEXT", predefined_dlhandle(RTLD_NEXT));
|
|
|
|
rb_define_const(rb_cDLHandle, "DEFAULT", predefined_dlhandle(RTLD_DEFAULT));
|
2005-02-04 08:35:37 -05:00
|
|
|
rb_define_method(rb_cDLHandle, "initialize", rb_dlhandle_initialize, -1);
|
|
|
|
rb_define_method(rb_cDLHandle, "to_i", rb_dlhandle_to_i, 0);
|
|
|
|
rb_define_method(rb_cDLHandle, "close", rb_dlhandle_close, 0);
|
|
|
|
rb_define_method(rb_cDLHandle, "sym", rb_dlhandle_sym, 1);
|
|
|
|
rb_define_method(rb_cDLHandle, "[]", rb_dlhandle_sym, 1);
|
|
|
|
rb_define_method(rb_cDLHandle, "disable_close", rb_dlhandle_disable_close, 0);
|
|
|
|
rb_define_method(rb_cDLHandle, "enable_close", rb_dlhandle_enable_close, 0);
|
|
|
|
}
|