mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
70bbad3cfd
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
228 lines
4.7 KiB
C
228 lines
4.7 KiB
C
/* -*- C -*-
|
|
* $Id$
|
|
*/
|
|
|
|
#include <ruby.h>
|
|
#include "dl.h"
|
|
|
|
VALUE rb_cDLHandle;
|
|
|
|
void
|
|
dlhandle_free(struct dl_handle *dlhandle)
|
|
{
|
|
if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){
|
|
dlclose(dlhandle->ptr);
|
|
}
|
|
}
|
|
|
|
VALUE
|
|
rb_dlhandle_close(VALUE self)
|
|
{
|
|
struct dl_handle *dlhandle;
|
|
|
|
Data_Get_Struct(self, struct dl_handle, dlhandle);
|
|
dlhandle->open = 0;
|
|
return INT2NUM(dlclose(dlhandle->ptr));
|
|
}
|
|
|
|
VALUE
|
|
rb_dlhandle_s_allocate(VALUE klass)
|
|
{
|
|
VALUE obj;
|
|
struct dl_handle *dlhandle;
|
|
|
|
obj = Data_Make_Struct(rb_cDLHandle, struct dl_handle, 0,
|
|
dlhandle_free, dlhandle);
|
|
dlhandle->ptr = 0;
|
|
dlhandle->open = 0;
|
|
dlhandle->enable_close = 0;
|
|
|
|
return obj;
|
|
}
|
|
|
|
VALUE
|
|
rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
|
|
{
|
|
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");
|
|
}
|
|
|
|
ptr = dlopen(clib, cflag);
|
|
#if defined(HAVE_DLERROR)
|
|
if( !ptr && (err = dlerror()) ){
|
|
rb_raise(rb_eDLError, err);
|
|
}
|
|
#else
|
|
if( !ptr ){
|
|
err = dlerror();
|
|
rb_raise(rb_eDLError, err);
|
|
}
|
|
#endif
|
|
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;
|
|
}
|
|
|
|
VALUE
|
|
rb_dlhandle_enable_close(VALUE self)
|
|
{
|
|
struct dl_handle *dlhandle;
|
|
|
|
Data_Get_Struct(self, struct dl_handle, dlhandle);
|
|
dlhandle->enable_close = 1;
|
|
return Qnil;
|
|
}
|
|
|
|
VALUE
|
|
rb_dlhandle_disable_close(VALUE self)
|
|
{
|
|
struct dl_handle *dlhandle;
|
|
|
|
Data_Get_Struct(self, struct dl_handle, dlhandle);
|
|
dlhandle->enable_close = 0;
|
|
return Qnil;
|
|
}
|
|
|
|
VALUE
|
|
rb_dlhandle_to_i(VALUE self)
|
|
{
|
|
struct dl_handle *dlhandle;
|
|
|
|
Data_Get_Struct(self, struct dl_handle, dlhandle);
|
|
return PTR2NUM(dlhandle);
|
|
}
|
|
|
|
VALUE
|
|
rb_dlhandle_sym(VALUE self, VALUE sym)
|
|
{
|
|
void (*func)();
|
|
struct sym_data *data;
|
|
struct dl_handle *dlhandle;
|
|
void *handle;
|
|
const char *name;
|
|
const char *err;
|
|
int i;
|
|
|
|
#if defined(HAVE_DLERROR)
|
|
# define CHECK_DLERROR if( err = dlerror() ){ func = 0; }
|
|
#else
|
|
# define CHECK_DLERROR
|
|
#endif
|
|
|
|
rb_secure(2);
|
|
|
|
if( sym == Qnil ){
|
|
#if defined(RTLD_NEXT)
|
|
name = RTLD_NEXT;
|
|
#else
|
|
name = NULL;
|
|
#endif
|
|
}
|
|
else{
|
|
name = StringValuePtr(sym);
|
|
}
|
|
|
|
|
|
Data_Get_Struct(self, struct dl_handle, dlhandle);
|
|
if( ! dlhandle->open ){
|
|
rb_raise(rb_eDLError, "closed handle");
|
|
}
|
|
handle = dlhandle->ptr;
|
|
|
|
func = dlsym(handle, name);
|
|
CHECK_DLERROR;
|
|
if( !func ){
|
|
#if defined(__CYGWIN__) || defined(WIN32) || defined(__MINGW32__)
|
|
{
|
|
int len = strlen(name);
|
|
char *name_a = (char*)xmalloc(len+2);
|
|
strcpy(name_a, name);
|
|
name_a[len] = 'A';
|
|
name_a[len+1] = '\0';
|
|
func = dlsym(handle, name_a);
|
|
xfree(name_a);
|
|
CHECK_DLERROR;
|
|
if( !func ){
|
|
for( i = 0; i < 256; i += 4 ){
|
|
int len = strlen(name);
|
|
char *name_n = (char*)xmalloc(len+5);
|
|
sprintf(name_n, "%s@%d%c", name, i, 0);
|
|
func = dlsym(handle, name_n);
|
|
xfree(name_n);
|
|
CHECK_DLERROR;
|
|
if( func )
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
CHECK_DLERROR;
|
|
if( !func ){
|
|
rb_raise(rb_eDLError, "unknown symbol \"%s\"", name);
|
|
}
|
|
}
|
|
}
|
|
#else
|
|
for( i = 0; i < 256; i += 4 ){
|
|
int len = strlen(name);
|
|
char *name_n = (char*)xmalloc(len+4);
|
|
sprintf(name_n, "%s@%d", name, i);
|
|
func = dlsym(handle, name_n);
|
|
xfree(name_n);
|
|
CHECK_DLERROR;
|
|
if( func ){
|
|
break;
|
|
}
|
|
}
|
|
CHECK_DLERROR;
|
|
if( !func ){
|
|
rb_raise(rb_eDLError, "unknown symbol \"%s\"", name);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
return PTR2NUM(func);
|
|
}
|
|
|
|
void
|
|
Init_dlhandle()
|
|
{
|
|
rb_cDLHandle = rb_define_class_under(rb_mDL, "Handle", rb_cObject);
|
|
rb_define_alloc_func(rb_cDLHandle, rb_dlhandle_s_allocate);
|
|
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);
|
|
}
|