diff options
| author | Yukihiro Matsumoto <matz@ruby-lang.org> | 1997-10-02 17:59:18 +0900 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2019-08-17 22:09:32 +0900 |
| commit | 10d21745c8c1c3c78678ea7e0b62c0a7433ccfce (patch) | |
| tree | 4e40254178d66c343cae763029131d959518f795 /file.c | |
| parent | ce930d042913722f209bbd3209b6c90a3c71325f (diff) | |
version 1.0-971002v1_0_971002
https://cache.ruby-lang.org/pub/ruby/1.0/ruby-1.0-971002.tar.gz
Thu Oct 2 17:59:18 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-971002
Wed Oct 1 14:01:49 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* ext/marshal/marshal.c (w_byte): argument must be char.
Wed Oct 1 10:30:22 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* ext/marshal/marshal.c (marshal_dump): try to set binmode.
* ext/marshal/marshal.c (r_object): forgot to re-regist structs in
the object table.
* eval.c (ruby_options): call Init_ext() before any require()
calls by `-r'.
Tue Sep 30 14:51:07 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970930
Fri Sep 30 14:29:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* ext/marshal/marshal.c (w_object): marshal dumped core.
Tue Sep 30 10:27:39 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* sample/test.rb: bignum test suits added.
Mon Sep 29 13:37:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* ruby.c (forbid_setid): forbid some options in suid mode.
Mon Sep 27 09:53:48 1997 EGUCHI Matsumoto <eguchi@shizuokanet.or.jp>
* bignum.c: modified for speeding.
Fri Sep 26 18:27:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* sample/from.rb: some extensions.
Mon Sep 29 13:15:56 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* parse.y (lhs): no more syntax error on `obj.CONSTANT = value'.
Fri Sep 26 14:41:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (ruby_run): deferred calling Init_ext() just before eval_node.
Fri Sep 26 13:27:24 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* io.c (io_isatty): forgot to return TRUE value.
Fri Sep 25 11:10:58 1997 EGUCHI Osamu <eguchi@shizuokanet.or.jp>
* eval.c: use _setjmp/_longjmp instead of setjmp/longjmp on some
platforms.
Wed Sep 24 17:43:13 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* string.c (Init_String): String#taint and String#taint? added.
Wed Sep 24 00:57:00 1997 Katsuyuki Okabe <HGC02147@niftyserve.or.jp>
* X68000 patch.
Tue Sep 23 20:42:30 1997 EGUCHI Osamu <eguchi@shizuokanet.or.jp>
* parse.y (node_newnode): SEGV on null node setup.
Mon Sep 22 11:22:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* ruby.c (ruby_prog_init): wrong safe condition check.
Sun Sep 21 14:46:02 1997 MAEDA shugo <shugo@po.aianet.ne.jp>
* error.c (exc_inspect): garbage added to classpath.
Fri Sep 19 11:49:23 1997 <matz@netlab.co.jp>
* version 1.0-970919
* parse.y (newtok): forgot to adjust buffer size when shrinking
the token buffer.
* enum.c (enum_find): rb_eval_cmd() does not return value.
* io.c (pipe_open): close fds on pipe exec. fcntl(fd, F_SETFD, 1)
no longer used.
Tue Sep 16 17:54:25 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* file.c (f_test): problem if wrong command specified.
* ruby.c (ruby_prog_init): close stdaux and stdprn for MSDOS.
* ruby.c (ruby_prog_init): should not add path from environment
variable, if ruby is running under seuid.
* process.c (init_ids): check suid check for setuid/seteuid etc.
Mon Sep 15 00:42:04 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* regex.c (re_compile_pattern): \w{3} and \W{3} did not work.
Thu Sep 11 10:31:48 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970911
* ext/socket/socket.c (sock_new): no setbuf() for NT.
* io.c (rb_fopen,rb_fdopen): set close-on-exec for every fd.
Wed Sep 10 15:55:31 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970910
* ext/marshal/marshal.c (r_bytes0): extra big length check.
Tue Sep 9 16:27:14 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* io.c (pipe_fptr_atexit): clean up popen()'ed fptr.
* error.c (set_syserr): some system has error code that is bigger
than sys_nerr. grrr.
Tue Sep 9 16:27:14 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970909
* error.c (set_syserr): some system has error code that is bigger
than sys_nerr. grrr.
Wed Sep 3 18:11:00 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970903
* eval.c (f_load): expand path if fname begins with `~'.
Mon Sep 1 13:42:48 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (rb_call): alias occured in the module body caused SEGV.
Fri Aug 29 11:10:21 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* parse.y (yylex): spaces can follow =begin/=end.
* variable.c (find_class_path): look for class_tbl also for
unnamed fundamental classes, such as Object, String, etc.
* variable.c (rb_name_class): can't name class before String class
is initilialized.
* inits.c (rb_call_inits): unrecognized dependency from GC to
Array.
* variable.c (find_class_path): could not find class if Object's
iv_tbl is NULL.
Thu Aug 28 13:12:05 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* parse.y (yylex): revised `=begin' skip code.
* eval.c (is_defined): separated from rb_eval().
Wed Aug 27 11:32:42 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* variable.c (fc_i): some classes/modules does not have iv_tbl.
* variable.c (find_class_path): avoid inifinite loop.
Tue Aug 26 13:43:47 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (rb_eval): undef'ing non-existing method will raise
NameError exception.
* object.c (class_s_new): needed to create metaclass too.
* eval.c (error_print): no class name print for anonymous class.
* eval.c (rb_longjmp): proper exception raised if raise() called
without arguments, with $! or $@ set.
* object.c (Init_Object): superclass()'s method argument setting
was wrong again.
Mon Aug 25 11:53:11 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* sample/ruby-mode.el (ruby-parse-region): auto-indent now
supports "\\" in the strings.
* struct.c (struct_getmember): new API to get member value from C
language side.
Fri Aug 22 14:26:40 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (error_print): modified exception print format.
Thu Aug 21 16:10:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* sample/ruby-mode.el (ruby-calculate-indent): wrong indent level
calculated with keyword operators.
Thu Aug 21 11:55:41 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970821
Thu Aug 21 11:36:58 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* parse.y (arg): ary[0] += 1 cause SEGV
Wed Aug 20 14:24:42 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970820
* eval.c (rb_call): infinite loop bug
Tue Aug 19 00:15:38 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.0-970819
* eval.c (rb_call): did not raise ArgumentError if too many
arguments more than optional arguments (without rest arg).
* eval.c (rb_eval): did not work well for op_asgn2 (attribute
self assignment).
Mon Aug 18 09:25:56 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* object.c (inspect_i): did not display T_DATA instance variables.
* parse.y: provides more accurate line number information.
* eval.c (thread_value): include value's backtrace information in
the variable `$@'.
* eval.c (f_abort): print backtrace and exit.
Sat Aug 16 00:17:44 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* object.c (class_s_new): do not make subclass of singleton class.
Fri Aug 15 15:49:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (call_trace_func): block context switch in the trace
function.
* eval.c (rb_eval): clear method cache at class extention.
Fri Aug 15 19:40:43 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* ext/socket/socket.c (Init_socket): small typo caused SEGV.
Tue Aug 12 16:02:18 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* variable.c: option variables: $-0, $-p(readonly), $-v,
$-I(load_path), $-a(readonly), $-K, $-d, $-F, $-i, $-l.
* parse.y (yylex): ignore rd (ruby document) in the code.
Mon Aug 11 12:37:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* re.c (Init_Regexp): $-K as alias to the $KCODE.
* io.c (Init_IO): new virtual variable $-i for the value of -i
option.
* enum.c (Init_Enumerable): include? as alias of member?
Fri Aug 8 11:16:50 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* io.c (io_foreach): now the record separator can be specified.
* io.c (io_s_readlines): new method to read in whole file (or
command output) from path.
* ext/socket/socket.c (Init_socket): recvfrom did not work.
* ext/socket/socket.c (sock_send): forgot to check nil for false
value.
Thu Aug 7 11:40:01 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* object.c (Init_Object): remove private_attr/public_attr.
Wed Aug 6 14:21:36 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* object.c (mod_attr): forgot to check nil for false value.
Mon Aug 4 11:50:28 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* variable.c (rb_class_path): scan class constants for anonymous
classes/modules to make up pathes.
Wed Jul 30 08:45:12 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (rb_eval): stop to cache const value in nodes.
Sat Jul 26 03:17:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* numeric.c (flo_to_s): wrong .0 at end.
Sat Jul 26 00:36:36 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (error_print): always print exception type in the
toplevel exception handler.
* string.c (str_hash): wrong hash value.
Thu Jul 24 11:05:51 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
* string.c (uscore_get): proper error message for unset $_.
Wed Jul 23 09:56:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* object.c (obj_methods): returns list of method names of the
specified object.
* class.c (mod_instance_methods): returns list of method names of
the class instnace.
Fri Jul 11 22:38:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* object.c (class_superclass): returns class's superclass
itself. (1.1)
* object.c (obj_type): returns object's class itself. (1.1)
* class.c (mod_included_modules): list included modules.
* object.c (class_superclass): raises error for Object.
Thu Jul 3 09:54:02 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (SETUP_ARGS): save source position, remove nd_line().
* eval.c (rb_call): replace modulo by bit-masking.
* eval.c (POP_SCOPE): force recycle scope object to reduce gc rate.
* gc.c (obj_free): aboid calling run_final() when no finalizer is set.
* eval.c (PUSH_VARS): do not allocate the dynamic scope's end-mark
object.
Wed Jul 2 14:25:07 1997 KIMURA Koichi <kkimura@pure.cpdc.canon.co.jp>
* Native mswin32 support.
Tue Jul 1 09:59:00 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970701
* parse.y (mrhs): allow rest-star(*) in right hand side.
Tue Jun 24 19:04:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970624
Sat Jun 20 22:22:51 1997 Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
* eval.c: freebsd 3.0 <sys/select.h> support.
Fri Jun 20 01:24:45 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970620
* gc.c: eliminate uninitilalized field of Hash, Array etc., to
avoid dumping core.
Thu Jun 19 01:29:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970619
* string.c (str_split_method): wrong limit.
Sat Jun 14 01:54:16 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* class.c (rb_singleton_class): no singleton for special
constants (now raises exception).
* eval.c (ruby_init): cbase in TOPLEVEL_BINDING need to be
initialized.
Sat Jun 14 01:01:16 1997 maeda shugo <shugo@po.aianet.ne.jp>
* array.c (sort_2): wrong comparison.
Sat Jun 14 00:53:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* hash.c (hash_foreach): safe iteration.
Fri Jun 13 14:04:56 1997 Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
* configure.in: -Bshareable option for netbsd.
Fri Jun 13 01:16:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* io.c (pipe_open): call io_unbuffered() only for writable pipes.
Thu Jun 12 01:14:15 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970612
* ext/socket/socket.c (sock_new): use io_unbuffered().
* ext/marshal/marshal.c (w_long): compact long format, which
supports 64 bit architectures (unless longs are >32 bit size).
* ext/marshal/marshal.c: allows recursive data for marshaling.
* parse.y (rb_intern): raise exception for non-internable string.
* ext/marshal/marshal.c (marshal_load): allows direct loading from
strings.
* ext/marshal/marshal.c (marshal_dump): allows direct dump to strings.
* ext/marshal/marshal.c (marshal_dump): interface changed.
Wed Jun 11 18:26:00 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* gc.c (rb_newobj): remove needless memset().
Mon Jun 9 13:03:43 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (rb_eval): reduce condition checks from while/until loop.
* eval.c (rb_eval): wrong jump point for `next'.
Fri Jun 6 11:47:39 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.c (ruby_set_argv): initialize dln_argv0 for dln_a_out.
* ext/socket/socket.c (open_unix): display path name for exceptions.
* ruby.c (proc_options): option -S did not work well.
Fri May 30 02:14:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970530
* eval.c (eval): set $! properly if exception raised in eval().
* io.c (io_write): now handles non T_FILE object.
* io.c (io_defset): $< can be anything which has `write' method.
Thu May 29 15:40:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (eval): $@ is always an array (not string).
* pack.c (pack_unpack): avoid corrupting memory for unexpected
input strings.
Wed May 28 12:46:13 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970528
* process.c (rb_waitpid): do not block other threads.
Tue May 27 12:02:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (ruby_init): split initialize and processing command line
options.
* ruby.c (ruby_options): ruby_init(0, 0, envp) dumps core.
Tue May 20 18:59:45 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* variable.c (rb_ivar_set): invalid instance variable access for
built-in object raises TypeError.
Fri May 16 17:32:21 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970516
* dir.c (push_globs): was freeing non heap pointer.
* gc.c: remove some duplicated prototypes.
* ext/kconv/kconv.c: fix prototypes.
Fri May 9 11:38:59 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970509
* gc.c (obj_free): avoid free(NULL).
* eval.c (rb_check_safe_str): argument missing for TypeError().
Thu May 8 01:14:28 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* file.c (file_s_dirname): need to return "." for path without
slashes.
Wed May 7 19:18:48 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* process.c (f_fork): child processe does not inherit parent's
itimer setting on linux. call setitimer() again in the child
process.
Sat May 3 02:49:43 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ext/curses/curses.c: modified for portability and add to the
standard distribution.
Wed Apr 30 00:34:00 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* file.c (file_s_size): returns 0 for empty files (not FALSE).
Fri Apr 25 02:17:50 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970425
* eval.c (f_load): free unused name-table.
* eval.c (f_load): copy local variable name-table.
* gc.c (obj_free): avoid free(NULL).
* eval.c (rb_eval): forgot to make link from the scope object to
NODE_SCOPE. It may crash the interpreter.
Thu Apr 24 00:35:09 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* random.c (f_srand): save old seed anyway. srand() returns no
value on some systems.
* gc.c (obj_free): avoid double free of the local variable name
table.
* parse.y (top_local_setup): modify realloc to handle offset.
Tue Apr 22 12:58:26 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970422
Thu Apr 17 00:40:51 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* configure.in (rb_cv_bsdpgrp): proper check for BSD
setpgrp/setpgrp.
Wed Apr 16 16:14:02 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (proc_call): proc called in other thread must be orphan.
Tue Apr 15 10:46:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970415
* gc.c (obj_free): NODE_SCOPE marked from SCOPE object.
* gc.c (gc_mark): some nodes marked wrong.
* process.c (proc_getpgrp): wrong argument
Fri Apr 14 18:32:42 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970414
Fri Apr 12 01:20:12 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.h: String pointer changed to unsigned char.
Fri Apr 11 10:27:29 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970411
* Makefile.in: create libruby.a before linking ruby.
* string.c (str_strip_bang): >0x80 characters for isspace().
* eval.c (proc_call): set safe-level temporally
* eval.c (proc_s_new): save safe-level in the proc context.
* eval.c (rb_eval): no class/module extention in safe mode.
Thu Apr 10 02:10:41 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* gc.c (gc_mark): remove some pointer checks for speeding up.
* ruby.c (ruby_options): set $0 temporally for -r option.
* eval.c: built-in security feature.
* gc.c (gc_sweep): do not free nodes during compile.
* parse.y (yycompile): set flag when compiling.
Wed Apr 9 10:19:02 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.c: forgot to include <ctype.h> for isspace().
* file.c: provide S_ISREG for some platforms.
* io.c (Init_IO): added some $< operations.
* lib/ping.rb: check host upness using TCP echo.
Tue Apr 8 00:10:15 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (arg_read): bug with 0 length input.
Mon Apr 7 11:36:16 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ext/fcntl/fcntl.c: module for fcntl constants.
* eval.c (rb_alias): bug when original was an alias.
* parse.y (primary): syntax to access singleton class.
* eval.c (mod_public_method): method's to specify visibitily of
the class methods. make_method_{public,private} removed.
Fri Apr 4 21:43:57 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970404
* gc.c (obj_free): finalizer added for experiment.
Thu Apr 3 02:12:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_schedule): make Fatal rise on main_thread on
deadlocks.
* eval.c (thread_join): raise ThreadError instead of Fatal, in
case of deadlock.
* regex.c (re_compile_fastmap): uninitialized local variable.
* parse.y (parse_regx): new option //[nes] to specify character
code for regexp literals. Last specified code option is valid.
* re.c (reg_s_new): addtional 3rd argument to specify compiled
regexp's character code.
* re.c (reg_new_1): regexp character code can be specified for
each regexp object.
Wed Apr 2 14:51:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_create): handle uncaught throw.
* eval.c (thread_create): halt on some deadlock conditions.
* regex.c (is_in_list): wrong result for non-mbc higher-byte
characters.
* regex.c (re_match): wrong skip for multi-byte characters.
* regex.c (re_compile_fastmap): wrong fastmap in non-mbc mode.
* hash.c (Init_Hash): hash compatible features added to ENV.
Tue Apr 1 15:24:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (obj_extend): remove Object#extend as an iterator which
is in experimental state, since it unveils internal singleton
classes.
Mon Mar 31 14:29:39 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970331
Sun Mar 30 19:40:57 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* parse.y (terms): avoided win32 gcc's optimization bug.
Sat Mar 29 11:21:58 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* struct.c (make_struct): St[val,..] creates new structure.
Fri Mar 28 11:24:51 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (obj_make_private): new method make_method_{public,private}
to change visibility of singleton methods.
* regex.c (re_compile_pattern): enables numeric literal >= 0x80 in
the character class.
* regex.c (re_compile_pattern): enabled numeric literal >= 0x80,
in multibyte mode.
* regex.c (re_compile_fastmap): modified exantn and charset(_not)
to set fastmap for higher bytes properly.
* regex.c (is_in_list): now matches numeric literals.
Thu Mar 27 13:34:20 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* pack.c (pack_unpack): extra null byte after unpacked string.
Wed Mar 26 15:20:34 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* regex.c (re_compile_pattern): register numbers must be fit in a
byte (0 <= regnum <= 0xff).
* regex.c (re_compile_fastmap): forgot to set mbchar map for
charset_not if RE_MBCTYPE is on.
* regex.c (re_compile_pattern): set list bits for multi-byte
characters for \W, \S, \D in range expression.
* object.c (obj_is_kind_of): defined that nil itself is kind of
nil. TRUE is kind of TRUE, FALSE is kind of FALSE likewise.
This change makes `obj.kind_of?(eval(obj.type))' always true.
Tue Mar 25 14:08:43 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* lib/English.rb: provides nicer English alias for the variables.
* parse.y (expr): alias $var1 $var2 makes alias of the global
variable.
Mon Mar 24 18:23:20 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970324
Thu Mar 20 22:04:59 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (mod_modfunc): forget to clear method cache.
Wed Mar 19 17:06:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* parse.y (program): set methods' default private/public status
correctly under eval().
* eval.c (eval): set the_class correctly while evaluating string.
Tue Mar 18 12:23:53 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (eval): yield can be called from eval().
* version 1.0-970318
* parse.y (program): regexp in condition expression should do
matching operation with $_.
* re.c (reg_regsub): wrong substitution.
Fri Mar 14 14:36:28 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* hash.c (hash_invert): returns value to key mapping of the
associative array.
* ext/socket/extconf.rb: set environment variable SOCKS_SERVER to
compile with libsocks.a.
* ext/socket/socket.c (socks_s_open): SOCKSsocket class to access
internet via SOCKS library.
* sprintf.c (f_sprintf): unsigned formats display leading double
dots for imaginary sequence of signed bit to the left.
* sprintf.c (f_sprintf): correct width and precision formatting
for big integers.
* parse.y (yylex): enables negative hex/octal numbers and `_' in
non-decimal numbers.
* sprintf.c (f_sprintf): %u added for unsigned decimal format.
Thu Mar 13 10:24:27 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* sprintf.c (f_sprintf): wrong output for bignums.
* array.c (ary_reverse_each): iterates in reverse order.
* pack.c (pack_unpack): L unpacked signed long.
* io.c (f_backquote): now returns an empty string for no output.
Wed Mar 12 10:20:30 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ext/socks/socks.c: socket module with socks library.
Mon Mar 10 20:44:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* re.c (reg_regsub): \& for substitution. \`, \', and \+ are
avaiable also.
Thu Mar 6 01:47:03 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970306
* sample/rubydb.el (gud): ruby debugger emacs interface
* lib/debug.rb: ruby debugger
* parse.y (exprs): more accurate line number display.
Wed Mar 5 21:31:46 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970305
Tue Mar 4 12:28:32 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.c (proc_options): search through RUBYPATH and PATH for
option -S.
Mon Mar 3 22:44:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_status): returns nil for exception terminated
threads.
* eval.c (thread_value): re-raise exceptions.
Sat Mar 1 00:59:47 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (rb_eval): restore $! value after rescue clause, to
re-raise exceptions correctly.
Fri Feb 28 16:43:38 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970228
Thu Feb 27 11:23:41 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (rb_yield_0): redo raises exception
* eval.c (thread_schedule): bug in interrupt handling by rescue.
Wed Feb 26 00:55:36 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (eval): forgot to restore dynamic local variable
bindings.
Tue Feb 25 11:22:08 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ext/aix_ld.rb: AIX dynamic load support (not tested).
* eval.c (rb_eval): wrong return value for defined? super.
* error.c (exception): more error check.
* re.c (reg_regsub): wrong substitution when sub expanded to null
string.
Fri Feb 21 13:01:47 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970221
* eval.c (f_require): volatile added. register variable was
recycled, so that GC did not mark that variable.
* object.c (Init_Object): forget to mark main object (was mostly
ok, but made trouble with early GC.)
Thu Feb 20 11:50:50 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970220
Thu Feb 20 11:25:50 1997 Yasuo OHBA <jammy@shljapan.co.jp>
* lib/date.rb: update
Thu Feb 20 08:25:57 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* parse.y (yylex): forgot tokfix() before rb_intern().
* lib/tk.rb (TkVariable): give up using trace_var.
Wed Feb 19 00:24:35 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970219
* pack.c (pack_pack): packed by null for A specifier. must be
space filled.
* pack.c (pack_unpack): bug in skipping spaces
* gc.c (xmalloc): garbage collect for every 4 Meg. allocation.
* string.c (str_split_method): limit worked wrong way.
* io.c (io_gets_method): misunderstand 0xff in binary files when
$/ == nil.
* re.c (reg_regsub): re-implement.
* ext/socket/socket.c (thread_connect): remove O_NONBLOCK, which
is not defined on some platform like NeXT.
Mon Feb 17 13:08:30 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970217
* object.c (mod_eqq): === extended for subclass check (to use case
as typecase).
Sat Feb 15 02:07:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* regex.c (re_compile_pattern): wrong match backref at end of pattern.
* io.c (arg_read): now works beyond end of file.
Thu Feb 13 16:21:24 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* parse.y (expr): return/yield now accept normal argument format.
* parse.y (yylex): a star in `yield *x' must not be multiplication
operator.
Wed Feb 12 15:06:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* time.c (time_plus): bug in simple addition.
* eval.c (thread_raise): raise exceptions from outside.
* eval.c (Init_Thread): Thread#alive? -- alias for Thread#status.
Mon Feb 10 00:38:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* ruby.h (Data_Make_Struct): rename macros.
Sun Feb 8 11:48:13 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (f_syscall): argument offset was wrong.
Fri Feb 7 18:01:17 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970207
* eval.c: add volatiles to avoid variable crobbering by longjmp().
* eval.c (f_raise): 1st argument can be the GlobalExit object now.
* array.c (ary_unshift): no longer accept more than 2 args.
* eval.c (f_raise): bug if 2nd argument is the exception.
Tue Feb 4 00:37:29 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970204
* eval.c (eval): check compile errors by nerrs.
* eval.c (rb_eval): check syntax error by nerrs, not by the return
value, which may be NULL.
* eval.c (compile): Do not clear errinfo.
Mon Feb 3 10:13:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (obj_extend): move real inclusion to Module#extend_object
to allow redfinition.
* object.c (Init_Object): Kernel class is now Module. Object class
became the true root class.
* object.c (obj_inspect): remove useless buffer.
* hash.c (any_cmp): disable interrupts and context switching.
* st.c: remove ALLOW_INTS to disable interrupt during operations.
Fri Jan 31 22:10:08 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* hash.c (hash_rehash): re-register all key-value.
Thu Jan 30 02:14:49 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (io_reopen): re-implement according to clone() way.
* io.c (io_clone): copy IO object.
* struct.c (struct_eql): compare elements by eql?.
* io.c (io_mode_flags): detect "rb", "wb" etc.
* io.h (FMODE_BINMODE): added.
* ext/socket/socket.c (Init_socket): undef BasicSocket.new
* file.c (Init_File): File.new(path[,mode])
* io.c (Init_IO): IO.new(fd[,mode])
* eval.c (rb_method_boundp): forgot to enable priv argument.
* object.c (Init_Object): remove `=~' from Kernel class.
* ext/socket/socket.c (open_inet): initialize sockaddr before
calling bind(2).
* sample/ruby-mode.el (ruby-calculate-indent): skip comment lines
Wed Jan 29 18:43:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (Init_Thread): DEFER_INTS during initializing threads.
* hash.c (Init_Hash): Hash#eql? checks for object identity.
* eval.c (thread_set_critical): wrong value assigned.
Mon Jan 27 16:10:51 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (io_print): remove print_on().
* eval.c (f_missing): proper error message for undefined method
without argument
Sat Jan 25 23:32:32 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* string.c (str_sub_s): false alert - sub() does not modify string.
* array.c (ary_times): negative multiplication detected
* string.c (str_times): negative multiplication detected
Fri Jan 24 10:51:39 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* time.c (time_arg): month -> 0 == "jan" == "1" == "01", little bit
confusing but wanted to conform japanese style.
* version 1.0-970124
Fri Jan 24 09:52:49 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* util.c (_fixpath): supports SJIS filenames on DJGPP.
Thu Jan 23 16:52:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* README.EXT: update. partially translated into English.
* ext/extmk.rb.in: inherit $LDFLAGS to the final link.
* ext/socket/socket.c (Init_socket): add various constants.
Mon Jan 23 11:40:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* eval.c (Init_Thread): allocate main_thread first to avoid crash.
Thu Jan 23 02:09:26 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* gc.c (ObjectSpace): API modified. each_object method will do all
the iteration.
* eval.c (proc_call): wrong return from nested lambda.
* ext/GD/GD.c: debugged.
Wed Jan 22 16:12:25 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970122
* gc.c (gc_mark): forgot to mark match->str.
* ext/GD/GD.c: GD interface module.
* eval.c (PUSH_BLOCK): wrong value pushed as the block level.
Mon Jan 20 14:01:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_run): no context switch in the critical section.
Mon Jan 20 09:40:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
* utils.c: supports 8+3 filenames
Sat Jan 18 01:23:03 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970118
* regex.c (PATFETCH): need cast to unsigned char.
* io.c (io_ctl): bug in case when arg is not a string.
* lib/tk.rb: forgot that Kernel#type returns the class name now.
* regex.c (re_search): "abc\n" =~ "^$" should not match.
Fri Jan 17 12:31:37 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970117
* ruby.c (ruby_options): constant PLATFORM, which is in the {cpu}-{os}
form, defined.
* configure.in: platform infomation embedded in the interpreter.
* regex.c (re_search): /^$/ did not match to "" by wrong exit condition.
* lib/thread.rb: re-write Mutex/Queue based on Thread.critical.
* eval.c (thread_set_critical): remove Thread.exclusive, add
Thread.critical = TRUE/FALSE instead.
* re.c (reg_search): re-compile pattern if needed
* regex.c (PATFETCH): do translate at compile time
Thu Jan 16 00:49:10 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* gc.c (gc_mark_frame): forgot to mark frame->cbase.
* regex.c (re_compile_pattern): /a$|b)/ causes error.
* regex.c (re_compile_pattern): /(^|b)/ causes error.
* version 1.0-970116
* re.c (Init_Regexp): set RE_CONTEXTUAL_INVALID_OPS flag.
Tue Jan 14 02:09:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (proc_call): Proc#callをイテレータとして呼んだ時に対応
* configure.in: nextstep対応？
* eval.c (rb_eval): a[b]=cで無駄な配列を割り当てない
* eval.c (f_send): イテレータとして呼ばれたらイテレータとしてメソッ
ドを呼ぶ．
* string.c (str_new4): match共有用の生成関数
* re.c (reg_search): matchの実体(文字列)をマッチを行った文字列と
copy-on-writeで共有
* string.c (str_hash): toupperをかける条件が違っていた
* array.c (sort_2): FixnumとStringを特別扱いして高速化
Mon Jan 13 11:03:53 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* eval.c (thread_create): threadが生成されるまで割込みを設定しない
* eval.c (Init_Thread): 割込みタイミングを100msecに
Sat Jan 11 00:17:05 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* regex.c (re_search): マッチに失敗する場合があった(本当に直ったか？)
* io.c (io_ioctl,io_fcntl): 第2引数を省略可能に
* io.c (io_ioctl,io_fcntl): 戻り値がIOだった．整数(システムコール
の戻り値)を返すようにした．
* io.c (io_ctl): 引数が整数の時に対応
* io.c (io_fcntl): file.cから移動
Fri Jan 10 17:01:47 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* version 1.0-970110
* ext/socket/socket.c (thread_connect): open(connect(2))で他の
threadをブロックしないように
* eval.c (thread_create): exitでないときにexitだと思い込む
Mon Jan 6 17:42:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* string.c (str_sub_s): 文字列長より長いoffsetの検出
* regex.c (re_search): 空にマッチするパターン後の$で失敗
Thu Jan 2 16:36:23 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* file.c (file_reopen): Fileのreopen(pathまたはIOで指定)．
* io.c (io_reopen): IOのreopen(IOで指定) -- change classつき
Wed Jan 1 11:09:01 1997 Yukihiro Matsumoto <matz@caelum.co.jp>
* io.c (f_select): timeoutでnilを返す
Fri Dec 27 13:06:44 1996 Yukihiro Matsumoto <matz@caelum.co.jp>
* file.c (file_s_open): サブクラスではそのクラスのインスタンスを返
すように．
Fri Dec 27 08:58:27 1996 ono@isl.nara.sharp.co.jp
* numeric.c (flo_to_s): index()を使わない．strstr()に．
Thu Dec 26 01:34:17 1996 Yukihiro Matsumoto <matz@caelum.co.jp>
* lib/tk.rb: placeが使えるように
* pack.c (endian): マクロDYNAMIC_ENDIANを指定すると実行時にendian
を判定するように．
* eval.c (thread_alloc): 初期化忘れのメンバがあった．
Co-authored-by: EGUCHI Matsumoto <eguchi@shizuokanet.or.jp>
Co-authored-by: EGUCHI Osamu <eguchi@shizuokanet.or.jp>
Co-authored-by: KIMURA Koichi <kkimura@pure.cpdc.canon.co.jp>
Co-authored-by: Katsuyuki Okabe <HGC02147@niftyserve.or.jp>
Co-authored-by: MAEDA shugo <shugo@po.aianet.ne.jp>
Co-authored-by: Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
Co-authored-by: WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
Co-authored-by: Yasuo OHBA <jammy@shljapan.co.jp>
Co-authored-by: maeda shugo <shugo@po.aianet.ne.jp>
Co-authored-by: ono <ono@isl.nara.sharp.co.jp>
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 299 |
1 files changed, 206 insertions, 93 deletions
@@ -26,10 +26,12 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #else -stuct timeval { +#ifndef NT +struct timeval { long tv_sec; /* seconds */ long tv_usec; /* and microseconds */ }; +#endif /* NT */ #endif #ifdef HAVE_UTIME_H @@ -46,8 +48,14 @@ stuct timeval { char *strrchr(); #endif +#ifdef NT +#include <sys/stat.h> +#endif + +#ifndef NT char *strdup(); char *getenv(); +#endif extern VALUE cIO; VALUE cFile; @@ -66,7 +74,6 @@ file_open(fname, mode) MakeOpenFile(port, fptr); fptr->mode = io_mode_flags(mode); - fptr->f = rb_fopen(fname, mode); fptr->path = strdup(fname); @@ -74,23 +81,77 @@ file_open(fname, mode) } static VALUE -file_s_open(argc, argv) +file_s_open(argc, argv, class) int argc; VALUE *argv; + VALUE class; { - VALUE fname, vmode; + VALUE fname, vmode, file; char *mode; - rb_scan_args(argc, argv, "11", &fname, &mode); - Check_Type(fname, T_STRING); - if (!NIL_P(mode)) { - Check_Type(mode, T_STRING); - mode = RSTRING(mode)->ptr; + rb_scan_args(argc, argv, "11", &fname, &vmode); + Check_SafeStr(fname); + if (!NIL_P(vmode)) { + Check_Type(vmode, T_STRING); + mode = RSTRING(vmode)->ptr; + } + else { + mode = "r"; + } + file = file_open(RSTRING(fname)->ptr, mode); + + RBASIC(file)->class = class; + return file; +} + +static VALUE +file_reopen(argc, argv, file) + int argc; + VALUE *argv; + VALUE file; +{ + VALUE fname, nmode; + char *mode; + OpenFile *fptr; + + if (rb_scan_args(argc, argv, "11", &fname, &nmode) == 1) { + if (TYPE(fname) == T_FILE) { /* fname must be IO */ + return io_reopen(file, fname); + } + } + + Check_SafeStr(fname); + if (!NIL_P(nmode)) { + Check_Type(nmode, T_STRING); + mode = RSTRING(nmode)->ptr; } else { mode = "r"; } - return file_open(RSTRING(fname)->ptr, mode); + + GetOpenFile(file, fptr); + if (fptr->path) free(fptr->path); + fptr->path = strdup(RSTRING(fname)->ptr); + fptr->mode = io_mode_flags(mode); + if (!fptr->f) { + fptr->f = rb_fopen(RSTRING(fname)->ptr, mode); + if (fptr->f2) { + fclose(fptr->f2); + fptr->f2 = NULL; + } + return file; + } + + if (freopen(RSTRING(fname)->ptr, mode, fptr->f) == NULL) { + rb_sys_fail(fptr->path); + } + if (fptr->f2) { + if (freopen(RSTRING(fname)->ptr, "w", fptr->f2) == NULL) { + rb_sys_fail(fptr->path); + } + } + + return file; } static int @@ -103,8 +164,11 @@ apply2files(func, args, arg) VALUE path; for (i=0; i<args->len; i++) { + Check_SafeStr(args->ptr[i]); + } + + for (i=0; i<args->len; i++) { path = args->ptr[i]; - Check_Type(path, T_STRING); if ((*func)(RSTRING(path)->ptr, arg) < 0) rb_sys_fail(RSTRING(path)->ptr); } @@ -200,7 +264,11 @@ file_isatty(obj) } #include <sys/types.h> +#ifndef NT #include <sys/file.h> +#else +#include "missing/file.h" +#endif #include <sys/stat.h> static VALUE @@ -243,7 +311,7 @@ file_s_stat(obj, fname) { struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) == -1) { rb_sys_fail(fname->ptr); } @@ -269,10 +337,10 @@ file_s_lstat(obj, fname) VALUE obj; struct RString *fname; { -#if !defined(MSDOS) +#if !defined(MSDOS) && !defined(NT) struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (lstat(fname->ptr, &st) == -1) { rb_sys_fail(fname->ptr); } @@ -286,7 +354,7 @@ static VALUE file_lstat(obj) VALUE obj; { -#if !defined(MSDOS) +#if !defined(MSDOS) && !defined(NT) OpenFile *fptr; struct stat st; @@ -335,6 +403,7 @@ eaccess(path, mode) char *path; int mode; { +#ifndef NT struct stat st; static int euid = -1; @@ -355,6 +424,19 @@ eaccess(path, mode) return 0; } +#if defined(DJGPP) + { + int stat_mode = 0; + if (mode & X_OK) + stat_mode |= S_IXOTH; + if (mode & W_OK) + stat_mode |= S_IWOTH; + if (mode & R_OK) + stat_mode |= S_IROTH; + mode = stat_mode; + } +#endif + if (st.st_uid == euid) /* owner */ mode <<= 6; else if (group_member (st.st_gid)) @@ -363,6 +445,9 @@ eaccess(path, mode) if (st.st_mode & mode) return 0; return -1; +#else /* !NT*/ + return 0; +#endif } static VALUE @@ -376,7 +461,7 @@ test_d(obj, fname) struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) return FALSE; if (S_ISDIR(st.st_mode)) return TRUE; return FALSE; @@ -394,7 +479,7 @@ test_p(obj, fname) struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) return FALSE; if (S_ISFIFO(st.st_mode)) return TRUE; @@ -424,7 +509,7 @@ test_l(obj, fname) #ifdef S_ISLNK struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (lstat(fname->ptr, &st) < 0) return FALSE; if (S_ISLNK(st.st_mode)) return TRUE; @@ -432,7 +517,7 @@ test_l(obj, fname) return FALSE; } -VALUE +static VALUE test_S(obj, fname) VALUE obj; struct RString *fname; @@ -454,7 +539,7 @@ test_S(obj, fname) #ifdef S_ISSOCK struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) return FALSE; if (S_ISSOCK(st.st_mode)) return TRUE; @@ -470,13 +555,15 @@ test_b(obj, fname) #ifndef S_ISBLK # ifdef S_IFBLK # define S_ISBLK(m) ((m & S_IFMT) == S_IFBLK) +# else +# define S_ISBLK(m) (0) /* anytime false */ # endif #endif #ifdef S_ISBLK struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) return FALSE; if (S_ISBLK(st.st_mode)) return TRUE; @@ -495,7 +582,7 @@ test_c(obj, fname) struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) return FALSE; if (S_ISBLK(st.st_mode)) return TRUE; @@ -509,7 +596,7 @@ test_e(obj, fname) { struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) return FALSE; return TRUE; } @@ -519,7 +606,7 @@ test_r(obj, fname) VALUE obj; struct RString *fname; { - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (eaccess(fname->ptr, R_OK) < 0) return FALSE; return TRUE; } @@ -529,7 +616,7 @@ test_R(obj, fname) VALUE obj; struct RString *fname; { - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (access(fname->ptr, R_OK) < 0) return FALSE; return TRUE; } @@ -539,7 +626,7 @@ test_w(obj, fname) VALUE obj; struct RString *fname; { - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (eaccess(fname->ptr, W_OK) < 0) return FALSE; return TRUE; } @@ -549,7 +636,7 @@ test_W(obj, fname) VALUE obj; struct RString *fname; { - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (access(fname->ptr, W_OK) < 0) return FALSE; return TRUE; } @@ -559,7 +646,7 @@ test_x(obj, fname) VALUE obj; struct RString *fname; { - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (eaccess(fname->ptr, X_OK) < 0) return FALSE; return TRUE; } @@ -569,11 +656,15 @@ test_X(obj, fname) VALUE obj; struct RString *fname; { - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (access(fname->ptr, X_OK) < 0) return FALSE; return TRUE; } +#ifndef S_ISREG +# define S_ISREG(m) ((m & S_IFMT) == S_IFREG) +#endif + static VALUE test_f(obj, fname) VALUE obj; @@ -581,7 +672,7 @@ test_f(obj, fname) { struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) return FALSE; if (S_ISREG(st.st_mode)) return TRUE; return FALSE; @@ -594,7 +685,7 @@ test_z(obj, fname) { struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) return FALSE; if (st.st_size == 0) return TRUE; return FALSE; @@ -607,7 +698,7 @@ test_s(obj, fname) { struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) return FALSE; if (st.st_size == 0) return FALSE; return int2inum(st.st_size); @@ -620,7 +711,7 @@ test_owned(obj, fname) { struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) return FALSE; if (st.st_uid == geteuid()) return TRUE; return FALSE; @@ -633,7 +724,7 @@ test_rowned(obj, fname) { struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) return FALSE; if (st.st_uid == getuid()) return TRUE; return FALSE; @@ -647,11 +738,9 @@ test_grpowned(obj, fname) #ifndef NT struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) return FALSE; if (st.st_gid == getegid()) return TRUE; -#else - Check_Type(fname, T_STRING); #endif return FALSE; } @@ -675,8 +764,8 @@ test_suid(obj, fname) VALUE obj; struct RString *fname; { - Check_Type(fname, T_STRING); #ifdef S_ISUID + Check_SafeStr(fname); return check3rdbyte(fname->ptr, S_ISUID); #else return FALSE; @@ -688,8 +777,8 @@ test_sgid(obj, fname) VALUE obj; struct RString *fname; { - Check_Type(fname, T_STRING); #ifndef NT + Check_SafeStr(fname); return check3rdbyte(fname->ptr, S_ISGID); #else return FALSE; @@ -710,14 +799,26 @@ test_sticky(obj, fname) } static VALUE -file_s_type(obj, fname) +file_s_size(obj, fname) + VALUE obj; + struct RString *fname; +{ + struct stat st; + + Check_SafeStr(fname); + if (stat(fname->ptr, &st) < 0) rb_sys_fail(fname->ptr); + return int2inum(st.st_size); +} + +static VALUE +file_s_ftype(obj, fname) VALUE obj; struct RString *fname; { struct stat st; char *t; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) rb_sys_fail(fname->ptr); if (S_ISREG(st.st_mode)) { @@ -732,7 +833,7 @@ file_s_type(obj, fname) t = "blockSpecial"; } #endif -#ifndef S_ISFIFO +#ifdef S_ISFIFO else if (S_ISFIFO(st.st_mode)) { t = "fifo"; } @@ -761,7 +862,7 @@ file_s_atime(obj, fname) { struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) rb_sys_fail(fname->ptr); return time_new(st.st_atime, 0); } @@ -787,7 +888,7 @@ file_s_mtime(obj, fname) { struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) rb_sys_fail(fname->ptr); return time_new(st.st_mtime, 0); } @@ -813,7 +914,7 @@ file_s_ctime(obj, fname) { struct stat st; - Check_Type(fname, T_STRING); + Check_SafeStr(fname); if (stat(fname->ptr, &st) < 0) rb_sys_fail(fname->ptr); return time_new(st.st_ctime, 0); } @@ -864,10 +965,11 @@ file_chmod(obj, vmode) OpenFile *fptr; int mode; + rb_secure(2); mode = NUM2INT(vmode); GetOpenFile(obj, fptr); -#if defined(DJGPP) || defined(__CYGWIN32__) +#if defined(DJGPP) || defined(__CYGWIN32__) || defined(NT) if (chmod(fptr->path, mode) == -1) rb_sys_fail(fptr->path); #else @@ -918,14 +1020,15 @@ file_s_chown(argc, argv) return INT2FIX(n); } -VALUE +static VALUE file_chown(obj, owner, group) VALUE obj, owner, group; { OpenFile *fptr; + rb_secure(2); GetOpenFile(obj, fptr); -#if defined(DJGPP) || defined(__CYGWIN32__) +#if defined(DJGPP) || defined(__CYGWIN32__) || defined(NT) if (chown(fptr->path, NUM2INT(owner), NUM2INT(group)) == -1) rb_sys_fail(fptr->path); #else @@ -972,6 +1075,7 @@ file_s_utime(argc, argv) #ifndef HAVE_UTIME_H # ifdef NT # include <sys/utime.h> +# define utimbuf _utimbuf # else struct utimbuf { long actime; @@ -1017,12 +1121,16 @@ file_s_link(obj, from, to) VALUE obj; struct RString *from, *to; { - Check_Type(from, T_STRING); - Check_Type(to, T_STRING); +#ifndef __human68k__ + Check_SafeStr(from); + Check_SafeStr(to); if (link(from->ptr, to->ptr) < 0) rb_sys_fail(from->ptr); return INT2FIX(0); +#else + rb_notimplement(); +#endif } static VALUE @@ -1030,9 +1138,9 @@ file_s_symlink(obj, from, to) VALUE obj; struct RString *from, *to; { -#if !defined(MSDOS) - Check_Type(from, T_STRING); - Check_Type(to, T_STRING); +#if !defined(MSDOS) && !defined(NT) + Check_SafeStr(from); + Check_SafeStr(to); if (symlink(from->ptr, to->ptr) < 0) rb_sys_fail(from->ptr); @@ -1047,18 +1155,18 @@ file_s_readlink(obj, path) VALUE obj; struct RString *path; { -#if !defined(MSDOS) +#if !defined(MSDOS) && !defined(NT) char buf[MAXPATHLEN]; int cc; - Check_Type(path, T_STRING); + Check_SafeStr(path); if ((cc = readlink(path->ptr, buf, MAXPATHLEN)) < 0) rb_sys_fail(path->ptr); return str_new(buf, cc); #else - rb_notimplement(); + rb_notimplement(); #endif } @@ -1086,8 +1194,8 @@ file_s_rename(obj, from, to) VALUE obj; struct RString *from, *to; { - Check_Type(from, T_STRING); - Check_Type(to, T_STRING); + Check_SafeStr(from); + Check_SafeStr(to); if (rename(from->ptr, to->ptr) == -1) rb_sys_fail(from->ptr); @@ -1107,7 +1215,7 @@ file_s_umask(argc, argv) umask(omask); } else if (argc == 1) { - omask = umask(NUM2INT(argv[1])); + omask = umask(NUM2INT(argv[0])); } else { ArgError("wrong # of argument"); @@ -1115,7 +1223,7 @@ file_s_umask(argc, argv) return INT2FIX(omask); } -static VALUE +VALUE file_s_expand_path(obj, fname) VALUE obj; struct RString *fname; @@ -1205,7 +1313,7 @@ file_s_expand_path(obj, fname) if (p == buf || *p != '/') p++; *p = '\0'; - return str_new2(buf); + return str_taint(str_new2(buf)); } static int @@ -1252,7 +1360,7 @@ file_s_basename(argc, argv) f = rmext(p, ext->ptr); if (f) return str_new(p, f); } - return str_new2(p); + return str_taint(str_new2(p)); } static VALUE @@ -1260,18 +1368,16 @@ file_s_dirname(obj, fname) VALUE obj; struct RString *fname; { - char *p; + UCHAR *p; Check_Type(fname, T_STRING); p = strrchr(fname->ptr, '/'); if (!p) { - return str_new(0,0); + return str_new2("."); } - return str_new(fname->ptr, p - fname->ptr); + return str_taint(str_new(fname->ptr, p - fname->ptr)); } -static VALUE separator; - static VALUE file_s_split(obj, path) VALUE obj, path; @@ -1279,12 +1385,21 @@ file_s_split(obj, path) return assoc_new(file_s_dirname(Qnil, path), file_s_basename(1,&path)); } +static VALUE separator; + +static VALUE +file_s_join(obj, args) + VALUE obj, args; +{ + return ary_join(args, separator); +} + static VALUE file_s_truncate(obj, path, len) VALUE obj, len; struct RString *path; { - Check_Type(path, T_STRING); + Check_SafeStr(path); #ifdef HAVE_TRUNCATE if (truncate(path->ptr, NUM2INT(len)) < 0) @@ -1324,6 +1439,7 @@ file_truncate(obj, len) GetOpenFile(obj, fptr); + rb_secure(2); if (!(fptr->mode & FMODE_WRITABLE)) { Fail("not opened for writing"); } @@ -1342,30 +1458,18 @@ file_truncate(obj, len) } static VALUE -file_fcntl(obj, req, arg) - VALUE obj, req; - struct RString *arg; -{ -#ifdef HAVE_FCNTL - io_ctl(obj, req, arg, 0); -#else - rb_notimplement(); -#endif - return obj; -} - -static VALUE file_flock(obj, operation) VALUE obj; VALUE operation; { - OpenFile *fptr; + OpenFile *fptr; GetOpenFile(obj, fptr); + rb_secure(2); if (flock(fileno(fptr->f), NUM2INT(operation)) < 0) { #ifdef EWOULDBLOCK - if (errno = EWOULDBLOCK) { + if (errno == EWOULDBLOCK) { return FALSE; } #endif @@ -1384,7 +1488,7 @@ test_check(n, argc, argv) n+=1; if (n < argc) ArgError("Wrong # of arguments(%d for %d)", argc, n); for (i=1; i<n; i++) { - Check_Type(argv[i], T_STRING); + Check_SafeStr(argv[i]); } } @@ -1398,8 +1502,13 @@ f_test(argc, argv) int cmd; if (argc == 0) ArgError("Wrong # of arguments"); - Need_Fixnum(argv[0]); - cmd = FIX2INT(argv[0]); + if (TYPE(argv[0]) == T_STRING && RSTRING(argv[0])->len == 1) { + cmd = RSTRING(argv[0])->ptr[0]; + } + else { + cmd = NUM2INT(argv[0]); + } + if (cmd == 0) return FALSE; if (strchr("bcdefgGkloOprRsSuwWxXz", cmd)) { CHECK(1); switch (cmd) { @@ -1519,7 +1628,7 @@ f_test(argc, argv) return FALSE; } -extern VALUE cKernel; +extern VALUE mKernel; void Init_File() @@ -1537,7 +1646,7 @@ Init_File() rb_define_module_function(mFileTest, "executable_real?", test_X, 1); rb_define_module_function(mFileTest, "file?", test_f, 1); rb_define_module_function(mFileTest, "zero?", test_z, 1); - rb_define_module_function(mFileTest, "size", test_s, 1); + rb_define_module_function(mFileTest, "size?", test_s, 1); rb_define_module_function(mFileTest, "owned?", test_owned, 1); rb_define_module_function(mFileTest, "grpowned?", test_grpowned, 1); @@ -1555,15 +1664,17 @@ Init_File() cFile = rb_define_class("File", cIO); rb_extend_object(cFile, CLASS_OF(mFileTest)); + rb_define_singleton_method(cFile, "new", file_s_open, -1); rb_define_singleton_method(cFile, "open", file_s_open, -1); rb_define_singleton_method(cFile, "stat", file_s_stat, 1); rb_define_singleton_method(cFile, "lstat", file_s_lstat, 1); - rb_define_singleton_method(cFile, "ftype", file_s_type, 1); + rb_define_singleton_method(cFile, "ftype", file_s_ftype, 1); rb_define_singleton_method(cFile, "atime", file_s_atime, 1); rb_define_singleton_method(cFile, "mtime", file_s_mtime, 1); rb_define_singleton_method(cFile, "ctime", file_s_ctime, 1); + rb_define_singleton_method(cFile, "size", file_s_size, 1); rb_define_singleton_method(cFile, "utime", file_s_utime, -1); rb_define_singleton_method(cFile, "chmod", file_s_chmod, -1); @@ -1582,9 +1693,12 @@ Init_File() rb_define_singleton_method(cFile, "basename", file_s_basename, -1); rb_define_singleton_method(cFile, "dirname", file_s_dirname, 1); - separator = INT2FIX('/'); + separator = str_new2("/"); rb_define_const(cFile, "Separator", separator); rb_define_singleton_method(cFile, "split", file_s_split, 1); + rb_define_singleton_method(cFile, "join", file_s_join, -2); + + rb_define_method(cFile, "reopen", file_reopen, -1); rb_define_method(cFile, "stat", file_stat, 0); rb_define_method(cFile, "lstat", file_lstat, 0); @@ -1606,10 +1720,9 @@ Init_File() rb_define_method(cFile, "rewind", file_rewind, 0); rb_define_method(cFile, "isatty", file_isatty, 0); rb_define_method(cFile, "tty?", file_isatty, 0); - rb_define_method(cFile, "eof", file_eof, 0); + rb_define_method(cFile, "eof", file_eof, 0); rb_define_method(cFile, "eof?", file_eof, 0); - rb_define_method(cIO, "fcntl", file_fcntl, 2); rb_define_method(cFile, "flock", file_flock, 1); # ifndef LOCK_SH @@ -1632,7 +1745,7 @@ Init_File() rb_define_method(cFile, "path", file_path, 0); - rb_define_method(cKernel, "test", f_test, -1); + rb_define_global_function("test", f_test, -1); sStat = struct_define("Stat", "dev", "ino", "mode", "nlink", "uid", "gid", "rdev", |