diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-05-02 04:22:21 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-05-02 04:22:21 +0000 |
commit | fd06a2a7fbcaf995b662575f894a0f6ecd1be175 (patch) | |
tree | c229682c4c4c2ee56c973aa372d1a6eef7f5db14 /process.c | |
parent | 902524c35b84e6473498969ee89181052a92da5c (diff) | |
download | ruby-fd06a2a7fbcaf995b662575f894a0f6ecd1be175.tar.gz |
* eval.c (block_pass): should not downgrade safe level.
* ext/dbm/extconf.rb: allow specifying dbm-type explicitly.
* ext/dbm/extconf.rb: avoid gdbm if possible, because it leaks
memory, whereas gdbm.so doesn't. potential incompatibility.
* string.c (rb_str_insert): new method.
* parse.y (yylex): lex_state after RESCUE_MOD should be EXPR_BEG.
* array.c (rb_ary_insert): new method.
* array.c (rb_ary_update): new utility function.
* io.c (set_outfile): should check if closed before assignment.
* eval.c (rb_eval): should preserve value of ruby_errinfo.
* eval.c (rb_thread_schedule): infinite sleep should not cause
dead lock.
* array.c (rb_ary_flatten_bang): proper recursive detection.
* eval.c (yield_under): need not to prohibit at safe level 4.
* pack.c (pack_pack): p/P packs nil into NULL.
* pack.c (pack_unpack): p/P unpacks NULL into nil.
* pack.c (pack_pack): size check for P template.
* ruby.c (set_arg0): wrong predicate when new $0 value is bigger
than original space.
* gc.c (id2ref): should use NUM2ULONG()
* object.c (rb_mod_const_get): check whether name is a class
variable name.
* object.c (rb_mod_const_set): ditto.
* object.c (rb_mod_const_defined): ditto.
* marshal.c (w_float): precision changed to "%.16g"
* eval.c (rb_call0): wrong retry behavior.
* numeric.c (fix_aref): a bug on long>int architecture.
* eval.c (rb_eval_string_wrap): should restore ruby_wrapper.
* regex.c (re_compile_pattern): char class at either edge of range
should be invalid.
* eval.c (handle_rescue): use === to compare exception match.
* error.c (syserr_eqq): comparison between SytemCallErrors should
based on their error numbers.
* eval.c (safe_getter): should use INT2NUM().
* bignum.c (rb_big2long): 2**31 cannot fit in 31 bit long.
* regex.c (calculate_must_string): wrong length calculation.
* eval.c (rb_thread_start_0): fixed memory leak.
* parse.y (none): should clear cmdarg_stack too.
* io.c (rb_fopen): use setvbuf() to avoid recursive malloc() on
some platforms.
* file.c (rb_stat_dev): device functions should honor stat field
types (except long long such as dev_t).
* eval.c (rb_mod_nesting): should not push nil for nesting array.
* eval.c (rb_mod_s_constants): should not search array by
rb_mod_const_at() for nil (happens for singleton class).
* class.c (rb_singleton_class_attached): should modify iv_tbl by
itself, no longer use rb_iv_set() to avoid freeze check error.
* variable.c (rb_const_get): error message "uninitialized constant
Foo at Bar::Baz" instead of "uninitialized constantBar::Baz::Foo".
* eval.c (rb_mod_included): new hook called from rb_mod_include().
* io.c (opt_i_set): should strdup() inplace_edit string.
* eval.c (exec_under): need to push cref too.
* eval.c (rb_f_missing): raise NameError for "undefined local
variable or method".
* error.c (Init_Exception): new exception NoMethodError.
NameError moved under ScriptError again.
* eval.c (rb_f_missing): use NoMethodError instead of NameError.
* file.c (Init_File): should redifine "new" class method.
* eval.c (PUSH_CREF): sharing cref node was problematic. maintain
runtime cref list instead.
* eval.c (rb_eval): copy defn node before registering.
* eval.c (rb_load): clear ruby_cref before loading.
* variable.c (rb_const_get): no recursion to show full class path
for modules.
* eval.c (rb_set_safe_level): should set safe level in curr_thread
as well.
* eval.c (safe_setter): ditto.
* object.c (rb_obj_is_instance_of): nil belongs to false, not true.
* time.c (make_time_t): proper (I hope) daylight saving time
handling for both US and Europe. I HATE DST!
* eval.c (rb_thread_wait_for): non blocked signal interrupt should
stop the interval.
* eval.c (proc_eq): class check aded.
* eval.c (proc_eq): typo fixed ("return" was ommitted).
* error.c (Init_Exception): move NameError under StandardError.
* class.c (rb_mod_clone): should copy method bodies too.
* bignum.c (bigdivrem): should trim trailing zero bdigits of
remainder, even if dd == 0.
* file.c (check3rdbyte): safe string check moved here.
* time.c (make_time_t): remove HAVE_TM_ZONE code since it
sometimes reports wrong time.
* time.c (make_time_t): remove unnecessary range check for
platforms where negative time_t is available.
* process.c (proc_waitall): should push Process::Status instead of
Finuxm status.
* process.c (waitall_each): should add all entries in pid_tbl.
these changes are inspired by Koji Arai. Thanks.
* process.c (proc_wait): should not iterate if pid_tbl is 0.
* process.c (proc_waitall): ditto.
* numeric.c (flodivmod): a bug in no fmod case.
* process.c (pst_wifsignaled): should apply WIFSIGNALED for status
(int), not st (VALUE).
* io.c (Init_IO): value of $/ and $\ are no longer restricted to
strings. type checks are done on demand.
* class.c (rb_include_module): module inclusion should be check
taints.
* ruby.h (STR2CSTR): replace to StringType() and StringTypePtr().
* ruby.h (rb_str2cstr): ditto.
* eval.c (rb_load): should not copy topleve local variables. It
cause variable/method ambiguity. Thanks to L. Peter Deutsch.
* class.c (rb_include_module): freeze check at first.
* eval.c (rb_attr): sprintf() and rb_intern() moved into
conditional body.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r-- | process.c | 83 |
1 files changed, 30 insertions, 53 deletions
@@ -170,7 +170,7 @@ pst_wifsignaled(st) { int status = NUM2INT(st); - if (WIFSIGNALED(st)) + if (WIFSIGNALED(status)) return Qtrue; else return Qfalse; @@ -314,27 +314,13 @@ wait_each(key, value, data) return ST_DELETE; } -struct waitall_data { - int pid; - int status; - VALUE ary; -}; - static int waitall_each(key, value, data) int key, value; - struct waitall_data *data; + VALUE data; { - VALUE pid_status_member; - - if (data->status != -1) return ST_STOP; - - data->pid = key; - data->status = value; - pid_status_member = rb_ary_new2(2); - rb_ary_push(pid_status_member, INT2NUM(key)); - rb_ary_push(pid_status_member, INT2NUM(value)); - rb_ary_push(data->ary, pid_status_member); + last_status_set(value); + rb_ary_push(data, rb_assoc_new(INT2NUM(key), rb_last_status)); return ST_DELETE; } #endif @@ -346,11 +332,13 @@ proc_wait() #ifdef NO_WAITPID struct wait_data data; - data.status = -1; - st_foreach(pid_tbl, wait_each, &data); - if (data.status != -1) { - last_status_set(data.status); - return INT2FIX(data.pid); + if (pid_tbl) { + data.status = -1; + st_foreach(pid_tbl, wait_each, &data); + if (data.status != -1) { + last_status_set(data.status); + return INT2FIX(data.pid); + } } while (1) { @@ -416,17 +404,13 @@ proc_waitpid2(argc, argv) static VALUE proc_waitall() { - VALUE pid_status_ary, pid_status_member; + VALUE result; int pid, status; + + result = rb_ary_new(); #ifdef NO_WAITPID - struct waitall_data data; - - data.ary = pid_status_ary = rb_ary_new(); - data.status = -1; - st_foreach(pid_tbl, waitall_each, &data); - if (data.status != -1) { - last_status_set(data.status); - return pid_status_ary; + if (pid_tbl) { + st_foreach(pid_tbl, waitall_each, result); } for (pid = -1;;) { @@ -440,15 +424,11 @@ proc_waitall() } rb_sys_fail(0); } - pid_status_member = rb_ary_new2(2); - rb_ary_push(pid_status_member, INT2NUM(pid)); - rb_ary_push(pid_status_member, INT2NUM(status)); - rb_ary_push(pid_status_ary, pid_status_member); - } - if (RARRAY(pid_status_ary)->len != 0) last_status_set(status); + rb_ary_push(result, rb_assoc_new(INT2NUM(pid), rb_last_status)); + } #else - pid_status_ary = rb_ary_new(); + rb_last_status = Qnil; for (pid = -1;;) { pid = rb_waitpid(-1, 0, &status); if (pid == -1) { @@ -456,13 +436,10 @@ proc_waitall() break; rb_sys_fail(0); } - pid_status_member = rb_ary_new2(2); - rb_ary_push(pid_status_member, INT2NUM(pid)); - rb_ary_push(pid_status_member, INT2NUM(status)); - rb_ary_push(pid_status_ary, pid_status_member); + rb_ary_push(result, rb_assoc_new(INT2NUM(pid), rb_last_status)); } #endif - return pid_status_ary; + return result; } #ifndef HAVE_STRING_H @@ -564,7 +541,7 @@ proc_exec_n(argc, argv, progv) } args = ALLOCA_N(char*, argc+1); for (i=0; i<argc; i++) { - SafeStr(argv[i]); + SafeStringValue(argv[i]); args[i] = RSTRING(argv[i])->ptr; } args[i] = 0; @@ -694,7 +671,7 @@ proc_spawn_n(argc, argv, prog) SafeStr(argv[i]); args[i] = RSTRING(argv[i])->ptr; } - SafeStr(prog); + SafeStringValue(prog); args[i] = (char*) 0; if (args[0]) return proc_spawn_v(args, RSTRING(prog)->ptr); @@ -710,7 +687,7 @@ proc_spawn(sv) char **argv, **a; int status; - SafeStr(sv); + SafeStringValue(sv); str = s = RSTRING(sv)->ptr; for (s = str; *s; s++) { if (*s != ' ' && !ISALPHA(*s) && strchr("*?{}[]<>()~&|\\$;'`\"\n",*s)) { @@ -753,12 +730,12 @@ rb_f_exec(argc, argv) argv[0] = RARRAY(argv[0])->ptr[1]; } if (prog) { - SafeStr(prog); + SafeStringValue(prog); } if (argc == 1 && prog == 0) { VALUE cmd = argv[0]; - SafeStr(cmd); + SafeStringValue(cmd); rb_proc_exec(RSTRING(cmd)->ptr); } else { @@ -876,7 +853,7 @@ rb_f_system(argc, argv) } cmd = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" ")); - SafeStr(cmd); + SafeStringValue(cmd); status = do_spawn(RSTRING(cmd)->ptr); last_status_set(status); @@ -900,7 +877,7 @@ rb_f_system(argc, argv) } cmd = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" ")); - SafeStr(cmd); + SafeStringValue(cmd); status = system(RSTRING(cmd)->ptr); last_status_set((status & 0xff) << 8); @@ -957,10 +934,10 @@ rb_f_system(argc, argv) } if (prog) { - SafeStr(prog); + SafeStringValue(prog); } for (i = 0; i < argc; i++) { - SafeStr(argv[i]); + SafeStringValue(argv[i]); } retry: switch (pid = vfork()) { |