2000-05-09 08:53:16 +04:00
|
|
|
/**********************************************************************
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
ruby.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
$Date$
|
|
|
|
created at: Tue Aug 10 12:47:31 JST 1993
|
|
|
|
|
2003-01-16 10:34:03 +03:00
|
|
|
Copyright (C) 1993-2003 Yukihiro Matsumoto
|
2000-05-01 13:42:38 +04:00
|
|
|
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
|
2000-05-09 08:53:16 +04:00
|
|
|
Copyright (C) 2000 Information-technology Promotion Agency, Japan
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-05-09 08:53:16 +04:00
|
|
|
**********************************************************************/
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2005-11-05 07:43:46 +03:00
|
|
|
#ifdef __CYGWIN__
|
1998-01-16 15:19:22 +03:00
|
|
|
#include <windows.h>
|
|
|
|
#endif
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-15 06:18:08 +03:00
|
|
|
#ifdef _WIN32_WCE
|
|
|
|
#include <winsock.h>
|
2003-04-22 15:58:08 +04:00
|
|
|
#include "wince.h"
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-15 06:18:08 +03:00
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
#include "ruby.h"
|
|
|
|
#include "dln.h"
|
1999-01-20 07:59:39 +03:00
|
|
|
#include "node.h"
|
1998-01-16 15:13:05 +03:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <sys/types.h>
|
1999-01-20 07:59:39 +03:00
|
|
|
#include <ctype.h>
|
|
|
|
|
|
|
|
#ifdef __hpux
|
|
|
|
#include <sys/pstat.h>
|
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
2004-03-12 14:19:22 +03:00
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
|
|
# include <sys/param.h>
|
|
|
|
#endif
|
|
|
|
#ifndef MAXPATHLEN
|
|
|
|
# define MAXPATHLEN 1024
|
|
|
|
#endif
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
#include "util.h"
|
|
|
|
|
|
|
|
#ifndef HAVE_STDLIB_H
|
1998-01-16 15:13:05 +03:00
|
|
|
char *getenv();
|
1999-01-20 07:59:39 +03:00
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
VALUE ruby_debug = Qfalse;
|
|
|
|
VALUE ruby_verbose = Qfalse;
|
1999-10-16 14:33:06 +04:00
|
|
|
static int sflag = 0;
|
|
|
|
static int xflag = 0;
|
2002-05-29 09:20:39 +04:00
|
|
|
extern int ruby_yydebug;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
char *ruby_inplace_mode = Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 10:32:32 +04:00
|
|
|
static void load_stdin(void);
|
|
|
|
static void load_file(const char *, int);
|
|
|
|
static void forbid_setid(const char *);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE do_loop = Qfalse, do_print = Qfalse;
|
|
|
|
static VALUE do_check = Qfalse, do_line = Qfalse;
|
|
|
|
static VALUE do_split = Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-09-03 09:37:42 +04:00
|
|
|
static int origargc;
|
1998-01-16 15:19:22 +03:00
|
|
|
static char **origargv;
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
usage(const char *name)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
/* This message really ought to be max 23 lines.
|
1999-12-07 12:25:55 +03:00
|
|
|
* Removed -h because the user already knows that option. Others? */
|
1999-08-13 09:45:20 +04:00
|
|
|
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
static const char *usage_msg[] = {
|
1999-08-13 09:45:20 +04:00
|
|
|
"-0[octal] specify record separator (\\0, if no argument)",
|
|
|
|
"-a autosplit mode with -n or -p (splits $_ into $F)",
|
|
|
|
"-c check syntax only",
|
2000-01-05 07:41:21 +03:00
|
|
|
"-Cdirectory cd to directory, before executing your script",
|
1999-08-13 09:45:20 +04:00
|
|
|
"-d set debugging flags (set $DEBUG to true)",
|
|
|
|
"-e 'command' one line of script. Several -e's allowed. Omit [programfile]",
|
|
|
|
"-Fpattern split() pattern for autosplit (-a)",
|
|
|
|
"-i[extension] edit ARGV files in place (make backup if extension supplied)",
|
|
|
|
"-Idirectory specify $LOAD_PATH directory (may be used more than once)",
|
1999-08-24 12:21:56 +04:00
|
|
|
"-Kkcode specifies KANJI (Japanese) code-set",
|
1999-08-13 09:45:20 +04:00
|
|
|
"-l enable line ending processing",
|
2000-08-01 13:25:37 +04:00
|
|
|
"-n assume 'while gets(); ... end' loop around your script",
|
1999-08-13 09:45:20 +04:00
|
|
|
"-p assume loop like -n but print line also like sed",
|
|
|
|
"-rlibrary require the library, before executing your script",
|
|
|
|
"-s enable some switch parsing for switches after script name",
|
|
|
|
"-S look for the script using PATH environment variable",
|
|
|
|
"-T[level] turn on tainting checks",
|
2000-08-01 13:25:37 +04:00
|
|
|
"-v print version number, then turn on verbose mode",
|
|
|
|
"-w turn warnings on for your script",
|
2003-07-30 06:15:13 +04:00
|
|
|
"-W[level] set warning level; 0=silence, 1=medium, 2=verbose (default)",
|
1999-08-13 09:45:20 +04:00
|
|
|
"-x[directory] strip off text before #!ruby line and perhaps cd to directory",
|
|
|
|
"--copyright print the copyright",
|
|
|
|
"--version print the version",
|
|
|
|
NULL
|
|
|
|
};
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
const char **p = usage_msg;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2000-08-15 10:22:49 +04:00
|
|
|
printf("Usage: %s [switches] [--] [programfile] [arguments]\n", name);
|
1999-08-13 09:45:20 +04:00
|
|
|
while (*p)
|
2000-08-15 10:22:49 +04:00
|
|
|
printf(" %s\n", *p++);
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
extern VALUE rb_load_path;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
#define STATIC_FILE_LENGTH 255
|
|
|
|
|
2001-05-28 20:07:34 +04:00
|
|
|
#if defined _WIN32 || defined __CYGWIN__ || defined __DJGPP__
|
1999-08-13 09:45:20 +04:00
|
|
|
static char *
|
2005-09-12 15:03:24 +04:00
|
|
|
rubylib_mangle(const char *s, unsigned int l)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
static char *newp, *oldp;
|
|
|
|
static int newl, oldl, notfound;
|
2000-07-29 18:05:15 +04:00
|
|
|
static char newsub[STATIC_FILE_LENGTH+1];
|
2000-07-24 13:58:10 +04:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
if (!newp && !notfound) {
|
|
|
|
newp = getenv("RUBYLIB_PREFIX");
|
|
|
|
if (newp) {
|
|
|
|
char *s;
|
2000-07-24 13:58:10 +04:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
oldp = newp;
|
|
|
|
while (*newp && !ISSPACE(*newp) && *newp != ';') {
|
|
|
|
newp++; oldl++; /* Skip digits. */
|
|
|
|
}
|
|
|
|
while (*newp && (ISSPACE(*newp) || *newp == ';')) {
|
|
|
|
newp++; /* Skip whitespace. */
|
|
|
|
}
|
|
|
|
newl = strlen(newp);
|
|
|
|
if (newl == 0 || oldl == 0 || newl > STATIC_FILE_LENGTH) {
|
|
|
|
rb_fatal("malformed RUBYLIB_PREFIX");
|
|
|
|
}
|
2000-07-29 18:05:15 +04:00
|
|
|
strcpy(newsub, newp);
|
|
|
|
s = newsub;
|
1999-08-13 09:45:20 +04:00
|
|
|
while (*s) {
|
|
|
|
if (*s == '\\') *s = '/';
|
|
|
|
s++;
|
|
|
|
}
|
2001-05-02 08:22:21 +04:00
|
|
|
}
|
|
|
|
else {
|
1999-08-13 09:45:20 +04:00
|
|
|
notfound = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (l == 0) {
|
|
|
|
l = strlen(s);
|
|
|
|
}
|
2000-07-24 13:58:10 +04:00
|
|
|
if (!newp || l < oldl || strncasecmp(oldp, s, oldl) != 0) {
|
2000-07-29 18:05:15 +04:00
|
|
|
static char ret[STATIC_FILE_LENGTH+1];
|
2000-07-24 13:58:10 +04:00
|
|
|
strncpy(ret, s, l);
|
|
|
|
ret[l] = 0;
|
|
|
|
return ret;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
if (l + newl - oldl > STATIC_FILE_LENGTH || newl > STATIC_FILE_LENGTH) {
|
|
|
|
rb_fatal("malformed RUBYLIB_PREFIX");
|
|
|
|
}
|
2000-07-29 18:05:15 +04:00
|
|
|
strcpy(newsub + newl, s + oldl);
|
|
|
|
newsub[l + newl - oldl] = 0;
|
|
|
|
return newsub;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
1999-10-15 12:52:18 +04:00
|
|
|
#define rubylib_mangled_path(s, l) rb_str_new2(rubylib_mangle((s), (l)))
|
|
|
|
#define rubylib_mangled_path2(s) rb_str_new2(rubylib_mangle((s), 0))
|
1999-08-13 09:45:20 +04:00
|
|
|
#else
|
1999-10-15 12:52:18 +04:00
|
|
|
#define rubylib_mangled_path(s, l) rb_str_new((s), (l))
|
|
|
|
#define rubylib_mangled_path2(s) rb_str_new2(s)
|
1999-08-13 09:45:20 +04:00
|
|
|
#endif
|
|
|
|
|
2000-08-02 13:22:27 +04:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
ruby_push_include(const char *path, VALUE (*filter) (VALUE))
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
const char sep = PATH_SEP_CHAR;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
if (path == 0) return;
|
2001-05-28 20:07:34 +04:00
|
|
|
#if defined(__CYGWIN__)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
char rubylib[FILENAME_MAX];
|
1999-08-13 09:45:20 +04:00
|
|
|
conv_to_posix_path(path, rubylib, FILENAME_MAX);
|
1999-01-20 07:59:39 +03:00
|
|
|
path = rubylib;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (strchr(path, sep)) {
|
1999-08-13 09:45:20 +04:00
|
|
|
const char *p, *s;
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE ary = rb_ary_new();
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
p = path;
|
|
|
|
while (*p) {
|
1999-01-20 07:59:39 +03:00
|
|
|
while (*p == sep) p++;
|
2005-05-01 04:13:48 +04:00
|
|
|
if ((s = strchr(p, sep)) != 0) {
|
2005-04-21 01:44:20 +04:00
|
|
|
rb_ary_push(ary, (*filter)(rubylib_mangled_path(p, (int)(s-p))));
|
1998-01-16 15:13:05 +03:00
|
|
|
p = s + 1;
|
|
|
|
}
|
|
|
|
else {
|
2005-04-21 01:44:20 +04:00
|
|
|
rb_ary_push(ary, (*filter)(rubylib_mangled_path2(p)));
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2000-08-01 13:25:37 +04:00
|
|
|
rb_ary_concat(rb_load_path, ary);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
else {
|
2005-04-21 01:44:20 +04:00
|
|
|
rb_ary_push(rb_load_path, (*filter)(rubylib_mangled_path2(path)));
|
2000-08-01 13:25:37 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-04-21 01:44:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
identical_path(VALUE path)
|
2005-04-21 01:44:20 +04:00
|
|
|
{
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ruby_incpush(const char *path)
|
|
|
|
{
|
|
|
|
ruby_push_include(path, identical_path);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
expand_include_path(VALUE path)
|
2005-04-21 01:44:20 +04:00
|
|
|
{
|
2006-08-31 14:47:44 +04:00
|
|
|
char *p = RSTRING_PTR(path);
|
2005-04-21 01:44:20 +04:00
|
|
|
if (!p) return path;
|
|
|
|
if (*p == '.' && p[1] == '/') return path;
|
|
|
|
return rb_file_expand_path(path, Qnil);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
ruby_incpush_expand(const char *path)
|
|
|
|
{
|
|
|
|
ruby_push_include(path, expand_include_path);
|
|
|
|
}
|
|
|
|
|
2002-10-03 15:20:31 +04:00
|
|
|
#if defined DOSISH || defined __CYGWIN__
|
2001-05-28 20:07:34 +04:00
|
|
|
#define LOAD_RELATIVE 1
|
|
|
|
#endif
|
|
|
|
|
2004-01-18 14:49:46 +03:00
|
|
|
#if defined DOSISH || defined __CYGWIN__
|
2002-10-03 15:20:31 +04:00
|
|
|
static inline void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
translate_char(char *p, int from, int to)
|
2002-10-03 15:20:31 +04:00
|
|
|
{
|
|
|
|
while (*p) {
|
|
|
|
if ((unsigned char)*p == from)
|
|
|
|
*p = to;
|
|
|
|
#ifdef CharNext /* defined as CharNext[AW] on Windows. */
|
|
|
|
p = CharNext(p);
|
|
|
|
#else
|
2004-01-21 18:26:11 +03:00
|
|
|
p += mblen(p, RUBY_MBCHAR_MAXSIZE);
|
2002-10-03 15:20:31 +04:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2000-08-02 13:22:27 +04:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
ruby_init_loadpath(void)
|
2000-08-01 13:25:37 +04:00
|
|
|
{
|
2001-05-28 20:07:34 +04:00
|
|
|
#if defined LOAD_RELATIVE
|
2004-03-12 14:19:22 +03:00
|
|
|
char libpath[MAXPATHLEN+1];
|
2000-08-03 13:50:41 +04:00
|
|
|
char *p;
|
2000-11-20 10:31:55 +03:00
|
|
|
int rest;
|
2001-05-28 20:07:34 +04:00
|
|
|
#if defined _WIN32 || defined __CYGWIN__
|
|
|
|
HMODULE libruby = NULL;
|
2003-01-05 04:40:24 +03:00
|
|
|
MEMORY_BASIC_INFORMATION m;
|
|
|
|
|
2003-04-22 15:58:08 +04:00
|
|
|
#ifndef _WIN32_WCE
|
2003-01-05 04:40:24 +03:00
|
|
|
memset(&m, 0, sizeof(m));
|
|
|
|
if (VirtualQuery(ruby_init_loadpath, &m, sizeof(m)) && m.State == MEM_COMMIT)
|
|
|
|
libruby = (HMODULE)m.AllocationBase;
|
2003-04-22 15:58:08 +04:00
|
|
|
#endif
|
2001-05-28 20:07:34 +04:00
|
|
|
GetModuleFileName(libruby, libpath, sizeof libpath);
|
2000-08-03 13:50:41 +04:00
|
|
|
#elif defined(DJGPP)
|
|
|
|
extern char *__dos_argv0;
|
2004-03-12 14:19:22 +03:00
|
|
|
strncpy(libpath, __dos_argv0, sizeof(libpath) - 1);
|
2002-10-03 15:20:31 +04:00
|
|
|
#elif defined(__human68k__)
|
|
|
|
extern char **_argv;
|
2004-03-12 14:19:22 +03:00
|
|
|
strncpy(libpath, _argv[0], sizeof(libpath) - 1);
|
2000-10-02 11:48:42 +04:00
|
|
|
#elif defined(__EMX__)
|
2004-03-12 14:19:22 +03:00
|
|
|
_execname(libpath, sizeof(libpath) - 1);
|
2000-08-03 13:50:41 +04:00
|
|
|
#endif
|
2001-02-09 17:11:23 +03:00
|
|
|
|
2004-03-12 14:19:22 +03:00
|
|
|
libpath[sizeof(libpath) - 1] = '\0';
|
2004-01-18 14:49:46 +03:00
|
|
|
#if defined DOSISH || defined __CYGWIN__
|
2002-10-03 15:20:31 +04:00
|
|
|
translate_char(libpath, '\\', '/');
|
2001-02-09 17:11:23 +03:00
|
|
|
#endif
|
|
|
|
p = strrchr(libpath, '/');
|
2000-08-03 13:50:41 +04:00
|
|
|
if (p) {
|
|
|
|
*p = 0;
|
2001-02-09 17:11:23 +03:00
|
|
|
if (p-libpath > 3 && !strcasecmp(p-4, "/bin")) {
|
2000-08-03 13:50:41 +04:00
|
|
|
p -= 4;
|
|
|
|
*p = 0;
|
|
|
|
}
|
2001-05-02 08:22:21 +04:00
|
|
|
}
|
|
|
|
else {
|
2000-08-03 13:50:41 +04:00
|
|
|
strcpy(libpath, ".");
|
|
|
|
p = libpath + 1;
|
|
|
|
}
|
|
|
|
|
2004-03-12 14:19:22 +03:00
|
|
|
rest = sizeof(libpath) - 1 - (p - libpath);
|
2000-08-03 13:50:41 +04:00
|
|
|
|
|
|
|
#define RUBY_RELATIVE(path) (strncpy(p, (path), rest), libpath)
|
|
|
|
#else
|
|
|
|
#define RUBY_RELATIVE(path) (path)
|
|
|
|
#endif
|
|
|
|
|
2000-08-01 13:25:37 +04:00
|
|
|
if (rb_safe_level() == 0) {
|
2000-08-02 13:22:27 +04:00
|
|
|
ruby_incpush(getenv("RUBYLIB"));
|
2000-08-01 13:25:37 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef RUBY_SEARCH_PATH
|
2000-08-03 13:50:41 +04:00
|
|
|
ruby_incpush(RUBY_RELATIVE(RUBY_SEARCH_PATH));
|
2000-08-01 13:25:37 +04:00
|
|
|
#endif
|
|
|
|
|
2001-07-02 12:46:28 +04:00
|
|
|
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB2));
|
2000-08-01 13:25:37 +04:00
|
|
|
#ifdef RUBY_SITE_THIN_ARCHLIB
|
2000-08-03 13:50:41 +04:00
|
|
|
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_THIN_ARCHLIB));
|
2000-08-01 13:25:37 +04:00
|
|
|
#endif
|
2000-08-03 13:50:41 +04:00
|
|
|
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
|
|
|
|
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
|
2000-08-01 13:25:37 +04:00
|
|
|
|
2001-07-02 12:46:28 +04:00
|
|
|
ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
|
2000-08-01 13:25:37 +04:00
|
|
|
#ifdef RUBY_THIN_ARCHLIB
|
2000-08-03 13:50:41 +04:00
|
|
|
ruby_incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB));
|
2000-08-01 13:25:37 +04:00
|
|
|
#endif
|
2000-08-03 13:50:41 +04:00
|
|
|
ruby_incpush(RUBY_RELATIVE(RUBY_ARCHLIB));
|
2000-08-01 13:25:37 +04:00
|
|
|
|
|
|
|
if (rb_safe_level() == 0) {
|
2000-08-02 13:22:27 +04:00
|
|
|
ruby_incpush(".");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
struct req_list {
|
2000-02-17 10:11:22 +03:00
|
|
|
char *name;
|
1998-01-16 15:13:05 +03:00
|
|
|
struct req_list *next;
|
* intern.h: add prototypes.
rb_gc_enable(), rb_gc_disable(), rb_gc_start(), rb_str_new5()
rb_str_buf_append(), rb_str_buf_cat(), rb_str_buf_cat2(),
rb_str_dup_frozen()
* ruby.h: added declaration.
rb_defout, rb_stdin, rb_stdout, rb_stderr, ruby_errinfo
* rubyio.h: changed double include guard macro to RUBYIO_H.
* array.c (inspect_call): make static.
* eval.c (dvar_asgn): ditto.
* io.c (rb_io_close_read): ditto.
* lex.c (rb_reserved_word): ditto.
* ruby.c: (req_list_head, req_list_last): ditto.
* ruby.c (require_libraries): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2001-12-17 10:52:35 +03:00
|
|
|
};
|
|
|
|
static struct req_list req_list_head, *req_list_last = &req_list_head;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
add_modules(const char *mod)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct req_list *list;
|
|
|
|
|
|
|
|
list = ALLOC(struct req_list);
|
2000-02-17 10:11:22 +03:00
|
|
|
list->name = ALLOC_N(char, strlen(mod)+1);
|
|
|
|
strcpy(list->name, mod);
|
1999-01-20 07:59:39 +03:00
|
|
|
list->next = 0;
|
|
|
|
req_list_last->next = list;
|
|
|
|
req_list_last = list;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 10:32:32 +04:00
|
|
|
extern void Init_ext(void);
|
2000-06-28 12:31:35 +04:00
|
|
|
|
* intern.h: add prototypes.
rb_gc_enable(), rb_gc_disable(), rb_gc_start(), rb_str_new5()
rb_str_buf_append(), rb_str_buf_cat(), rb_str_buf_cat2(),
rb_str_dup_frozen()
* ruby.h: added declaration.
rb_defout, rb_stdin, rb_stdout, rb_stderr, ruby_errinfo
* rubyio.h: changed double include guard macro to RUBYIO_H.
* array.c (inspect_call): make static.
* eval.c (dvar_asgn): ditto.
* io.c (rb_io_close_read): ditto.
* lex.c (rb_reserved_word): ditto.
* ruby.c: (req_list_head, req_list_last): ditto.
* ruby.c (require_libraries): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2001-12-17 10:52:35 +03:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
require_libraries(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-10-15 12:52:18 +04:00
|
|
|
extern NODE *ruby_eval_tree;
|
2002-08-27 15:00:24 +04:00
|
|
|
NODE *save[3];
|
1999-01-20 07:59:39 +03:00
|
|
|
struct req_list *list = req_list_head.next;
|
1998-01-16 15:13:05 +03:00
|
|
|
struct req_list *tmp;
|
|
|
|
|
2000-05-30 08:24:17 +04:00
|
|
|
save[0] = ruby_eval_tree;
|
2004-09-22 04:19:15 +04:00
|
|
|
save[1] = NEW_BEGIN(0);
|
|
|
|
ruby_eval_tree = 0;
|
2004-04-11 14:10:18 +04:00
|
|
|
ruby_current_node = 0;
|
|
|
|
Init_ext(); /* should be called here for some reason :-( */
|
2004-09-22 04:19:15 +04:00
|
|
|
ruby_current_node = save[1];
|
2004-04-11 14:10:18 +04:00
|
|
|
ruby_set_current_source();
|
1999-01-20 07:59:39 +03:00
|
|
|
req_list_last = 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
while (list) {
|
2005-05-24 19:24:23 +04:00
|
|
|
int state;
|
|
|
|
|
2002-09-22 16:52:18 +04:00
|
|
|
ruby_current_node = 0;
|
2005-09-14 12:30:16 +04:00
|
|
|
rb_protect((VALUE (*)(VALUE))rb_require, (VALUE)list->name, &state);
|
2005-05-24 19:24:23 +04:00
|
|
|
if (state) rb_jump_tag(state);
|
1998-01-16 15:13:05 +03:00
|
|
|
tmp = list->next;
|
2000-02-17 10:11:22 +03:00
|
|
|
free(list->name);
|
1998-01-16 15:13:05 +03:00
|
|
|
free(list);
|
|
|
|
list = tmp;
|
2004-09-22 04:19:15 +04:00
|
|
|
ruby_current_node = save[1];
|
2002-09-22 16:52:18 +04:00
|
|
|
ruby_set_current_source();
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2000-07-07 07:20:53 +04:00
|
|
|
req_list_head.next = 0;
|
2000-05-30 08:24:17 +04:00
|
|
|
ruby_eval_tree = save[0];
|
2004-09-22 04:19:15 +04:00
|
|
|
rb_gc_force_recycle((VALUE)save[1]);
|
2002-09-22 16:52:18 +04:00
|
|
|
ruby_current_node = 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
process_sflag(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-10-15 12:52:18 +04:00
|
|
|
if (sflag) {
|
2002-08-21 19:47:54 +04:00
|
|
|
long n;
|
1999-10-15 12:52:18 +04:00
|
|
|
VALUE *args;
|
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
n = RARRAY_LEN(rb_argv);
|
|
|
|
args = RARRAY_PTR(rb_argv);
|
1999-12-02 09:58:52 +03:00
|
|
|
while (n > 0) {
|
2001-05-02 08:22:21 +04:00
|
|
|
VALUE v = *args++;
|
|
|
|
char *s = StringValuePtr(v);
|
1999-10-15 12:52:18 +04:00
|
|
|
char *p;
|
2005-05-01 04:13:48 +04:00
|
|
|
int hyphen = Qfalse;
|
1999-10-15 12:52:18 +04:00
|
|
|
|
1999-12-02 09:58:52 +03:00
|
|
|
if (s[0] != '-') break;
|
|
|
|
n--;
|
1999-10-15 12:52:18 +04:00
|
|
|
if (s[1] == '-' && s[2] == '\0') break;
|
|
|
|
|
2005-05-01 04:13:48 +04:00
|
|
|
v = Qtrue;
|
|
|
|
/* check if valid name before replacing - with _ */
|
|
|
|
for (p = s + 1; *p; p++) {
|
|
|
|
if (*p == '=') {
|
|
|
|
*p++ = '\0';
|
|
|
|
v = rb_str_new2(p);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (*p == '-') {
|
|
|
|
hyphen = Qtrue;
|
|
|
|
}
|
|
|
|
else if (*p != '_' && !ISALNUM(*p)) {
|
|
|
|
VALUE name_error[2];
|
|
|
|
name_error[0] = rb_str_new2("invalid name for global variable - ");
|
|
|
|
if (!(p = strchr(p, '='))) {
|
|
|
|
rb_str_cat2(name_error[0], s);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_str_cat(name_error[0], s, p - s);
|
|
|
|
}
|
|
|
|
name_error[1] = args[-1];
|
|
|
|
rb_exc_raise(rb_class_new_instance(2, name_error, rb_eNameError));
|
|
|
|
}
|
1999-10-15 12:52:18 +04:00
|
|
|
}
|
2005-05-01 04:13:48 +04:00
|
|
|
s[0] = '$';
|
|
|
|
if (hyphen) {
|
|
|
|
for (p = s + 1; *p; ++p) {
|
|
|
|
if (*p == '-') *p = '_';
|
|
|
|
}
|
1999-10-15 12:52:18 +04:00
|
|
|
}
|
2005-05-01 04:13:48 +04:00
|
|
|
rb_gv_set(s, v);
|
1999-10-15 12:52:18 +04:00
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
n = RARRAY_LEN(rb_argv) - n;
|
1999-10-15 12:52:18 +04:00
|
|
|
while (n--) {
|
|
|
|
rb_ary_shift(rb_argv);
|
|
|
|
}
|
|
|
|
}
|
1999-12-06 12:04:03 +03:00
|
|
|
sflag = 0;
|
1999-10-15 12:52:18 +04:00
|
|
|
}
|
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 10:32:32 +04:00
|
|
|
static void proc_options(int argc, char **argv);
|
1999-10-21 11:52:15 +04:00
|
|
|
|
|
|
|
static char*
|
2006-07-21 18:58:18 +04:00
|
|
|
moreswitches(const char *s)
|
1999-10-21 11:52:15 +04:00
|
|
|
{
|
2000-05-12 13:07:57 +04:00
|
|
|
int argc; char *argv[3];
|
2006-07-21 18:58:18 +04:00
|
|
|
const char *p = s;
|
1999-10-21 11:52:15 +04:00
|
|
|
|
|
|
|
argc = 2; argv[0] = argv[2] = 0;
|
|
|
|
while (*s && !ISSPACE(*s))
|
|
|
|
s++;
|
1999-12-06 12:04:03 +03:00
|
|
|
argv[1] = ALLOCA_N(char, s-p+2);
|
|
|
|
argv[1][0] = '-';
|
|
|
|
strncpy(argv[1]+1, p, s-p);
|
|
|
|
argv[1][s-p+1] = '\0';
|
1999-10-21 11:52:15 +04:00
|
|
|
proc_options(argc, argv);
|
|
|
|
while (*s && ISSPACE(*s))
|
|
|
|
s++;
|
2006-07-21 18:58:18 +04:00
|
|
|
return (char *)s;
|
1999-10-21 11:52:15 +04:00
|
|
|
}
|
|
|
|
|
2004-09-22 04:19:15 +04:00
|
|
|
NODE *ruby_eval_tree;
|
|
|
|
|
1999-10-15 12:52:18 +04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
proc_options(int argc, char **argv)
|
1999-10-15 12:52:18 +04:00
|
|
|
{
|
|
|
|
char *argv0 = argv[0];
|
|
|
|
int do_search;
|
2006-07-21 18:58:18 +04:00
|
|
|
const char *s;
|
|
|
|
char *script = 0;
|
2003-11-06 04:17:59 +03:00
|
|
|
NODE *volatile script_node = 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-10-16 14:33:06 +04:00
|
|
|
int version = 0;
|
|
|
|
int copyright = 0;
|
|
|
|
int verbose = 0;
|
1999-11-25 12:03:08 +03:00
|
|
|
VALUE e_script = Qfalse;
|
1999-10-16 14:33:06 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
if (argc == 0) return;
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
do_search = Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
for (argc--,argv++; argc > 0; argc--,argv++) {
|
|
|
|
if (argv[0][0] != '-' || !argv[0][1]) break;
|
|
|
|
|
|
|
|
s = argv[0]+1;
|
|
|
|
reswitch:
|
|
|
|
switch (*s) {
|
|
|
|
case 'a':
|
1999-01-20 07:59:39 +03:00
|
|
|
do_split = Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'p':
|
1999-01-20 07:59:39 +03:00
|
|
|
do_print = Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
/* through */
|
|
|
|
case 'n':
|
1999-01-20 07:59:39 +03:00
|
|
|
do_loop = Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'd':
|
1999-08-13 09:45:20 +04:00
|
|
|
ruby_debug = Qtrue;
|
1999-10-16 14:33:06 +04:00
|
|
|
ruby_verbose = Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'y':
|
2002-05-29 09:20:39 +04:00
|
|
|
ruby_yydebug = 1;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'v':
|
2001-03-13 08:45:13 +03:00
|
|
|
if (argv0 == 0 || verbose) {
|
2001-02-27 10:52:11 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
ruby_show_version();
|
1999-10-16 14:33:06 +04:00
|
|
|
verbose = 1;
|
1998-01-16 15:13:05 +03:00
|
|
|
case 'w':
|
1999-10-16 14:33:06 +04:00
|
|
|
ruby_verbose = Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
2003-07-29 22:26:55 +04:00
|
|
|
case 'W':
|
|
|
|
{
|
|
|
|
int numlen;
|
|
|
|
int v = 2; /* -W as -W2 */
|
|
|
|
|
|
|
|
if (*++s) {
|
|
|
|
v = scan_oct(s, 1, &numlen);
|
|
|
|
if (numlen == 0) v = 1;
|
|
|
|
s += numlen;
|
|
|
|
}
|
|
|
|
switch (v) {
|
|
|
|
case 0:
|
|
|
|
ruby_verbose = Qnil; break;
|
|
|
|
case 1:
|
|
|
|
ruby_verbose = Qfalse; break;
|
|
|
|
default:
|
|
|
|
ruby_verbose = Qtrue; break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
goto reswitch;
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
case 'c':
|
1999-01-20 07:59:39 +03:00
|
|
|
do_check = Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 's':
|
|
|
|
forbid_setid("-s");
|
1999-10-16 14:33:06 +04:00
|
|
|
sflag = 1;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
case 'h':
|
|
|
|
usage(origargv[0]);
|
|
|
|
exit(0);
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
case 'l':
|
1999-01-20 07:59:39 +03:00
|
|
|
do_line = Qtrue;
|
|
|
|
rb_output_rs = rb_rs;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'S':
|
|
|
|
forbid_setid("-S");
|
1999-01-20 07:59:39 +03:00
|
|
|
do_search = Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'e':
|
|
|
|
forbid_setid("-e");
|
1999-08-13 09:45:20 +04:00
|
|
|
if (!*++s) {
|
|
|
|
s = argv[1];
|
|
|
|
argc--,argv++;
|
|
|
|
}
|
|
|
|
if (!s) {
|
|
|
|
fprintf(stderr, "%s: no code specified for -e\n", origargv[0]);
|
|
|
|
exit(2);
|
|
|
|
}
|
1999-10-15 12:52:18 +04:00
|
|
|
if (!e_script) {
|
|
|
|
e_script = rb_str_new(0,0);
|
|
|
|
if (script == 0) script = "-e";
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2000-04-10 09:48:43 +04:00
|
|
|
rb_str_cat2(e_script, s);
|
|
|
|
rb_str_cat2(e_script, "\n");
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'r':
|
|
|
|
forbid_setid("-r");
|
|
|
|
if (*++s) {
|
|
|
|
add_modules(s);
|
|
|
|
}
|
|
|
|
else if (argv[1]) {
|
|
|
|
add_modules(argv[1]);
|
|
|
|
argc--,argv++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'i':
|
|
|
|
forbid_setid("-i");
|
1999-01-20 07:59:39 +03:00
|
|
|
if (ruby_inplace_mode) free(ruby_inplace_mode);
|
|
|
|
ruby_inplace_mode = strdup(s+1);
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'x':
|
1999-01-20 07:59:39 +03:00
|
|
|
xflag = Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
if (*s && chdir(s) < 0) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_fatal("Can't chdir to %s", s);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2000-01-05 07:41:21 +03:00
|
|
|
case 'C':
|
1998-01-16 15:13:05 +03:00
|
|
|
case 'X':
|
|
|
|
s++;
|
|
|
|
if (!*s) {
|
|
|
|
s = argv[1];
|
|
|
|
argc--,argv++;
|
|
|
|
}
|
2000-01-05 07:41:21 +03:00
|
|
|
if (!s || !*s) {
|
|
|
|
rb_fatal("Can't chdir");
|
|
|
|
}
|
|
|
|
if (chdir(s) < 0) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_fatal("Can't chdir to %s", s);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'F':
|
1999-12-06 12:04:03 +03:00
|
|
|
if (*++s) {
|
2003-07-30 11:08:56 +04:00
|
|
|
rb_fs = rb_reg_new(s, strlen(s), 0);
|
1999-12-06 12:04:03 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'K':
|
1999-12-06 12:04:03 +03:00
|
|
|
if (*++s) {
|
|
|
|
rb_set_kcode(s);
|
|
|
|
s++;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'T':
|
|
|
|
{
|
|
|
|
int numlen;
|
|
|
|
int v = 1;
|
|
|
|
|
|
|
|
if (*++s) {
|
|
|
|
v = scan_oct(s, 2, &numlen);
|
|
|
|
if (numlen == 0) v = 1;
|
2002-05-22 16:32:15 +04:00
|
|
|
s += numlen;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
rb_set_safe_level(v);
|
|
|
|
}
|
2002-05-22 16:32:15 +04:00
|
|
|
goto reswitch;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
case 'I':
|
|
|
|
forbid_setid("-I");
|
|
|
|
if (*++s)
|
2005-04-21 01:44:20 +04:00
|
|
|
ruby_incpush_expand(s);
|
1998-01-16 15:13:05 +03:00
|
|
|
else if (argv[1]) {
|
2005-04-21 01:44:20 +04:00
|
|
|
ruby_incpush_expand(argv[1]);
|
1998-01-16 15:13:05 +03:00
|
|
|
argc--,argv++;
|
|
|
|
}
|
2002-05-23 11:41:53 +04:00
|
|
|
break;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
case '0':
|
|
|
|
{
|
|
|
|
int numlen;
|
|
|
|
int v;
|
|
|
|
char c;
|
|
|
|
|
|
|
|
v = scan_oct(s, 4, &numlen);
|
|
|
|
s += numlen;
|
1999-01-20 07:59:39 +03:00
|
|
|
if (v > 0377) rb_rs = Qnil;
|
1998-01-16 15:13:05 +03:00
|
|
|
else if (v == 0 && numlen >= 2) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_rs = rb_str_new2("\n\n");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
c = v & 0xff;
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_rs = rb_str_new(&c, 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case '-':
|
2003-01-16 10:38:40 +03:00
|
|
|
if (!s[1] || (s[1] == '\r' && !s[2])) {
|
1998-01-16 15:13:05 +03:00
|
|
|
argc--,argv++;
|
|
|
|
goto switch_end;
|
|
|
|
}
|
|
|
|
s++;
|
|
|
|
if (strcmp("copyright", s) == 0)
|
|
|
|
copyright = 1;
|
2001-10-02 08:31:23 +04:00
|
|
|
else if (strcmp("debug", s) == 0) {
|
|
|
|
ruby_debug = Qtrue;
|
|
|
|
ruby_verbose = Qtrue;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
else if (strcmp("version", s) == 0)
|
|
|
|
version = 1;
|
1999-10-16 14:33:06 +04:00
|
|
|
else if (strcmp("verbose", s) == 0) {
|
|
|
|
verbose = 1;
|
|
|
|
ruby_verbose = Qtrue;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
else if (strcmp("yydebug", s) == 0)
|
2002-05-29 09:20:39 +04:00
|
|
|
ruby_yydebug = 1;
|
1999-08-13 09:45:20 +04:00
|
|
|
else if (strcmp("help", s) == 0) {
|
|
|
|
usage(origargv[0]);
|
|
|
|
exit(0);
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
else {
|
1999-08-13 09:45:20 +04:00
|
|
|
fprintf(stderr, "%s: invalid option --%s (-h will show valid options)\n",
|
|
|
|
origargv[0], s);
|
|
|
|
exit(2);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2005-01-15 08:58:02 +03:00
|
|
|
case '\r':
|
|
|
|
if (!s[1]) break;
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
default:
|
2005-01-15 08:58:02 +03:00
|
|
|
{
|
|
|
|
const char *format;
|
|
|
|
if (ISPRINT(*s)) {
|
|
|
|
format = "%s: invalid option -%c (-h will show valid options)\n";
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
format = "%s: invalid option -\\%03o (-h will show valid options)\n";
|
|
|
|
}
|
|
|
|
fprintf(stderr, format, origargv[0], (int)(unsigned char)*s);
|
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
exit(2);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch_end:
|
1999-10-15 12:52:18 +04:00
|
|
|
if (argv0 == 0) return;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-10-21 11:52:15 +04:00
|
|
|
if (rb_safe_level() == 0 && (s = getenv("RUBYOPT"))) {
|
|
|
|
while (ISSPACE(*s)) s++;
|
2005-05-01 04:13:48 +04:00
|
|
|
if (*s == 'T' || (*s == '-' && *(s+1) == 'T')) {
|
1999-10-21 11:52:15 +04:00
|
|
|
int numlen;
|
|
|
|
int v = 1;
|
|
|
|
|
2005-01-25 11:10:33 +03:00
|
|
|
if (*s != 'T') ++s;
|
1999-10-21 11:52:15 +04:00
|
|
|
if (*++s) {
|
|
|
|
v = scan_oct(s, 2, &numlen);
|
|
|
|
if (numlen == 0) v = 1;
|
|
|
|
}
|
|
|
|
rb_set_safe_level(v);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
while (s && *s) {
|
|
|
|
if (*s == '-') {
|
|
|
|
s++;
|
2002-05-23 09:35:32 +04:00
|
|
|
if (ISSPACE(*s)) {
|
|
|
|
do {s++;} while (ISSPACE(*s));
|
|
|
|
continue;
|
|
|
|
}
|
1999-10-21 11:52:15 +04:00
|
|
|
}
|
|
|
|
if (!*s) break;
|
|
|
|
if (!strchr("IdvwrK", *s))
|
* 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 09:47:45 +03:00
|
|
|
rb_raise(rb_eRuntimeError, "illegal switch in RUBYOPT: -%c", *s);
|
1999-10-21 11:52:15 +04:00
|
|
|
s = moreswitches(s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
if (version) {
|
1999-01-20 07:59:39 +03:00
|
|
|
ruby_show_version();
|
1998-01-16 15:13:05 +03:00
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
if (copyright) {
|
1999-01-20 07:59:39 +03:00
|
|
|
ruby_show_copyright();
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2001-05-30 13:12:34 +04:00
|
|
|
if (rb_safe_level() >= 4) {
|
2003-06-23 10:52:39 +04:00
|
|
|
OBJ_TAINT(rb_argv);
|
|
|
|
OBJ_TAINT(rb_load_path);
|
2001-05-30 13:12:34 +04:00
|
|
|
}
|
|
|
|
|
2003-02-13 06:02:19 +03:00
|
|
|
if (!e_script) {
|
|
|
|
if (argc == 0) { /* no more args */
|
2003-02-13 03:59:00 +03:00
|
|
|
if (verbose) exit(0);
|
|
|
|
script = "-";
|
2001-09-03 09:37:42 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
else {
|
2003-02-13 06:02:19 +03:00
|
|
|
script = argv[0];
|
|
|
|
if (script[0] == '\0') {
|
|
|
|
script = "-";
|
|
|
|
}
|
|
|
|
else if (do_search) {
|
1999-10-15 12:52:18 +04:00
|
|
|
char *path = getenv("RUBYPATH");
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-10-15 12:52:18 +04:00
|
|
|
script = 0;
|
|
|
|
if (path) {
|
|
|
|
script = dln_find_file(argv[0], path);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-10-15 12:52:18 +04:00
|
|
|
if (!script) {
|
2003-06-20 10:22:50 +04:00
|
|
|
script = dln_find_file(argv[0], getenv(PATH_ENV));
|
1999-10-15 12:52:18 +04:00
|
|
|
}
|
|
|
|
if (!script) script = argv[0];
|
2003-11-06 04:17:59 +03:00
|
|
|
script = ruby_sourcefile = rb_source_filename(script);
|
2004-01-21 19:47:23 +03:00
|
|
|
script_node = NEW_BEGIN(0);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2004-01-18 14:49:46 +03:00
|
|
|
#if defined DOSISH || defined __CYGWIN__
|
2006-07-04 16:50:30 +04:00
|
|
|
/* assume that we can change argv[n] if never change its length. */
|
2006-07-21 18:58:18 +04:00
|
|
|
translate_char(script, '\\', '/');
|
2002-10-03 15:20:31 +04:00
|
|
|
#endif
|
2003-02-13 06:02:19 +03:00
|
|
|
argc--; argv++;
|
2003-02-13 03:59:00 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1999-10-15 12:52:18 +04:00
|
|
|
ruby_script(script);
|
|
|
|
ruby_set_argv(argc, argv);
|
1999-12-07 12:25:55 +03:00
|
|
|
process_sflag();
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-08-02 13:22:27 +04:00
|
|
|
ruby_init_loadpath();
|
2002-03-07 14:19:37 +03:00
|
|
|
ruby_sourcefile = rb_source_filename(argv0);
|
1999-10-15 12:52:18 +04:00
|
|
|
if (e_script) {
|
2000-06-28 12:31:35 +04:00
|
|
|
require_libraries();
|
2004-09-22 04:19:15 +04:00
|
|
|
ruby_eval_tree = rb_compile_string(script, e_script, 1);
|
1999-10-15 12:52:18 +04:00
|
|
|
}
|
|
|
|
else if (strlen(script) == 1 && script[0] == '-') {
|
|
|
|
load_stdin();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
load_file(script, 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1999-10-15 12:52:18 +04:00
|
|
|
process_sflag();
|
1999-10-16 14:33:06 +04:00
|
|
|
xflag = 0;
|
2001-05-30 13:12:34 +04:00
|
|
|
|
|
|
|
if (rb_safe_level() >= 4) {
|
2003-06-23 10:52:39 +04:00
|
|
|
FL_UNSET(rb_argv, FL_TAINT);
|
|
|
|
FL_UNSET(rb_load_path, FL_TAINT);
|
2001-05-30 13:12:34 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
load_file(const char *fname, int script)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
extern VALUE rb_stdin;
|
2005-07-13 17:44:21 +04:00
|
|
|
VALUE parser;
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE f;
|
|
|
|
int line_start = 1;
|
|
|
|
|
2003-06-23 10:52:39 +04:00
|
|
|
if (!fname) rb_load_fail(fname);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (strcmp(fname, "-") == 0) {
|
|
|
|
f = rb_stdin;
|
|
|
|
}
|
|
|
|
else {
|
1999-01-20 07:59:39 +03:00
|
|
|
FILE *fp = fopen(fname, "r");
|
|
|
|
|
|
|
|
if (fp == NULL) {
|
2001-01-10 07:49:41 +03:00
|
|
|
rb_load_fail(fname);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
fclose(fp);
|
|
|
|
|
|
|
|
f = rb_file_open(fname, "r");
|
2000-06-19 07:37:55 +04:00
|
|
|
#if defined DOSISH || defined __CYGWIN__
|
|
|
|
{
|
|
|
|
char *ext = strrchr(fname, '.');
|
|
|
|
if (ext && strcasecmp(ext, ".exe") == 0)
|
|
|
|
rb_io_binmode(f);
|
|
|
|
}
|
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (script) {
|
2001-07-14 19:17:19 +04:00
|
|
|
VALUE c = 1; /* something not nil */
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE line;
|
1999-01-20 07:59:39 +03:00
|
|
|
char *p;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
if (xflag) {
|
|
|
|
forbid_setid("-x");
|
1999-01-20 07:59:39 +03:00
|
|
|
xflag = Qfalse;
|
|
|
|
while (!NIL_P(line = rb_io_gets(f))) {
|
1998-01-16 15:13:05 +03:00
|
|
|
line_start++;
|
2006-08-31 14:47:44 +04:00
|
|
|
if (RSTRING_LEN(line) > 2
|
|
|
|
&& RSTRING_PTR(line)[0] == '#'
|
|
|
|
&& RSTRING_PTR(line)[1] == '!') {
|
|
|
|
if ((p = strstr(RSTRING_PTR(line), "ruby")) != 0) {
|
1998-01-16 15:13:05 +03:00
|
|
|
goto start_read;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
* 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 09:47:45 +03:00
|
|
|
rb_raise(rb_eLoadError, "no Ruby script found in input");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
c = rb_io_getc(f);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (c == INT2FIX('#')) {
|
2005-05-14 06:48:07 +04:00
|
|
|
c = rb_io_getc(f);
|
|
|
|
if (c == INT2FIX('!')) {
|
|
|
|
line = rb_io_gets(f);
|
|
|
|
if (NIL_P(line)) return;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-08-31 14:47:44 +04:00
|
|
|
if ((p = strstr(RSTRING_PTR(line), "ruby")) == 0) {
|
1998-01-16 15:19:22 +03:00
|
|
|
/* not ruby script, kick the program */
|
|
|
|
char **argv;
|
|
|
|
char *path;
|
2006-08-31 14:47:44 +04:00
|
|
|
char *pend = RSTRING_PTR(line) + RSTRING_LEN(line);
|
1998-01-16 15:19:22 +03:00
|
|
|
|
2006-08-31 14:47:44 +04:00
|
|
|
p = RSTRING_PTR(line); /* skip `#!' */
|
1998-01-16 15:19:22 +03:00
|
|
|
if (pend[-1] == '\n') pend--; /* chomp line */
|
|
|
|
if (pend[-1] == '\r') pend--;
|
|
|
|
*pend = '\0';
|
1999-01-20 07:59:39 +03:00
|
|
|
while (p < pend && ISSPACE(*p))
|
1998-01-16 15:19:22 +03:00
|
|
|
p++;
|
|
|
|
path = p; /* interpreter path */
|
1999-01-20 07:59:39 +03:00
|
|
|
while (p < pend && !ISSPACE(*p))
|
1998-01-16 15:19:22 +03:00
|
|
|
p++;
|
|
|
|
*p++ = '\0';
|
|
|
|
if (p < pend) {
|
|
|
|
argv = ALLOCA_N(char*, origargc+3);
|
|
|
|
argv[1] = p;
|
|
|
|
MEMCPY(argv+2, origargv+1, char*, origargc);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
argv = origargv;
|
|
|
|
}
|
|
|
|
argv[0] = path;
|
|
|
|
execv(path, argv);
|
2000-03-07 11:37:59 +03:00
|
|
|
|
2002-03-07 14:19:37 +03:00
|
|
|
ruby_sourcefile = rb_source_filename(fname);
|
1999-01-20 07:59:39 +03:00
|
|
|
ruby_sourceline = 1;
|
|
|
|
rb_fatal("Can't exec %s", path);
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
start_read:
|
1999-01-20 07:59:39 +03:00
|
|
|
p += 4;
|
2006-08-31 14:47:44 +04:00
|
|
|
RSTRING_PTR(line)[RSTRING_LEN(line)-1] = '\0';
|
|
|
|
if (RSTRING_PTR(line)[RSTRING_LEN(line)-2] == '\r')
|
|
|
|
RSTRING_PTR(line)[RSTRING_LEN(line)-2] = '\0';
|
2005-05-01 04:13:48 +04:00
|
|
|
if ((p = strstr(p, " -")) != 0) {
|
1999-10-21 11:58:14 +04:00
|
|
|
p++; /* skip space before `-' */
|
1999-01-20 07:59:39 +03:00
|
|
|
while (*p == '-') {
|
1999-10-21 11:52:15 +04:00
|
|
|
p = moreswitches(p+1);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2005-05-14 06:48:07 +04:00
|
|
|
|
|
|
|
/* push back shebang for pragma may exist in next line */
|
|
|
|
rb_io_ungetc(f, INT2FIX('\n'));
|
|
|
|
rb_io_ungetc(f, INT2FIX('!'));
|
|
|
|
}
|
|
|
|
else if (!NIL_P(c)) {
|
|
|
|
rb_io_ungetc(f, c);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2005-05-14 06:48:07 +04:00
|
|
|
rb_io_ungetc(f, INT2FIX('#'));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2000-06-28 12:31:35 +04:00
|
|
|
else if (!NIL_P(c)) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_io_ungetc(f, c);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2000-06-28 12:31:35 +04:00
|
|
|
require_libraries(); /* Why here? unnatural */
|
2000-09-21 10:37:24 +04:00
|
|
|
if (NIL_P(c)) return;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2005-07-13 17:44:21 +04:00
|
|
|
parser = rb_parser_new();
|
|
|
|
ruby_eval_tree = rb_parser_compile_file(parser, fname, f, line_start);
|
|
|
|
if (script && rb_parser_end_seen_p(parser)) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_global_const("DATA", f);
|
|
|
|
}
|
|
|
|
else if (f != rb_stdin) {
|
|
|
|
rb_io_close(f);
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_load_file(const char *fname)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
load_file(fname, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
load_stdin(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
forbid_setid("program input from stdin");
|
|
|
|
load_file("-", 1);
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE rb_progname;
|
|
|
|
VALUE rb_argv;
|
|
|
|
VALUE rb_argv0;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-02-01 16:27:47 +03:00
|
|
|
#if defined(PSTAT_SETCMD) || defined(HAVE_SETPROCTITLE)
|
|
|
|
#elif defined(_WIN32)
|
|
|
|
#elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
|
|
|
|
#else
|
|
|
|
#define USE_ENVSPACE_FOR_ARG0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef USE_ENVSPACE_FOR_ARG0
|
2005-04-28 03:21:58 +04:00
|
|
|
static struct {
|
|
|
|
char *begin, *end;
|
|
|
|
} envspace;
|
|
|
|
extern char **environ;
|
|
|
|
|
|
|
|
static void
|
|
|
|
set_arg0space()
|
|
|
|
{
|
|
|
|
char *s;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!environ || (s = environ[0]) == NULL) return;
|
|
|
|
envspace.begin = s;
|
|
|
|
s += strlen(s);
|
|
|
|
for (i = 1; environ[i]; i++) {
|
|
|
|
if (environ[i] == s + 1) {
|
|
|
|
s++;
|
|
|
|
s += strlen(s); /* this one is ok too */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
envspace.end = s;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
#define set_arg0space() ((void)0)
|
|
|
|
#endif
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
set_arg0(VALUE val, ID id)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
char *s;
|
2002-08-21 19:47:54 +04:00
|
|
|
long i;
|
2005-06-28 17:08:32 +04:00
|
|
|
#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
|
2001-09-03 09:37:42 +04:00
|
|
|
static int len;
|
2005-06-28 17:08:32 +04:00
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
if (origargv == 0) rb_raise(rb_eRuntimeError, "$0 not initialized");
|
2001-05-02 08:22:21 +04:00
|
|
|
StringValue(val);
|
2006-08-31 14:47:44 +04:00
|
|
|
s = RSTRING_PTR(val);
|
|
|
|
i = RSTRING_LEN(val);
|
2005-04-28 03:21:58 +04:00
|
|
|
#if defined(PSTAT_SETCMD)
|
1999-01-20 07:59:39 +03:00
|
|
|
if (i >= PST_CLEN) {
|
2005-04-28 03:21:58 +04:00
|
|
|
union pstun j;
|
|
|
|
j.pst_command = s;
|
|
|
|
i = PST_CLEN;
|
2006-08-31 14:47:44 +04:00
|
|
|
RSTRING_LEN(val) = i;
|
2005-04-28 03:21:58 +04:00
|
|
|
*(s + i) = '\0';
|
|
|
|
pstat(PSTAT_SETCMD, j, PST_CLEN, 0, 0);
|
2001-05-02 08:22:21 +04:00
|
|
|
}
|
|
|
|
else {
|
2005-04-28 03:21:58 +04:00
|
|
|
union pstun j;
|
|
|
|
j.pst_command = s;
|
|
|
|
pstat(PSTAT_SETCMD, j, i, 0, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
rb_progname = rb_tainted_str_new(s, i);
|
2001-09-03 09:37:42 +04:00
|
|
|
#elif defined(HAVE_SETPROCTITLE)
|
2002-10-30 00:35:28 +03:00
|
|
|
setproctitle("%.*s", (int)i, s);
|
2001-09-03 09:37:42 +04:00
|
|
|
rb_progname = rb_tainted_str_new(s, i);
|
|
|
|
#else
|
|
|
|
if (len == 0) {
|
|
|
|
char *s = origargv[0];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
s += strlen(s);
|
|
|
|
/* See if all the arguments are contiguous in memory */
|
|
|
|
for (i = 1; i < origargc; i++) {
|
|
|
|
if (origargv[i] == s + 1) {
|
|
|
|
s++;
|
|
|
|
s += strlen(s); /* this one is ok too */
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2006-02-01 16:27:47 +03:00
|
|
|
#if defined(USE_ENVSPACE_FOR_ARG0)
|
2005-04-28 03:21:58 +04:00
|
|
|
if (s + 1 == envspace.begin) {
|
|
|
|
s = envspace.end;
|
|
|
|
ruby_setenv("", NULL); /* duplicate environ vars */
|
|
|
|
}
|
|
|
|
#endif
|
2001-09-03 09:37:42 +04:00
|
|
|
len = s - origargv[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i >= len) {
|
|
|
|
i = len;
|
|
|
|
}
|
2006-08-16 06:11:21 +04:00
|
|
|
memcpy(origargv[0], s, i);
|
|
|
|
s = origargv[0] + i;
|
|
|
|
*s = '\0';
|
|
|
|
if (++i < len) memset(s + 1, ' ', len - i);
|
|
|
|
for (i = 1; i < origargc; i++)
|
|
|
|
origargv[i] = s;
|
2001-09-03 09:37:42 +04:00
|
|
|
rb_progname = rb_tainted_str_new2(origargv[0]);
|
2002-08-12 17:39:22 +04:00
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
ruby_script(const char *name)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
if (name) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_progname = rb_tainted_str_new2(name);
|
2002-03-07 14:19:37 +03:00
|
|
|
ruby_sourcefile = rb_source_filename(name);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int uid, euid, gid, egid;
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
init_ids(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
uid = (int)getuid();
|
|
|
|
euid = (int)geteuid();
|
|
|
|
gid = (int)getgid();
|
|
|
|
egid = (int)getegid();
|
|
|
|
#ifdef VMS
|
|
|
|
uid |= gid << 16;
|
|
|
|
euid |= egid << 16;
|
|
|
|
#endif
|
|
|
|
if (uid && (euid != uid || egid != gid)) {
|
|
|
|
rb_set_safe_level(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
forbid_setid(const char *s)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
if (euid != uid)
|
* 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 09:47:45 +03:00
|
|
|
rb_raise(rb_eSecurityError, "no %s allowed while running setuid", s);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (egid != gid)
|
* 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 09:47:45 +03:00
|
|
|
rb_raise(rb_eSecurityError, "no %s allowed while running setgid", s);
|
1999-01-20 07:59:39 +03:00
|
|
|
if (rb_safe_level() > 0)
|
* 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 09:47:45 +03:00
|
|
|
rb_raise(rb_eSecurityError, "no %s allowed in tainted mode", s);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-07-29 22:26:55 +04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
verbose_setter(VALUE val, ID id, VALUE *variable)
|
2003-07-29 22:26:55 +04:00
|
|
|
{
|
|
|
|
ruby_verbose = RTEST(val) ? Qtrue : val;
|
|
|
|
}
|
|
|
|
|
2004-03-03 07:55:35 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
opt_W_getter(VALUE val, ID id)
|
2004-03-03 07:55:35 +03:00
|
|
|
{
|
|
|
|
if (ruby_verbose == Qnil) return INT2FIX(0);
|
|
|
|
if (ruby_verbose == Qfalse) return INT2FIX(1);
|
|
|
|
if (ruby_verbose == Qtrue) return INT2FIX(2);
|
2004-03-10 04:17:12 +03:00
|
|
|
return Qnil; /* not reached */
|
2004-03-03 07:55:35 +03:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
ruby_prog_init(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
init_ids();
|
|
|
|
|
2002-03-07 14:19:37 +03:00
|
|
|
ruby_sourcefile = rb_source_filename("ruby");
|
2003-07-29 22:26:55 +04:00
|
|
|
rb_define_hooked_variable("$VERBOSE", &ruby_verbose, 0, verbose_setter);
|
|
|
|
rb_define_hooked_variable("$-v", &ruby_verbose, 0, verbose_setter);
|
|
|
|
rb_define_hooked_variable("$-w", &ruby_verbose, 0, verbose_setter);
|
2004-03-03 07:55:35 +03:00
|
|
|
rb_define_virtual_variable("$-W", opt_W_getter, 0);
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_define_variable("$DEBUG", &ruby_debug);
|
|
|
|
rb_define_variable("$-d", &ruby_debug);
|
1998-01-16 15:13:05 +03:00
|
|
|
rb_define_readonly_variable("$-p", &do_print);
|
|
|
|
rb_define_readonly_variable("$-l", &do_line);
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
rb_define_hooked_variable("$0", &rb_progname, 0, set_arg0);
|
2004-04-02 06:36:48 +04:00
|
|
|
rb_define_hooked_variable("$PROGRAM_NAME", &rb_progname, 0, set_arg0);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
rb_define_readonly_variable("$*", &rb_argv);
|
2005-12-12 03:36:54 +03:00
|
|
|
rb_argv = rb_ary_new();
|
1998-01-16 15:19:22 +03:00
|
|
|
rb_define_global_const("ARGV", rb_argv);
|
1998-01-16 15:13:05 +03:00
|
|
|
rb_define_readonly_variable("$-a", &do_split);
|
1998-01-16 15:19:22 +03:00
|
|
|
rb_global_variable(&rb_argv0);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
#ifdef MSDOS
|
|
|
|
/*
|
|
|
|
* There is no way we can refer to them from ruby, so close them to save
|
|
|
|
* space.
|
|
|
|
*/
|
|
|
|
(void)fclose(stdaux);
|
|
|
|
(void)fclose(stdprn);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
ruby_set_argv(int argc, char **argv)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
#if defined(USE_DLN_A_OUT)
|
|
|
|
if (origargv) dln_argv0 = origargv[0];
|
|
|
|
else dln_argv0 = argv[0];
|
|
|
|
#endif
|
2001-03-13 08:45:13 +03:00
|
|
|
rb_ary_clear(rb_argv);
|
1998-01-16 15:13:05 +03:00
|
|
|
for (i=0; i < argc; i++) {
|
2003-03-25 11:26:08 +03:00
|
|
|
VALUE arg = rb_tainted_str_new2(argv[i]);
|
|
|
|
|
|
|
|
OBJ_FREEZE(arg);
|
|
|
|
rb_ary_push(rb_argv, arg);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 10:32:32 +04:00
|
|
|
NODE *rb_parser_append_print(NODE*);
|
|
|
|
NODE *rb_parser_while_loop(NODE*, int, int);
|
2004-09-22 04:19:15 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
ruby_process_options(int argc, char **argv)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
origargc = argc; origargv = argv;
|
2001-09-03 09:37:42 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
ruby_script(argv[0]); /* for the time being */
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_argv0 = rb_progname;
|
1998-01-16 15:13:05 +03:00
|
|
|
#if defined(USE_DLN_A_OUT)
|
|
|
|
dln_argv0 = argv[0];
|
|
|
|
#endif
|
2005-04-28 03:21:58 +04:00
|
|
|
set_arg0space();
|
1999-10-15 12:52:18 +04:00
|
|
|
proc_options(argc, argv);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
if (do_check && ruby_nerrs == 0) {
|
1998-01-16 15:13:05 +03:00
|
|
|
printf("Syntax OK\n");
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
if (do_print) {
|
2004-09-22 04:19:15 +04:00
|
|
|
ruby_eval_tree = rb_parser_append_print(ruby_eval_tree);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
if (do_loop) {
|
2004-09-22 04:19:15 +04:00
|
|
|
ruby_eval_tree = rb_parser_while_loop(ruby_eval_tree, do_line, do_split);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|