mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* io.c (rb_io_ctl): do not call ioctl/fcntl for f2, if f and f2
have same fileno. * eval.c (rb_load): raise LocaJumpError if unexpected local jumps appear during load. * ext/socket/socket.c (bsock_close_read): don't call rb_thread_fd_close(); it's supposed to be called by io_io_close(). * ext/socket/socket.c (bsock_close_read): do not modify f and f2. * ext/socket/socket.c (bsock_close_write): ditto. * ext/socket/socket.c (sock_new): avoid dup(2) on sockets. * parse.y (primary): preserve and clear in_single and in_def using stack to prevent nested method errors in singleton class bodies. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz
parent
32ce4317d8
commit
8be410f065
14 changed files with 429 additions and 147 deletions
243
ext/gdbm/gdbm.c
243
ext/gdbm/gdbm.c
|
|
@ -14,7 +14,7 @@
|
|||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
|
||||
VALUE cGDBM;
|
||||
VALUE cGDBM, rb_eGDBMError;
|
||||
|
||||
#define MY_BLOCK_SIZE (2048)
|
||||
#define MY_FATAL_FUNC (0)
|
||||
|
|
@ -32,6 +32,7 @@ closed_dbm()
|
|||
|
||||
#define GetDBM(obj, dbmp) {\
|
||||
Data_Get_Struct(obj, struct dbmdata, dbmp);\
|
||||
if (dbmp == 0) closed_dbm();\
|
||||
if (dbmp->di_dbm == 0) closed_dbm();\
|
||||
}
|
||||
|
||||
|
|
@ -39,23 +40,37 @@ static void
|
|||
free_dbm(dbmp)
|
||||
struct dbmdata *dbmp;
|
||||
{
|
||||
if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
|
||||
free(dbmp);
|
||||
if (dbmp) {
|
||||
if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
|
||||
free(dbmp);
|
||||
}
|
||||
}
|
||||
|
||||
static VALUE fgdbm_close _((VALUE));
|
||||
|
||||
static VALUE
|
||||
fgdbm_s_open(argc, argv, klass)
|
||||
fgdbm_s_new(argc, argv, klass)
|
||||
int argc;
|
||||
VALUE *argv;
|
||||
VALUE klass;
|
||||
{
|
||||
VALUE file, vmode;
|
||||
VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
|
||||
rb_obj_call_init(obj, argc, argv);
|
||||
return obj;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
fgdbm_initialize(argc, argv, obj)
|
||||
int argc;
|
||||
VALUE *argv;
|
||||
VALUE obj;
|
||||
{
|
||||
VALUE file, vmode, vflags;
|
||||
GDBM_FILE dbm;
|
||||
struct dbmdata *dbmp;
|
||||
int mode;
|
||||
VALUE obj;
|
||||
int mode, flags = 0;
|
||||
|
||||
if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
|
||||
if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) {
|
||||
mode = 0666; /* default value */
|
||||
}
|
||||
else if (NIL_P(vmode)) {
|
||||
|
|
@ -64,31 +79,61 @@ fgdbm_s_open(argc, argv, klass)
|
|||
else {
|
||||
mode = NUM2INT(vmode);
|
||||
}
|
||||
|
||||
if (!NIL_P(vflags))
|
||||
flags = NUM2INT(vflags);
|
||||
|
||||
Check_SafeStr(file);
|
||||
|
||||
dbm = 0;
|
||||
if (mode >= 0)
|
||||
dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
|
||||
O_RDWR|O_CREAT, mode, MY_FATAL_FUNC);
|
||||
GDBM_WRCREAT|flags, mode, MY_FATAL_FUNC);
|
||||
if (!dbm)
|
||||
dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
|
||||
O_RDWR, 0, MY_FATAL_FUNC);
|
||||
GDBM_WRITER|flags, 0, MY_FATAL_FUNC);
|
||||
if (!dbm)
|
||||
dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
|
||||
O_RDONLY, 0, MY_FATAL_FUNC);
|
||||
GDBM_READER|flags, 0, MY_FATAL_FUNC);
|
||||
|
||||
if (!dbm) {
|
||||
if (mode == -1) return Qnil;
|
||||
rb_sys_fail(RSTRING(file)->ptr);
|
||||
|
||||
if (gdbm_errno == GDBM_FILE_OPEN_ERROR ||
|
||||
gdbm_errno == GDBM_CANT_BE_READER ||
|
||||
gdbm_errno == GDBM_CANT_BE_WRITER)
|
||||
rb_sys_fail(RSTRING(file)->ptr);
|
||||
else
|
||||
rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
|
||||
}
|
||||
|
||||
obj = Data_Make_Struct(klass,struct dbmdata,0,free_dbm,dbmp);
|
||||
dbmp = ALLOC(struct dbmdata);
|
||||
DATA_PTR(obj) = dbmp;
|
||||
dbmp->di_dbm = dbm;
|
||||
dbmp->di_size = -1;
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
fgdbm_s_open(argc, argv, klass)
|
||||
int argc;
|
||||
VALUE *argv;
|
||||
VALUE klass;
|
||||
{
|
||||
VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
|
||||
|
||||
if (NIL_P(fgdbm_initialize(argc, argv, obj))) {
|
||||
return Qnil;
|
||||
}
|
||||
|
||||
if (rb_block_given_p()) {
|
||||
return rb_ensure(rb_yield, obj, fgdbm_close, obj);
|
||||
}
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
fgdbm_close(obj)
|
||||
VALUE obj;
|
||||
|
|
@ -102,6 +147,21 @@ fgdbm_close(obj)
|
|||
return Qnil;
|
||||
}
|
||||
|
||||
static datum
|
||||
gdbm_fetch_1(dbm, key)
|
||||
GDBM_FILE dbm;
|
||||
datum key;
|
||||
{
|
||||
static char *ptr;
|
||||
datum val;
|
||||
|
||||
val = gdbm_fetch(dbm, key);
|
||||
if (ptr) free(ptr);
|
||||
ptr = val.dptr;
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
fgdbm_fetch(obj, keystr, ifnone)
|
||||
VALUE obj, keystr, ifnone;
|
||||
|
|
@ -116,7 +176,7 @@ fgdbm_fetch(obj, keystr, ifnone)
|
|||
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
value = gdbm_fetch(dbm, key);
|
||||
value = gdbm_fetch_1(dbm, key);
|
||||
if (value.dptr == 0) {
|
||||
if (ifnone == Qnil && rb_block_given_p())
|
||||
return rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
|
||||
|
|
@ -138,10 +198,14 @@ fgdbm_fetch_m(argc, argv, obj)
|
|||
VALUE *argv;
|
||||
VALUE obj;
|
||||
{
|
||||
VALUE keystr, ifnone;
|
||||
VALUE keystr, valstr, ifnone;
|
||||
|
||||
rb_scan_args(argc, argv, "11", &keystr, &ifnone);
|
||||
return fgdbm_fetch(obj, keystr, ifnone);
|
||||
valstr = fgdbm_fetch(obj, keystr, ifnone);
|
||||
if (argc == 1 && !rb_block_given_p() && NIL_P(valstr))
|
||||
rb_raise(rb_eIndexError, "key not found");
|
||||
|
||||
return valstr;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
|
|
@ -159,7 +223,7 @@ fgdbm_index(obj, valstr)
|
|||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
|
||||
val = gdbm_fetch(dbm, key);
|
||||
val = gdbm_fetch_1(dbm, key);
|
||||
if (val.dsize == RSTRING(valstr)->len &&
|
||||
memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
|
||||
return rb_tainted_str_new(key.dptr, key.dsize);
|
||||
|
|
@ -188,7 +252,7 @@ static VALUE
|
|||
fgdbm_delete(obj, keystr)
|
||||
VALUE obj, keystr;
|
||||
{
|
||||
datum key, value;
|
||||
datum key;
|
||||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
|
|
@ -200,15 +264,14 @@ fgdbm_delete(obj, keystr)
|
|||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
|
||||
value = gdbm_fetch(dbm, key);
|
||||
if (value.dptr == 0) {
|
||||
if (!gdbm_exists(dbm, key)) {
|
||||
if (rb_block_given_p()) rb_yield(keystr);
|
||||
return Qnil;
|
||||
}
|
||||
|
||||
if (gdbm_delete(dbm, key)) {
|
||||
dbmp->di_size = -1;
|
||||
rb_raise(rb_eRuntimeError, "gdbm_delete failed");
|
||||
rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
|
||||
}
|
||||
else if (dbmp->di_size >= 0) {
|
||||
dbmp->di_size--;
|
||||
|
|
@ -231,7 +294,7 @@ fgdbm_shift(obj)
|
|||
|
||||
key = gdbm_firstkey(dbm);
|
||||
if (!key.dptr) return Qnil;
|
||||
val = gdbm_fetch(dbm, key);
|
||||
val = gdbm_fetch_1(dbm, key);
|
||||
gdbm_delete(dbm, key);
|
||||
|
||||
keystr = rb_tainted_str_new(key.dptr, key.dsize);
|
||||
|
|
@ -252,12 +315,12 @@ fgdbm_delete_if(obj)
|
|||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
|
||||
val = gdbm_fetch(dbm, key);
|
||||
val = gdbm_fetch_1(dbm, key);
|
||||
keystr = rb_tainted_str_new(key.dptr, key.dsize);
|
||||
valstr = rb_tainted_str_new(val.dptr, val.dsize);
|
||||
if (RTEST(rb_yield(rb_assoc_new(keystr, valstr)))) {
|
||||
if (gdbm_delete(dbm, key)) {
|
||||
rb_raise(rb_eRuntimeError, "gdbm_delete failed");
|
||||
rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -279,7 +342,7 @@ fgdbm_clear(obj)
|
|||
for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
|
||||
nextkey = gdbm_nextkey(dbm, key);
|
||||
if (gdbm_delete(dbm, key)) {
|
||||
rb_raise(rb_eRuntimeError, "gdbm_delete failed");
|
||||
rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
|
||||
}
|
||||
}
|
||||
return obj;
|
||||
|
|
@ -298,7 +361,7 @@ fgdbm_invert(obj)
|
|||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
|
||||
val = gdbm_fetch(dbm, key);
|
||||
val = gdbm_fetch_1(dbm, key);
|
||||
keystr = rb_tainted_str_new(key.dptr, key.dsize);
|
||||
valstr = rb_tainted_str_new(val.dptr, val.dsize);
|
||||
rb_hash_aset(hash, valstr, keystr);
|
||||
|
|
@ -367,7 +430,7 @@ fgdbm_store(obj, keystr, valstr)
|
|||
dbm = dbmp->di_dbm;
|
||||
if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
|
||||
if (errno == EPERM) rb_sys_fail(0);
|
||||
rb_raise(rb_eRuntimeError, "gdbm_store failed");
|
||||
rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
|
||||
}
|
||||
|
||||
return valstr;
|
||||
|
|
@ -429,7 +492,7 @@ fgdbm_each_value(obj)
|
|||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
|
||||
val = gdbm_fetch(dbm, key);
|
||||
val = gdbm_fetch_1(dbm, key);
|
||||
rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
|
||||
}
|
||||
return obj;
|
||||
|
|
@ -464,7 +527,7 @@ fgdbm_each_pair(obj)
|
|||
dbm = dbmp->di_dbm;
|
||||
|
||||
for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
|
||||
val = gdbm_fetch(dbm, key);
|
||||
val = gdbm_fetch_1(dbm, key);
|
||||
keystr = rb_tainted_str_new(key.dptr, key.dsize);
|
||||
valstr = rb_tainted_str_new(val.dptr, val.dsize);
|
||||
rb_yield(rb_assoc_new(keystr, valstr));
|
||||
|
|
@ -507,7 +570,7 @@ fgdbm_values(obj)
|
|||
|
||||
ary = rb_ary_new();
|
||||
for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
|
||||
val = gdbm_fetch(dbm, key);
|
||||
val = gdbm_fetch_1(dbm, key);
|
||||
rb_ary_push(ary, rb_tainted_str_new(val.dptr, val.dsize));
|
||||
}
|
||||
|
||||
|
|
@ -537,7 +600,7 @@ static VALUE
|
|||
fgdbm_has_value(obj, valstr)
|
||||
VALUE obj, valstr;
|
||||
{
|
||||
datum key, val;
|
||||
datum key;
|
||||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
|
|
@ -548,7 +611,7 @@ fgdbm_has_value(obj, valstr)
|
|||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
|
||||
val = gdbm_fetch(dbm, key);
|
||||
val = gdbm_fetch_1(dbm, key);
|
||||
if (val.dsize == RSTRING(valstr)->len &&
|
||||
memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
|
||||
return Qtrue;
|
||||
|
|
@ -570,7 +633,7 @@ fgdbm_to_a(obj)
|
|||
|
||||
ary = rb_ary_new();
|
||||
for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
|
||||
val = gdbm_fetch(dbm, key);
|
||||
val = gdbm_fetch_1(dbm, key);
|
||||
rb_ary_push(ary, rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
|
||||
rb_tainted_str_new(val.dptr, val.dsize)));
|
||||
}
|
||||
|
|
@ -592,6 +655,88 @@ fgdbm_reorganize(obj)
|
|||
return obj;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
fgdbm_sync(obj)
|
||||
VALUE obj;
|
||||
{
|
||||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
|
||||
rb_secure(4);
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
gdbm_sync(dbm);
|
||||
return obj;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
fgdbm_set_cachesize(obj, val)
|
||||
VALUE obj, val;
|
||||
{
|
||||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
VALUE hash;
|
||||
int optval;
|
||||
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
|
||||
optval = FIX2INT(val);
|
||||
if (gdbm_setopt(dbm, GDBM_CACHESIZE, &optval, sizeof(optval)) == -1) {
|
||||
rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
|
||||
}
|
||||
return val;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
fgdbm_set_fastmode(obj, val)
|
||||
VALUE obj, val;
|
||||
{
|
||||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
VALUE hash;
|
||||
int optval;
|
||||
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
|
||||
optval = 0;
|
||||
if (RTEST(val))
|
||||
optval = 1;
|
||||
|
||||
if (gdbm_setopt(dbm, GDBM_FASTMODE, &optval, sizeof(optval)) == -1) {
|
||||
rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
|
||||
}
|
||||
return val;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
fgdbm_set_syncmode(obj, val)
|
||||
VALUE obj, val;
|
||||
{
|
||||
#if !defined(GDBM_SYNCMODE)
|
||||
fgdbm_set_fastmode(obj, RTEST(val) ? Qfalse : Qtrue);
|
||||
return val;
|
||||
#else
|
||||
struct dbmdata *dbmp;
|
||||
GDBM_FILE dbm;
|
||||
VALUE hash;
|
||||
int optval;
|
||||
|
||||
GetDBM(obj, dbmp);
|
||||
dbm = dbmp->di_dbm;
|
||||
|
||||
optval = 0;
|
||||
if (RTEST(val))
|
||||
optval = 1;
|
||||
|
||||
if (gdbm_setopt(dbm, GDBM_FASTMODE, &optval, sizeof(optval)) == -1) {
|
||||
rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
|
||||
}
|
||||
return val;
|
||||
#endif
|
||||
}
|
||||
|
||||
static VALUE
|
||||
fgdbm_to_hash(obj)
|
||||
VALUE obj;
|
||||
|
|
@ -606,7 +751,7 @@ fgdbm_to_hash(obj)
|
|||
|
||||
hash = rb_hash_new();
|
||||
for (key = gdbm_firstkey(dbm); key.dptr; key = gdbm_nextkey(dbm, key)) {
|
||||
val = gdbm_fetch(dbm, key);
|
||||
val = gdbm_fetch_1(dbm, key);
|
||||
rb_hash_aset(hash, rb_tainted_str_new(key.dptr, key.dsize),
|
||||
rb_tainted_str_new(val.dptr, val.dsize));
|
||||
}
|
||||
|
|
@ -625,10 +770,13 @@ void
|
|||
Init_gdbm()
|
||||
{
|
||||
cGDBM = rb_define_class("GDBM", rb_cObject);
|
||||
rb_eGDBMError = rb_define_class("GDBMError", rb_eStandardError);
|
||||
rb_include_module(cGDBM, rb_mEnumerable);
|
||||
|
||||
rb_define_singleton_method(cGDBM, "new", fgdbm_s_new, -1);
|
||||
rb_define_singleton_method(cGDBM, "open", fgdbm_s_open, -1);
|
||||
rb_define_singleton_method(cGDBM, "new", fgdbm_s_open, -1);
|
||||
|
||||
rb_define_method(cGDBM, "initialize", fgdbm_initialize, -1);
|
||||
rb_define_method(cGDBM, "close", fgdbm_close, 0);
|
||||
rb_define_method(cGDBM, "[]", fgdbm_aref, 1);
|
||||
rb_define_method(cGDBM, "fetch", fgdbm_fetch_m, -1);
|
||||
|
|
@ -656,6 +804,11 @@ Init_gdbm()
|
|||
rb_define_method(cGDBM,"update", fgdbm_update, 1);
|
||||
rb_define_method(cGDBM,"replace", fgdbm_replace, 1);
|
||||
rb_define_method(cGDBM,"reorganize", fgdbm_reorganize, 0);
|
||||
rb_define_method(cGDBM,"sync", fgdbm_sync, 0);
|
||||
/* rb_define_method(cGDBM,"setopt", fgdbm_setopt, 2); */
|
||||
rb_define_method(cGDBM,"cachesize=", fgdbm_set_cachesize, 1);
|
||||
rb_define_method(cGDBM,"fastmode=", fgdbm_set_fastmode, 1);
|
||||
rb_define_method(cGDBM,"syncmode=", fgdbm_set_syncmode, 1);
|
||||
|
||||
rb_define_method(cGDBM, "include?", fgdbm_has_key, 1);
|
||||
rb_define_method(cGDBM, "has_key?", fgdbm_has_key, 1);
|
||||
|
|
@ -666,4 +819,24 @@ Init_gdbm()
|
|||
|
||||
rb_define_method(cGDBM, "to_a", fgdbm_to_a, 0);
|
||||
rb_define_method(cGDBM, "to_hash", fgdbm_to_hash, 0);
|
||||
|
||||
/* flags for gdbm_opn() */
|
||||
/*
|
||||
rb_define_const(cGDBM, "READER", INT2FIX(GDBM_READER));
|
||||
rb_define_const(cGDBM, "WRITER", INT2FIX(GDBM_WRITER));
|
||||
rb_define_const(cGDBM, "WRCREAT", INT2FIX(GDBM_WRCREAT));
|
||||
rb_define_const(cGDBM, "NEWDB", INT2FIX(GDBM_NEWDB));
|
||||
*/
|
||||
rb_define_const(cGDBM, "FAST", INT2FIX(GDBM_FAST));
|
||||
/* this flag is obsolete in gdbm 1.8.
|
||||
On gdbm 1.8, fast mode is default behavior. */
|
||||
|
||||
/* gdbm version 1.8 specific */
|
||||
#if defined(GDBM_SYNC)
|
||||
rb_define_const(cGDBM, "SYNC", INT2FIX(GDBM_SYNC));
|
||||
#endif
|
||||
#if defined(GDBM_NOLOCK)
|
||||
rb_define_const(cGDBM, "NOLOCK", INT2FIX(GDBM_NOLOCK));
|
||||
#endif
|
||||
rb_define_const(cGDBM, "VERSION", rb_str_new2(gdbm_version));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue