2000-05-09 08:53:16 +04:00
|
|
|
/**********************************************************************
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
ruby.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Tue Aug 10 12:47:31 JST 1993
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
Copyright (C) 1993-2007 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>
|
2007-07-26 08:38:07 +04:00
|
|
|
#include <sys/cygwin.h>
|
1998-01-16 15:19:22 +03:00
|
|
|
#endif
|
2007-06-10 07:06:15 +04:00
|
|
|
#include "ruby/ruby.h"
|
2007-09-29 00:29:32 +04:00
|
|
|
#include "ruby/encoding.h"
|
2007-10-03 05:06:57 +04:00
|
|
|
#include "eval_intern.h"
|
1998-01-16 15:13:05 +03:00
|
|
|
#include "dln.h"
|
|
|
|
#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
|
2009-03-09 18:06:22 +03:00
|
|
|
#if defined(LOAD_RELATIVE) && defined(HAVE_DLADDR)
|
|
|
|
#include <dlfcn.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
|
2007-09-29 00:29:32 +04:00
|
|
|
#if defined(HAVE_FCNTL_H)
|
|
|
|
#include <fcntl.h>
|
|
|
|
#elif defined(HAVE_SYS_FCNTL_H)
|
|
|
|
#include <sys/fcntl.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
|
|
|
|
2007-06-10 07:06:15 +04:00
|
|
|
#include "ruby/util.h"
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
#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
|
|
|
|
2007-11-13 15:41:41 +03:00
|
|
|
VALUE rb_parser_get_yydebug(VALUE);
|
|
|
|
VALUE rb_parser_set_yydebug(VALUE, VALUE);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-03-01 11:59:04 +03:00
|
|
|
const char *ruby_get_inplace_mode(void);
|
|
|
|
void ruby_set_inplace_mode(const char *);
|
|
|
|
|
2008-02-24 00:13:05 +03:00
|
|
|
#define DISABLE_BIT(bit) (1U << disable_##bit)
|
|
|
|
enum disable_flag_bits {
|
|
|
|
disable_gems,
|
2008-12-08 05:28:17 +03:00
|
|
|
disable_rubyopt,
|
|
|
|
disable_flag_count
|
2008-02-24 00:13:05 +03:00
|
|
|
};
|
|
|
|
|
2008-05-20 07:13:52 +04:00
|
|
|
#define DUMP_BIT(bit) (1U << dump_##bit)
|
|
|
|
enum dump_flag_bits {
|
2008-12-08 05:28:17 +03:00
|
|
|
dump_version,
|
|
|
|
dump_copyright,
|
|
|
|
dump_usage,
|
|
|
|
dump_yydebug,
|
|
|
|
dump_syntax,
|
2009-12-09 17:05:59 +03:00
|
|
|
dump_parsetree,
|
|
|
|
dump_parsetree_with_comment,
|
2008-12-08 05:28:17 +03:00
|
|
|
dump_insns,
|
|
|
|
dump_flag_count
|
2008-05-20 07:13:52 +04:00
|
|
|
};
|
|
|
|
|
2007-09-29 01:47:31 +04:00
|
|
|
struct cmdline_options {
|
|
|
|
int sflag, xflag;
|
|
|
|
int do_loop, do_print;
|
2008-12-08 05:28:17 +03:00
|
|
|
int do_line, do_split;
|
|
|
|
int do_search;
|
2008-02-24 00:49:15 +03:00
|
|
|
unsigned int disable;
|
2007-09-29 01:47:31 +04:00
|
|
|
int verbose;
|
2008-10-31 02:16:16 +03:00
|
|
|
int safe_level;
|
2008-06-09 08:20:07 +04:00
|
|
|
unsigned int setids;
|
2008-05-20 07:13:52 +04:00
|
|
|
unsigned int dump;
|
2008-05-31 13:28:20 +04:00
|
|
|
const char *script;
|
2008-04-15 21:26:29 +04:00
|
|
|
VALUE script_name;
|
2007-09-29 01:47:31 +04:00
|
|
|
VALUE e_script;
|
2008-01-25 07:18:14 +03:00
|
|
|
struct {
|
|
|
|
struct {
|
|
|
|
VALUE name;
|
|
|
|
int index;
|
|
|
|
} enc;
|
2008-10-07 21:39:44 +04:00
|
|
|
} src, ext, intern;
|
2008-06-09 08:20:07 +04:00
|
|
|
VALUE req_list;
|
2007-09-29 01:47:31 +04:00
|
|
|
};
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-06-09 08:20:07 +04:00
|
|
|
static void init_ids(struct cmdline_options *);
|
|
|
|
|
|
|
|
#define src_encoding_index GET_VM()->src_encoding_index
|
|
|
|
|
|
|
|
static struct cmdline_options *
|
|
|
|
cmdline_options_init(struct cmdline_options *opt)
|
|
|
|
{
|
|
|
|
MEMZERO(opt, *opt, 1);
|
|
|
|
init_ids(opt);
|
|
|
|
opt->src.enc.index = src_encoding_index;
|
2009-05-17 04:47:49 +04:00
|
|
|
opt->ext.enc.index = -1;
|
|
|
|
opt->intern.enc.index = -1;
|
2008-06-09 08:20:07 +04:00
|
|
|
return opt;
|
|
|
|
}
|
|
|
|
|
2007-09-29 01:47:31 +04:00
|
|
|
static NODE *load_file(VALUE, const char *, int, struct cmdline_options *);
|
2008-06-09 08:20:07 +04:00
|
|
|
static void forbid_setid(const char *, struct cmdline_options *);
|
|
|
|
#define forbid_setid(s) forbid_setid(s, opt)
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-09-29 01:50:01 +04:00
|
|
|
static struct {
|
2007-09-29 01:47:31 +04:00
|
|
|
int argc;
|
|
|
|
char **argv;
|
|
|
|
#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
|
2009-05-17 03:55:46 +04:00
|
|
|
size_t len;
|
2007-09-29 01:47:31 +04:00
|
|
|
#endif
|
|
|
|
} origarg;
|
1998-01-16 15:19:22 +03:00
|
|
|
|
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
|
|
|
|
2007-07-26 08:57:48 +04:00
|
|
|
static const char *const usage_msg[] = {
|
2006-12-31 18:02:22 +03:00
|
|
|
"-0[octal] specify record separator (\\0, if no argument)",
|
|
|
|
"-a autosplit mode with -n or -p (splits $_ into $F)",
|
|
|
|
"-c check syntax only",
|
|
|
|
"-Cdirectory cd to directory, before executing your script",
|
|
|
|
"-d set debugging flags (set $DEBUG to true)",
|
|
|
|
"-e 'command' one line of script. Several -e's allowed. Omit [programfile]",
|
2008-10-25 06:18:53 +04:00
|
|
|
"-Eex[:in] specify the default external and internal character encodings",
|
2006-12-31 18:02:22 +03:00
|
|
|
"-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)",
|
|
|
|
"-l enable line ending processing",
|
|
|
|
"-n assume 'while gets(); ... end' loop around your script",
|
|
|
|
"-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",
|
2009-10-26 06:41:01 +03:00
|
|
|
"-T[level=1] turn on tainting checks",
|
2006-12-31 18:02:22 +03:00
|
|
|
"-v print version number, then turn on verbose mode",
|
|
|
|
"-w turn warnings on for your script",
|
2009-10-26 06:41:01 +03:00
|
|
|
"-W[level=2] set warning level; 0=silence, 1=medium, 2=verbose",
|
2006-12-31 18:02:22 +03:00
|
|
|
"-x[directory] strip off text before #!ruby line and perhaps cd to directory",
|
|
|
|
"--copyright print the copyright",
|
|
|
|
"--version print the version",
|
|
|
|
NULL
|
|
|
|
};
|
2007-07-26 08:57:48 +04:00
|
|
|
const char *const *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
|
|
|
}
|
|
|
|
|
2008-04-30 13:03:03 +04:00
|
|
|
VALUE rb_get_load_path(void);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2009-03-09 22:56:46 +03:00
|
|
|
#ifdef MANGLED_PATH
|
2007-07-26 08:38:07 +04:00
|
|
|
static VALUE
|
|
|
|
rubylib_mangled_path(const char *s, unsigned int l)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
static char *newp, *oldp;
|
|
|
|
static int newl, oldl, notfound;
|
2007-07-26 08:38:07 +04:00
|
|
|
char *ptr;
|
|
|
|
VALUE ret;
|
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) {
|
2007-07-26 08:38:07 +04:00
|
|
|
oldp = newp = strdup(newp);
|
1999-08-13 09:45:20 +04:00
|
|
|
while (*newp && !ISSPACE(*newp) && *newp != ';') {
|
2007-07-26 08:38:07 +04:00
|
|
|
newp = CharNext(newp); /* Skip digits. */
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2007-07-26 08:38:07 +04:00
|
|
|
oldl = newp - oldp;
|
1999-08-13 09:45:20 +04:00
|
|
|
while (*newp && (ISSPACE(*newp) || *newp == ';')) {
|
2007-07-26 08:38:07 +04:00
|
|
|
newp = CharNext(newp); /* Skip whitespace. */
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
newl = strlen(newp);
|
2007-07-26 08:38:07 +04:00
|
|
|
if (newl == 0 || oldl == 0) {
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_fatal("malformed RUBYLIB_PREFIX");
|
|
|
|
}
|
2009-02-19 09:11:41 +03:00
|
|
|
translit_char(newp, '\\', '/');
|
2001-05-02 08:22:21 +04:00
|
|
|
}
|
|
|
|
else {
|
1999-08-13 09:45:20 +04:00
|
|
|
notfound = 1;
|
|
|
|
}
|
|
|
|
}
|
2008-01-01 15:24:04 +03:00
|
|
|
if (!newp || l < oldl || STRNCASECMP(oldp, s, oldl) != 0) {
|
2008-12-15 05:32:21 +03:00
|
|
|
return rb_str_new(s, l);
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2008-12-15 05:32:21 +03:00
|
|
|
ret = rb_str_new(0, l + newl - oldl);
|
2007-07-26 08:38:07 +04:00
|
|
|
ptr = RSTRING_PTR(ret);
|
|
|
|
memcpy(ptr, newp, newl);
|
|
|
|
memcpy(ptr + newl, s + oldl, l - oldl);
|
|
|
|
ptr[l + newl - oldl] = 0;
|
|
|
|
return ret;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
#else
|
2008-12-15 05:32:21 +03:00
|
|
|
#define rubylib_mangled_path rb_str_new
|
1999-08-13 09:45:20 +04:00
|
|
|
#endif
|
|
|
|
|
2007-07-26 08:38:07 +04:00
|
|
|
static void
|
|
|
|
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;
|
2007-07-26 08:38:07 +04:00
|
|
|
const char *p, *s;
|
2008-04-30 13:03:03 +04:00
|
|
|
VALUE load_path = GET_VM()->load_path;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2007-07-26 08:38:07 +04:00
|
|
|
p = path;
|
|
|
|
while (*p) {
|
|
|
|
while (*p == sep)
|
|
|
|
p++;
|
|
|
|
if (!*p) break;
|
|
|
|
for (s = p; *s && *s != sep; s = CharNext(s));
|
2008-04-30 13:03:03 +04:00
|
|
|
rb_ary_push(load_path, (*filter)(rubylib_mangled_path(p, s - p)));
|
2007-07-26 08:38:07 +04:00
|
|
|
p = s;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2007-07-26 08:38:07 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef __CYGWIN__
|
|
|
|
static void
|
|
|
|
push_include_cygwin(const char *path, VALUE (*filter)(VALUE))
|
|
|
|
{
|
|
|
|
const char *p, *s;
|
|
|
|
char rubylib[FILENAME_MAX];
|
|
|
|
VALUE buf = 0;
|
|
|
|
|
|
|
|
p = path;
|
|
|
|
while (*p) {
|
|
|
|
unsigned int len;
|
|
|
|
while (*p == ';')
|
|
|
|
p++;
|
|
|
|
if (!*p) break;
|
|
|
|
for (s = p; *s && *s != ';'; s = CharNext(s));
|
|
|
|
len = s - p;
|
|
|
|
if (*s) {
|
|
|
|
if (!buf) {
|
|
|
|
buf = rb_str_new(p, len);
|
|
|
|
p = RSTRING_PTR(buf);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
else {
|
2007-07-26 08:38:07 +04:00
|
|
|
rb_str_resize(buf, len);
|
|
|
|
p = strncpy(RSTRING_PTR(buf), p, len);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
2007-07-26 08:38:07 +04:00
|
|
|
if (cygwin_conv_to_posix_path(p, rubylib) == 0)
|
|
|
|
p = rubylib;
|
|
|
|
push_include(p, filter);
|
|
|
|
if (!*s) break;
|
|
|
|
p = s + 1;
|
2000-08-01 13:25:37 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-26 08:38:07 +04:00
|
|
|
#define push_include push_include_cygwin
|
|
|
|
#endif
|
|
|
|
|
|
|
|
void
|
|
|
|
ruby_push_include(const char *path, VALUE (*filter)(VALUE))
|
|
|
|
{
|
|
|
|
if (path == 0)
|
|
|
|
return;
|
|
|
|
push_include(path, filter);
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
}
|
2008-12-15 05:32:21 +03:00
|
|
|
static VALUE
|
|
|
|
locale_path(VALUE path)
|
|
|
|
{
|
|
|
|
rb_enc_associate(path, rb_locale_encoding());
|
|
|
|
return path;
|
|
|
|
}
|
2005-04-21 01:44:20 +04:00
|
|
|
|
2007-07-26 08:38:07 +04:00
|
|
|
void
|
2005-04-21 01:44:20 +04:00
|
|
|
ruby_incpush(const char *path)
|
|
|
|
{
|
2008-12-15 05:32:21 +03:00
|
|
|
ruby_push_include(path, locale_path);
|
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
|
|
|
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);
|
2006-12-31 18:02:22 +03:00
|
|
|
if (!p)
|
|
|
|
return path;
|
|
|
|
if (*p == '.' && p[1] == '/')
|
|
|
|
return path;
|
2005-04-21 01:44:20 +04:00
|
|
|
return rb_file_expand_path(path, Qnil);
|
|
|
|
}
|
|
|
|
|
2009-01-21 07:59:20 +03:00
|
|
|
void
|
2005-04-21 01:44:20 +04:00
|
|
|
ruby_incpush_expand(const char *path)
|
|
|
|
{
|
|
|
|
ruby_push_include(path, expand_include_path);
|
|
|
|
}
|
|
|
|
|
2007-05-18 06:11:42 +04:00
|
|
|
#if defined _WIN32 || defined __CYGWIN__
|
|
|
|
static HMODULE libruby;
|
|
|
|
|
|
|
|
BOOL WINAPI
|
|
|
|
DllMain(HINSTANCE dll, DWORD reason, LPVOID reserved)
|
|
|
|
{
|
|
|
|
if (reason == DLL_PROCESS_ATTACH)
|
|
|
|
libruby = dll;
|
|
|
|
return TRUE;
|
|
|
|
}
|
2009-03-02 05:01:48 +03:00
|
|
|
|
|
|
|
HANDLE
|
|
|
|
rb_libruby_handle(void)
|
|
|
|
{
|
|
|
|
return libruby;
|
|
|
|
}
|
2007-05-18 06:11:42 +04:00
|
|
|
#endif
|
|
|
|
|
2008-10-31 02:16:16 +03:00
|
|
|
void ruby_init_loadpath_safe(int safe_level);
|
|
|
|
|
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)
|
2008-10-31 02:16:16 +03:00
|
|
|
{
|
|
|
|
ruby_init_loadpath_safe(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ruby_init_loadpath_safe(int safe_level)
|
2000-08-01 13:25:37 +04:00
|
|
|
{
|
2008-04-30 13:03:03 +04:00
|
|
|
VALUE load_path;
|
2010-03-12 18:11:10 +03:00
|
|
|
ID id_initial_load_path_mark;
|
2009-02-05 05:21:37 +03:00
|
|
|
extern const char ruby_initial_load_paths[];
|
|
|
|
const char *paths = ruby_initial_load_paths;
|
2001-05-28 20:07:34 +04:00
|
|
|
#if defined LOAD_RELATIVE
|
2009-05-17 04:02:58 +04:00
|
|
|
# if defined HAVE_DLADDR || (defined __CYGWIN__ && defined CCP_WIN_A_TO_POSIX)
|
|
|
|
# define VARIABLE_LIBPATH 1
|
|
|
|
# else
|
|
|
|
# define VARIABLE_LIBPATH 0
|
|
|
|
# endif
|
|
|
|
# if VARIABLE_LIBPATH
|
|
|
|
char *libpath;
|
|
|
|
VALUE sopath;
|
|
|
|
# else
|
2006-12-31 18:02:22 +03:00
|
|
|
char libpath[MAXPATHLEN + 1];
|
2009-05-17 04:02:58 +04:00
|
|
|
# endif
|
2009-10-18 13:32:02 +04:00
|
|
|
size_t baselen;
|
2000-08-03 13:50:41 +04:00
|
|
|
char *p;
|
2007-05-18 06:11:42 +04:00
|
|
|
|
2001-05-28 20:07:34 +04:00
|
|
|
#if defined _WIN32 || defined __CYGWIN__
|
2009-05-17 04:02:58 +04:00
|
|
|
# if VARIABLE_LIBPATH
|
2010-03-12 01:15:11 +03:00
|
|
|
sopath = rb_str_new(0, MAXPATHLEN);
|
2009-05-17 04:02:58 +04:00
|
|
|
libpath = RSTRING_PTR(sopath);
|
|
|
|
GetModuleFileName(libruby, libpath, MAXPATHLEN);
|
|
|
|
# else
|
2001-05-28 20:07:34 +04:00
|
|
|
GetModuleFileName(libruby, libpath, sizeof libpath);
|
2009-05-17 04:02:58 +04:00
|
|
|
# endif
|
2000-10-02 11:48:42 +04:00
|
|
|
#elif defined(__EMX__)
|
2004-03-12 14:19:22 +03:00
|
|
|
_execname(libpath, sizeof(libpath) - 1);
|
2009-03-09 18:06:22 +03:00
|
|
|
#elif defined(HAVE_DLADDR)
|
|
|
|
Dl_info dli;
|
2009-03-09 22:56:46 +03:00
|
|
|
if (dladdr(expand_include_path, &dli)) {
|
2009-05-17 04:02:58 +04:00
|
|
|
VALUE fname = rb_str_new_cstr(dli.dli_fname);
|
|
|
|
sopath = rb_file_absolute_path(fname, Qnil);
|
|
|
|
rb_str_resize(fname, 0);
|
2009-03-09 18:06:22 +03:00
|
|
|
}
|
2009-08-27 08:55:55 +04:00
|
|
|
else {
|
|
|
|
sopath = rb_str_new(0, 0);
|
|
|
|
}
|
|
|
|
libpath = RSTRING_PTR(sopath);
|
2000-08-03 13:50:41 +04:00
|
|
|
#endif
|
2001-02-09 17:11:23 +03:00
|
|
|
|
2009-05-17 04:02:58 +04:00
|
|
|
#if !VARIABLE_LIBPATH
|
2004-03-12 14:19:22 +03:00
|
|
|
libpath[sizeof(libpath) - 1] = '\0';
|
2009-05-17 04:02:58 +04:00
|
|
|
#endif
|
2007-07-26 08:38:07 +04:00
|
|
|
#if defined DOSISH
|
2009-02-19 09:11:41 +03:00
|
|
|
translit_char(libpath, '\\', '/');
|
2007-07-26 08:38:07 +04:00
|
|
|
#elif defined __CYGWIN__
|
|
|
|
{
|
2009-05-17 18:05:08 +04:00
|
|
|
# if VARIABLE_LIBPATH
|
2009-05-17 04:02:58 +04:00
|
|
|
const int win_to_posix = CCP_WIN_A_TO_POSIX | CCP_RELATIVE;
|
|
|
|
size_t newsize = cygwin_conv_path(win_to_posix, libpath, 0, 0);
|
|
|
|
if (newsize > 0) {
|
2010-03-12 01:15:11 +03:00
|
|
|
VALUE rubylib = rb_str_new(0, newsize);
|
2009-05-17 04:02:58 +04:00
|
|
|
p = RSTRING_PTR(rubylib);
|
|
|
|
if (cygwin_conv_path(win_to_posix, libpath, p, newsize) == 0) {
|
|
|
|
rb_str_resize(sopath, 0);
|
|
|
|
sopath = rubylib;
|
|
|
|
libpath = p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
# else
|
2007-07-26 08:38:07 +04:00
|
|
|
char rubylib[FILENAME_MAX];
|
|
|
|
cygwin_conv_to_posix_path(libpath, rubylib);
|
|
|
|
strncpy(libpath, rubylib, sizeof(libpath));
|
2009-05-17 04:02:58 +04:00
|
|
|
# endif
|
2007-07-26 08:38:07 +04:00
|
|
|
}
|
2001-02-09 17:11:23 +03:00
|
|
|
#endif
|
|
|
|
p = strrchr(libpath, '/');
|
2000-08-03 13:50:41 +04:00
|
|
|
if (p) {
|
|
|
|
*p = 0;
|
2009-03-11 00:12:49 +03:00
|
|
|
if (p - libpath > 3 && !(STRCASECMP(p - 4, "/bin") && strcmp(p - 4, "/lib"))) {
|
2000-08-03 13:50:41 +04:00
|
|
|
p -= 4;
|
|
|
|
*p = 0;
|
|
|
|
}
|
2001-05-02 08:22:21 +04:00
|
|
|
}
|
2009-05-17 04:02:58 +04:00
|
|
|
#if !VARIABLE_LIBPATH
|
2001-05-02 08:22:21 +04:00
|
|
|
else {
|
* dir.c, dln.c, parse.y, re.c, ruby.c, sprintf.c, strftime.c,
string.c, util.c, variable.c: use strlcpy, memcpy and snprintf
instead of strcpy, strncpy and sprintf.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-17 04:29:17 +03:00
|
|
|
strlcpy(libpath, ".", sizeof(libpath));
|
2000-08-03 13:50:41 +04:00
|
|
|
p = libpath + 1;
|
|
|
|
}
|
2010-03-12 01:15:11 +03:00
|
|
|
#define PREFIX_PATH() rb_str_new(libpath, baselen)
|
2009-05-17 04:02:58 +04:00
|
|
|
#else
|
|
|
|
rb_str_set_len(sopath, p - libpath);
|
2010-03-12 01:15:11 +03:00
|
|
|
#define PREFIX_PATH() sopath
|
2009-05-17 04:02:58 +04:00
|
|
|
#endif
|
|
|
|
|
2009-10-18 13:32:02 +04:00
|
|
|
baselen = p - libpath;
|
|
|
|
#define BASEPATH() rb_str_buf_cat(rb_str_buf_new(baselen+len), libpath, baselen)
|
|
|
|
|
2009-03-09 22:56:46 +03:00
|
|
|
#define RUBY_RELATIVE(path, len) rb_str_buf_cat(BASEPATH(), path, len)
|
2000-08-03 13:50:41 +04:00
|
|
|
#else
|
2010-03-18 00:28:36 +03:00
|
|
|
static const char exec_prefix[] = RUBY_EXEC_PREFIX;
|
2009-03-09 22:56:46 +03:00
|
|
|
#define RUBY_RELATIVE(path, len) rubylib_mangled_path(path, len)
|
2010-03-18 00:28:36 +03:00
|
|
|
#define PREFIX_PATH() rubylib_mangled_path(exec_prefix, sizeof(exec_prefix)-1)
|
2000-08-03 13:50:41 +04:00
|
|
|
#endif
|
2008-04-30 13:03:03 +04:00
|
|
|
load_path = GET_VM()->load_path;
|
2000-08-03 13:50:41 +04:00
|
|
|
|
2008-10-31 02:16:16 +03:00
|
|
|
if (safe_level == 0) {
|
2008-12-15 05:32:21 +03:00
|
|
|
ruby_push_include(getenv("RUBYLIB"), identical_path);
|
2000-08-01 13:25:37 +04:00
|
|
|
}
|
|
|
|
|
2010-03-12 18:11:10 +03:00
|
|
|
id_initial_load_path_mark = rb_intern_const("@gem_prelude_index");
|
2009-02-05 05:21:37 +03:00
|
|
|
while (*paths) {
|
2009-05-17 04:02:58 +04:00
|
|
|
size_t len = strlen(paths);
|
2010-03-12 18:11:10 +03:00
|
|
|
VALUE path = RUBY_RELATIVE(paths, len);
|
|
|
|
rb_ivar_set(path, id_initial_load_path_mark, path);
|
|
|
|
rb_ary_push(load_path, path);
|
2009-03-09 22:56:46 +03:00
|
|
|
paths += len + 1;
|
2009-02-05 05:21:37 +03:00
|
|
|
}
|
2010-03-12 01:15:11 +03:00
|
|
|
|
|
|
|
rb_const_set(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"), rb_obj_freeze(PREFIX_PATH()));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2009-05-17 04:47:49 +04:00
|
|
|
add_modules(VALUE *req_list, const char *mod)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-05-17 04:47:49 +04:00
|
|
|
VALUE list = *req_list;
|
2008-06-09 08:20:07 +04:00
|
|
|
|
|
|
|
if (!list) {
|
2009-05-17 04:47:49 +04:00
|
|
|
*req_list = list = rb_ary_new();
|
2008-06-09 08:20:07 +04:00
|
|
|
RBASIC(list)->klass = 0;
|
|
|
|
}
|
|
|
|
rb_ary_push(list, rb_obj_freeze(rb_str_new2(mod)));
|
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);
|
2007-10-01 05:58:44 +04:00
|
|
|
extern VALUE rb_vm_top_self(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
|
2009-05-17 04:47:49 +04:00
|
|
|
require_libraries(VALUE *req_list)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-05-17 04:47:49 +04:00
|
|
|
VALUE list = *req_list;
|
2008-06-09 13:25:32 +04:00
|
|
|
ID require;
|
2008-12-28 21:45:24 +03:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
rb_block_t *prev_base_block = th->base_block;
|
2009-01-19 07:41:19 +03:00
|
|
|
int prev_parse_in_eval = th->parse_in_eval;
|
2008-12-28 21:45:24 +03:00
|
|
|
th->base_block = 0;
|
2009-01-19 07:41:19 +03:00
|
|
|
th->parse_in_eval = 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-04-11 14:10:18 +04:00
|
|
|
Init_ext(); /* should be called here for some reason :-( */
|
2008-06-09 13:25:32 +04:00
|
|
|
CONST_ID(require, "require");
|
2008-06-09 10:40:02 +04:00
|
|
|
while (list && RARRAY_LEN(list) > 0) {
|
2008-06-09 08:20:07 +04:00
|
|
|
VALUE feature = rb_ary_shift(list);
|
2007-10-01 05:58:44 +04:00
|
|
|
rb_funcall2(rb_vm_top_self(), require, 1, &feature);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2009-05-17 04:47:49 +04:00
|
|
|
*req_list = 0;
|
2009-01-19 07:41:19 +03:00
|
|
|
|
|
|
|
th->parse_in_eval = prev_parse_in_eval;
|
2008-12-28 21:45:24 +03:00
|
|
|
th->base_block = prev_base_block;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-05-17 04:47:49 +04:00
|
|
|
process_sflag(int *sflag)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-05-17 04:47:49 +04:00
|
|
|
if (*sflag > 0) {
|
2002-08-21 19:47:54 +04:00
|
|
|
long n;
|
1999-10-15 12:52:18 +04:00
|
|
|
VALUE *args;
|
2008-03-01 11:59:04 +03:00
|
|
|
VALUE argv = rb_argv;
|
1999-10-15 12:52:18 +04:00
|
|
|
|
2008-03-01 11:59:04 +03:00
|
|
|
n = RARRAY_LEN(argv);
|
|
|
|
args = RARRAY_PTR(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;
|
2009-09-13 15:18:51 +04:00
|
|
|
int hyphen = FALSE;
|
1999-10-15 12:52:18 +04:00
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
if (s[0] != '-')
|
|
|
|
break;
|
1999-12-02 09:58:52 +03:00
|
|
|
n--;
|
2006-12-31 18:02:22 +03:00
|
|
|
if (s[1] == '-' && s[2] == '\0')
|
|
|
|
break;
|
1999-10-15 12:52:18 +04:00
|
|
|
|
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 == '-') {
|
2009-09-13 15:18:51 +04:00
|
|
|
hyphen = TRUE;
|
2005-05-01 04:13:48 +04:00
|
|
|
}
|
|
|
|
else if (*p != '_' && !ISALNUM(*p)) {
|
|
|
|
VALUE name_error[2];
|
2006-12-31 18:02:22 +03:00
|
|
|
name_error[0] =
|
|
|
|
rb_str_new2("invalid name for global variable - ");
|
2005-05-01 04:13:48 +04:00
|
|
|
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];
|
2007-09-29 01:47:31 +04:00
|
|
|
rb_exc_raise(rb_class_new_instance(2, name_error, rb_eNameError));
|
2005-05-01 04:13:48 +04:00
|
|
|
}
|
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) {
|
2006-12-31 18:02:22 +03:00
|
|
|
if (*p == '-')
|
|
|
|
*p = '_';
|
2005-05-01 04:13:48 +04:00
|
|
|
}
|
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
|
|
|
}
|
2008-03-01 11:59:04 +03:00
|
|
|
n = RARRAY_LEN(argv) - n;
|
1999-10-15 12:52:18 +04:00
|
|
|
while (n--) {
|
2008-03-01 11:59:04 +03:00
|
|
|
rb_ary_shift(argv);
|
1999-10-15 12:52:18 +04:00
|
|
|
}
|
2009-05-17 04:47:49 +04:00
|
|
|
*sflag = -1;
|
1999-10-15 12:52:18 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-05 13:28:00 +04:00
|
|
|
NODE *rb_parser_append_print(VALUE, NODE *);
|
|
|
|
NODE *rb_parser_while_loop(VALUE, NODE *, int, int);
|
2009-05-17 04:47:49 +04:00
|
|
|
static long proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt);
|
1999-10-21 11:52:15 +04:00
|
|
|
|
2008-10-30 04:34:23 +03:00
|
|
|
static void
|
|
|
|
moreswitches(const char *s, struct cmdline_options *opt, int envopt)
|
1999-10-21 11:52:15 +04:00
|
|
|
{
|
2009-05-17 04:47:49 +04:00
|
|
|
long argc, i, len;
|
2008-10-30 04:34:23 +03:00
|
|
|
char **argv, *p;
|
|
|
|
const char *ap = 0;
|
|
|
|
VALUE argstr, argary;
|
|
|
|
|
|
|
|
while (ISSPACE(*s)) s++;
|
|
|
|
if (!*s) return;
|
* dir.c, dln.c, parse.y, re.c, ruby.c, sprintf.c, strftime.c,
string.c, util.c, variable.c: use strlcpy, memcpy and snprintf
instead of strcpy, strncpy and sprintf.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-17 04:29:17 +03:00
|
|
|
argstr = rb_str_tmp_new((len = strlen(s)) + 2);
|
2008-10-30 04:34:23 +03:00
|
|
|
argary = rb_str_tmp_new(0);
|
|
|
|
|
|
|
|
p = RSTRING_PTR(argstr);
|
|
|
|
*p++ = ' ';
|
* dir.c, dln.c, parse.y, re.c, ruby.c, sprintf.c, strftime.c,
string.c, util.c, variable.c: use strlcpy, memcpy and snprintf
instead of strcpy, strncpy and sprintf.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-17 04:29:17 +03:00
|
|
|
memcpy(p, s, len + 1);
|
2008-10-30 04:34:23 +03:00
|
|
|
ap = 0;
|
|
|
|
rb_str_cat(argary, (char *)&ap, sizeof(ap));
|
|
|
|
while (*p) {
|
|
|
|
ap = p;
|
|
|
|
rb_str_cat(argary, (char *)&ap, sizeof(ap));
|
|
|
|
while (*p && !ISSPACE(*p)) ++p;
|
|
|
|
if (!*p) break;
|
|
|
|
*p++ = '\0';
|
2009-01-21 07:59:20 +03:00
|
|
|
while (ISSPACE(*p)) ++p;
|
2008-10-30 04:34:23 +03:00
|
|
|
}
|
|
|
|
argc = RSTRING_LEN(argary) / sizeof(ap);
|
|
|
|
ap = 0;
|
|
|
|
rb_str_cat(argary, (char *)&ap, sizeof(ap));
|
|
|
|
argv = (char **)RSTRING_PTR(argary);
|
|
|
|
|
|
|
|
while ((i = proc_options(argc, argv, opt, envopt)) > 1 && (argc -= i) > 0) {
|
|
|
|
argv += i;
|
|
|
|
if (**argv != '-') {
|
|
|
|
*--*argv = '-';
|
|
|
|
}
|
|
|
|
if ((*argv)[1]) {
|
|
|
|
++argc;
|
|
|
|
--argv;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get rid of GC */
|
|
|
|
rb_str_resize(argary, 0);
|
|
|
|
rb_str_resize(argstr, 0);
|
1999-10-21 11:52:15 +04:00
|
|
|
}
|
|
|
|
|
2008-02-24 00:49:15 +03:00
|
|
|
#define NAME_MATCH_P(name, str, len) \
|
2009-05-17 04:47:49 +04:00
|
|
|
((len) < (int)sizeof(name) && strncmp((str), name, (len)) == 0)
|
2008-02-24 00:49:15 +03:00
|
|
|
|
|
|
|
#define UNSET_WHEN(name, bit, str, len) \
|
|
|
|
if (NAME_MATCH_P(name, str, len)) { \
|
|
|
|
*(unsigned int *)arg &= ~(bit); \
|
|
|
|
return; \
|
2008-02-24 00:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-02-24 00:49:15 +03:00
|
|
|
#define SET_WHEN(name, bit, str, len) \
|
|
|
|
if (NAME_MATCH_P(name, str, len)) { \
|
|
|
|
*(unsigned int *)arg |= (bit); \
|
|
|
|
return; \
|
2008-02-24 00:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
enable_option(const char *str, int len, void *arg)
|
|
|
|
{
|
2008-02-24 00:49:15 +03:00
|
|
|
#define UNSET_WHEN_DISABLE(bit) UNSET_WHEN(#bit, DISABLE_BIT(bit), str, len)
|
|
|
|
UNSET_WHEN_DISABLE(gems);
|
|
|
|
UNSET_WHEN_DISABLE(rubyopt);
|
|
|
|
if (NAME_MATCH_P("all", str, len)) {
|
|
|
|
*(unsigned int *)arg = 0U;
|
|
|
|
return;
|
|
|
|
}
|
2008-02-24 00:13:05 +03:00
|
|
|
rb_warn("unknown argument for --enable: `%.*s'", len, str);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
disable_option(const char *str, int len, void *arg)
|
|
|
|
{
|
2008-02-24 00:49:15 +03:00
|
|
|
#define SET_WHEN_DISABLE(bit) SET_WHEN(#bit, DISABLE_BIT(bit), str, len)
|
|
|
|
SET_WHEN_DISABLE(gems);
|
|
|
|
SET_WHEN_DISABLE(rubyopt);
|
|
|
|
if (NAME_MATCH_P("all", str, len)) {
|
|
|
|
*(unsigned int *)arg = ~0U;
|
|
|
|
return;
|
|
|
|
}
|
2008-02-24 00:13:05 +03:00
|
|
|
rb_warn("unknown argument for --disable: `%.*s'", len, str);
|
|
|
|
}
|
|
|
|
|
2008-05-20 07:13:52 +04:00
|
|
|
static void
|
|
|
|
dump_option(const char *str, int len, void *arg)
|
|
|
|
{
|
|
|
|
#define SET_WHEN_DUMP(bit) SET_WHEN(#bit, DUMP_BIT(bit), str, len)
|
2008-12-08 05:28:17 +03:00
|
|
|
SET_WHEN_DUMP(version);
|
|
|
|
SET_WHEN_DUMP(copyright);
|
|
|
|
SET_WHEN_DUMP(usage);
|
|
|
|
SET_WHEN_DUMP(yydebug);
|
|
|
|
SET_WHEN_DUMP(syntax);
|
2009-12-09 17:05:59 +03:00
|
|
|
SET_WHEN_DUMP(parsetree);
|
|
|
|
SET_WHEN_DUMP(parsetree_with_comment);
|
2008-05-20 07:13:52 +04:00
|
|
|
SET_WHEN_DUMP(insns);
|
2008-12-08 05:28:17 +03:00
|
|
|
rb_warn("don't know how to dump `%.*s',", len, str);
|
2009-12-09 17:05:59 +03:00
|
|
|
rb_warn("but only [version, copyright, usage, yydebug, syntax, parsetree, parsetree_with_comment, insns].");
|
2008-05-20 07:13:52 +04:00
|
|
|
}
|
|
|
|
|
2008-10-14 04:41:09 +04:00
|
|
|
static void
|
2009-05-17 04:47:49 +04:00
|
|
|
set_option_encoding_once(const char *type, VALUE *name, const char *e, long elen)
|
2008-10-14 04:41:09 +04:00
|
|
|
{
|
|
|
|
VALUE ename;
|
|
|
|
|
|
|
|
if (!elen) elen = strlen(e);
|
|
|
|
ename = rb_str_new(e, elen);
|
|
|
|
|
2008-12-08 04:32:36 +03:00
|
|
|
if (*name &&
|
|
|
|
rb_funcall(ename, rb_intern("casecmp"), 1, *name) != INT2FIX(0)) {
|
2008-10-14 04:41:09 +04:00
|
|
|
rb_raise(rb_eRuntimeError,
|
2008-12-08 04:32:36 +03:00
|
|
|
"%s already set to %s", type, RSTRING_PTR(*name));
|
2008-10-14 04:41:09 +04:00
|
|
|
}
|
2008-12-08 04:32:36 +03:00
|
|
|
*name = ename;
|
2008-10-14 04:41:09 +04:00
|
|
|
}
|
|
|
|
|
2008-12-08 04:32:36 +03:00
|
|
|
#define set_internal_encoding_once(opt, e, elen) \
|
2009-11-04 09:46:32 +03:00
|
|
|
set_option_encoding_once("default_internal", &opt->intern.enc.name, e, elen)
|
2008-12-08 04:32:36 +03:00
|
|
|
#define set_external_encoding_once(opt, e, elen) \
|
2009-11-04 09:46:32 +03:00
|
|
|
set_option_encoding_once("default_external", &opt->ext.enc.name, e, elen)
|
2008-12-08 04:32:36 +03:00
|
|
|
#define set_source_encoding_once(opt, e, elen) \
|
|
|
|
set_option_encoding_once("source", &opt->src.enc.name, e, elen)
|
2008-10-14 04:41:09 +04:00
|
|
|
|
2009-05-17 04:47:49 +04:00
|
|
|
static long
|
|
|
|
proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
|
1999-10-15 12:52:18 +04:00
|
|
|
{
|
2009-05-17 04:47:49 +04:00
|
|
|
long n, argc0 = argc;
|
2006-07-21 18:58:18 +04:00
|
|
|
const char *s;
|
1999-10-16 14:33:06 +04:00
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
if (argc == 0)
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
return 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
for (argc--, argv++; argc > 0; argc--, argv++) {
|
2008-12-08 04:32:36 +03:00
|
|
|
const char *const arg = argv[0];
|
|
|
|
if (arg[0] != '-' || !arg[1])
|
2006-12-31 18:02:22 +03:00
|
|
|
break;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-12-08 04:32:36 +03:00
|
|
|
s = arg + 1;
|
1998-01-16 15:13:05 +03:00
|
|
|
reswitch:
|
|
|
|
switch (*s) {
|
|
|
|
case 'a':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
2009-09-13 15:18:51 +04:00
|
|
|
opt->do_split = TRUE;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'p':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
2009-09-13 15:18:51 +04:00
|
|
|
opt->do_print = TRUE;
|
1998-01-16 15:13:05 +03:00
|
|
|
/* through */
|
|
|
|
case 'n':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
2009-09-13 15:18:51 +04:00
|
|
|
opt->do_loop = TRUE;
|
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':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
2008-12-08 05:28:17 +03:00
|
|
|
opt->dump |= DUMP_BIT(yydebug);
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'v':
|
2007-09-29 01:47:31 +04:00
|
|
|
if (opt->verbose) {
|
2001-02-27 10:52:11 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
ruby_show_version();
|
2007-09-29 01:47:31 +04:00
|
|
|
opt->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':
|
|
|
|
{
|
2009-03-14 12:25:20 +03:00
|
|
|
size_t numlen;
|
2003-07-29 22:26:55 +04:00
|
|
|
int v = 2; /* -W as -W2 */
|
|
|
|
|
|
|
|
if (*++s) {
|
|
|
|
v = scan_oct(s, 1, &numlen);
|
2006-12-31 18:02:22 +03:00
|
|
|
if (numlen == 0)
|
|
|
|
v = 1;
|
2003-07-29 22:26:55 +04:00
|
|
|
s += numlen;
|
|
|
|
}
|
|
|
|
switch (v) {
|
|
|
|
case 0:
|
2006-12-31 18:02:22 +03:00
|
|
|
ruby_verbose = Qnil;
|
|
|
|
break;
|
2003-07-29 22:26:55 +04:00
|
|
|
case 1:
|
2006-12-31 18:02:22 +03:00
|
|
|
ruby_verbose = Qfalse;
|
|
|
|
break;
|
2003-07-29 22:26:55 +04:00
|
|
|
default:
|
2006-12-31 18:02:22 +03:00
|
|
|
ruby_verbose = Qtrue;
|
|
|
|
break;
|
2003-07-29 22:26:55 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
goto reswitch;
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
case 'c':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
2008-12-08 05:28:17 +03:00
|
|
|
opt->dump |= DUMP_BIT(syntax);
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 's':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
1998-01-16 15:13:05 +03:00
|
|
|
forbid_setid("-s");
|
2009-05-17 04:47:49 +04:00
|
|
|
if (!opt->sflag) opt->sflag = 1;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
case 'h':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
2008-12-08 05:28:17 +03:00
|
|
|
opt->dump |= DUMP_BIT(usage);
|
|
|
|
goto switch_end;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
case 'l':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
2009-09-13 15:18:51 +04:00
|
|
|
opt->do_line = TRUE;
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_output_rs = rb_rs;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'S':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
1998-01-16 15:13:05 +03:00
|
|
|
forbid_setid("-S");
|
2009-09-13 15:18:51 +04:00
|
|
|
opt->do_search = TRUE;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'e':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
1998-01-16 15:13:05 +03:00
|
|
|
forbid_setid("-e");
|
1999-08-13 09:45:20 +04:00
|
|
|
if (!*++s) {
|
|
|
|
s = argv[1];
|
2006-12-31 18:02:22 +03:00
|
|
|
argc--, argv++;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
if (!s) {
|
2007-09-29 01:47:31 +04:00
|
|
|
rb_raise(rb_eRuntimeError, "no code specified for -e");
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2007-09-29 01:47:31 +04:00
|
|
|
if (!opt->e_script) {
|
|
|
|
opt->e_script = rb_str_new(0, 0);
|
|
|
|
if (opt->script == 0)
|
|
|
|
opt->script = "-e";
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2007-09-29 01:47:31 +04:00
|
|
|
rb_str_cat2(opt->e_script, s);
|
|
|
|
rb_str_cat2(opt->e_script, "\n");
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'r':
|
|
|
|
forbid_setid("-r");
|
|
|
|
if (*++s) {
|
2009-05-17 04:47:49 +04:00
|
|
|
add_modules(&opt->req_list, s);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
else if (argv[1]) {
|
2009-05-17 04:47:49 +04:00
|
|
|
add_modules(&opt->req_list, argv[1]);
|
2006-12-31 18:02:22 +03:00
|
|
|
argc--, argv++;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'i':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
1998-01-16 15:13:05 +03:00
|
|
|
forbid_setid("-i");
|
2008-03-01 11:59:04 +03:00
|
|
|
ruby_set_inplace_mode(s + 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'x':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
2009-09-13 15:18:51 +04:00
|
|
|
opt->xflag = TRUE;
|
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':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
1998-01-16 15:13:05 +03:00
|
|
|
s++;
|
|
|
|
if (!*s) {
|
|
|
|
s = argv[1];
|
2006-12-31 18:02:22 +03:00
|
|
|
argc--, argv++;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
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':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
1999-12-06 12:04:03 +03:00
|
|
|
if (*++s) {
|
2008-01-05 07:04:26 +03: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;
|
|
|
|
|
2007-10-17 00:07:20 +04:00
|
|
|
case 'E':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (!*++s && (!--argc || !(s = *++argv))) {
|
|
|
|
rb_raise(rb_eRuntimeError, "missing argument for -E");
|
|
|
|
}
|
2007-10-17 00:07:20 +04:00
|
|
|
goto encoding;
|
|
|
|
|
2008-10-13 03:03:17 +04:00
|
|
|
case 'U':
|
2008-10-14 04:41:09 +04:00
|
|
|
set_internal_encoding_once(opt, "UTF-8", 0);
|
2008-10-14 09:11:20 +04:00
|
|
|
++s;
|
|
|
|
goto reswitch;
|
2008-10-13 03:03:17 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
case 'K':
|
1999-12-06 12:04:03 +03:00
|
|
|
if (*++s) {
|
2008-01-15 10:59:33 +03:00
|
|
|
const char *enc_name = 0;
|
2007-09-29 00:29:32 +04:00
|
|
|
switch (*s) {
|
|
|
|
case 'E': case 'e':
|
2008-01-15 10:59:33 +03:00
|
|
|
enc_name = "EUC-JP";
|
2007-09-29 00:29:32 +04:00
|
|
|
break;
|
|
|
|
case 'S': case 's':
|
2008-01-15 10:59:33 +03:00
|
|
|
enc_name = "Windows-31J";
|
2007-09-29 00:29:32 +04:00
|
|
|
break;
|
|
|
|
case 'U': case 'u':
|
2008-01-15 10:59:33 +03:00
|
|
|
enc_name = "UTF-8";
|
2007-09-29 00:29:32 +04:00
|
|
|
break;
|
|
|
|
case 'N': case 'n': case 'A': case 'a':
|
2008-01-23 19:08:04 +03:00
|
|
|
enc_name = "ASCII-8BIT";
|
2007-09-29 00:29:32 +04:00
|
|
|
break;
|
2007-10-16 09:48:40 +04:00
|
|
|
}
|
2008-01-15 10:59:33 +03:00
|
|
|
if (enc_name) {
|
2008-01-25 07:18:14 +03:00
|
|
|
opt->src.enc.name = rb_str_new2(enc_name);
|
2008-10-17 02:21:09 +04:00
|
|
|
if (!opt->ext.enc.name)
|
|
|
|
opt->ext.enc.name = opt->src.enc.name;
|
2007-09-29 00:29:32 +04:00
|
|
|
}
|
1999-12-06 12:04:03 +03:00
|
|
|
s++;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'T':
|
|
|
|
{
|
2009-03-14 12:25:20 +03:00
|
|
|
size_t numlen;
|
1998-01-16 15:13:05 +03:00
|
|
|
int v = 1;
|
|
|
|
|
|
|
|
if (*++s) {
|
|
|
|
v = scan_oct(s, 2, &numlen);
|
2006-12-31 18:02:22 +03:00
|
|
|
if (numlen == 0)
|
|
|
|
v = 1;
|
2002-05-22 16:32:15 +04:00
|
|
|
s += numlen;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-10-31 02:16:16 +03:00
|
|
|
if (v > opt->safe_level) opt->safe_level = v;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
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]);
|
2006-12-31 18:02:22 +03:00
|
|
|
argc--, argv++;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2002-05-23 11:41:53 +04:00
|
|
|
break;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
case '0':
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt;
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-03-14 12:25:20 +03:00
|
|
|
size_t numlen;
|
1998-01-16 15:13:05 +03:00
|
|
|
int v;
|
|
|
|
char c;
|
|
|
|
|
|
|
|
v = scan_oct(s, 4, &numlen);
|
|
|
|
s += numlen;
|
2006-12-31 18:02:22 +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])) {
|
2006-12-31 18:02:22 +03:00
|
|
|
argc--, argv++;
|
1998-01-16 15:13:05 +03:00
|
|
|
goto switch_end;
|
|
|
|
}
|
|
|
|
s++;
|
2008-10-30 04:34:23 +03:00
|
|
|
|
|
|
|
# define is_option_end(c, allow_hyphen) \
|
|
|
|
(!(c) || (allow_hyphen && (c) == '-') || (c) == '=')
|
|
|
|
# define check_envopt(name, allow_envopt) \
|
|
|
|
((allow_envopt || !envopt) ? (void)0 : \
|
|
|
|
rb_raise(rb_eRuntimeError, "invalid switch in RUBYOPT: --" name))
|
|
|
|
# define need_argument(name, s) \
|
|
|
|
((*s++ ? !*s : (!--argc || !(s = *++argv))) ? \
|
|
|
|
rb_raise(rb_eRuntimeError, "missing argument for --" name) \
|
|
|
|
: (void)0)
|
|
|
|
# define is_option_with_arg(name, allow_hyphen, allow_envopt) \
|
|
|
|
(strncmp(name, s, n = sizeof(name) - 1) == 0 && is_option_end(s[n], allow_hyphen) ? \
|
|
|
|
(check_envopt(name, allow_envopt), s += n, need_argument(name, s), 1) : 0)
|
|
|
|
|
|
|
|
if (strcmp("copyright", s) == 0) {
|
|
|
|
if (envopt) goto noenvopt_long;
|
2008-12-08 05:28:17 +03:00
|
|
|
opt->dump |= DUMP_BIT(copyright);
|
2008-10-30 04:34:23 +03:00
|
|
|
}
|
2001-10-02 08:31:23 +04:00
|
|
|
else if (strcmp("debug", s) == 0) {
|
|
|
|
ruby_debug = Qtrue;
|
|
|
|
ruby_verbose = Qtrue;
|
|
|
|
}
|
2008-10-30 04:34:23 +03:00
|
|
|
else if (is_option_with_arg("enable", Qtrue, Qtrue)) {
|
2008-02-24 00:13:05 +03:00
|
|
|
ruby_each_words(s, enable_option, &opt->disable);
|
|
|
|
}
|
2008-10-30 04:34:23 +03:00
|
|
|
else if (is_option_with_arg("disable", Qtrue, Qtrue)) {
|
2008-02-24 00:13:05 +03:00
|
|
|
ruby_each_words(s, disable_option, &opt->disable);
|
|
|
|
}
|
2008-10-30 04:34:23 +03:00
|
|
|
else if (is_option_with_arg("encoding", Qfalse, Qtrue)) {
|
2008-10-07 21:39:44 +04:00
|
|
|
char *p;
|
2007-10-17 00:07:20 +04:00
|
|
|
encoding:
|
2008-12-08 04:32:36 +03:00
|
|
|
do {
|
|
|
|
# define set_encoding_part(type) \
|
|
|
|
if (!(p = strchr(s, ':'))) { \
|
|
|
|
set_##type##_encoding_once(opt, s, 0); \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
else if (p > s) { \
|
|
|
|
set_##type##_encoding_once(opt, s, p-s); \
|
|
|
|
}
|
|
|
|
set_encoding_part(external);
|
|
|
|
if (!*(s = ++p)) break;
|
|
|
|
set_encoding_part(internal);
|
|
|
|
if (!*(s = ++p)) break;
|
2008-12-08 05:15:47 +03:00
|
|
|
#if ALLOW_DEFAULT_SOURCE_ENCODING
|
|
|
|
set_encoding_part(source);
|
|
|
|
if (!*(s = ++p)) break;
|
|
|
|
#endif
|
2008-12-08 04:32:36 +03:00
|
|
|
rb_raise(rb_eRuntimeError, "extra argument for %s: %s",
|
|
|
|
(arg[1] == '-' ? "--encoding" : "-E"), s);
|
|
|
|
# undef set_encoding_part
|
|
|
|
} while (0);
|
|
|
|
}
|
|
|
|
else if (is_option_with_arg("internal-encoding", Qfalse, Qtrue)) {
|
|
|
|
set_internal_encoding_once(opt, s, 0);
|
|
|
|
}
|
|
|
|
else if (is_option_with_arg("external-encoding", Qfalse, Qtrue)) {
|
|
|
|
set_external_encoding_once(opt, s, 0);
|
2007-10-17 00:07:20 +04:00
|
|
|
}
|
2008-12-08 05:15:47 +03:00
|
|
|
#if ALLOW_DEFAULT_SOURCE_ENCODING
|
|
|
|
else if (is_option_with_arg("source-encoding", Qfalse, Qtrue)) {
|
|
|
|
set_source_encoding_once(opt, s, 0);
|
|
|
|
}
|
|
|
|
#endif
|
2008-10-30 04:34:23 +03:00
|
|
|
else if (strcmp("version", s) == 0) {
|
|
|
|
if (envopt) goto noenvopt_long;
|
2008-12-08 05:28:17 +03:00
|
|
|
opt->dump |= DUMP_BIT(version);
|
2008-10-30 04:34:23 +03:00
|
|
|
}
|
1999-10-16 14:33:06 +04:00
|
|
|
else if (strcmp("verbose", s) == 0) {
|
2007-09-29 01:47:31 +04:00
|
|
|
opt->verbose = 1;
|
1999-10-16 14:33:06 +04:00
|
|
|
ruby_verbose = Qtrue;
|
|
|
|
}
|
2008-10-30 04:34:23 +03:00
|
|
|
else if (strcmp("yydebug", s) == 0) {
|
|
|
|
if (envopt) goto noenvopt_long;
|
2008-12-08 05:28:17 +03:00
|
|
|
opt->dump |= DUMP_BIT(yydebug);
|
2008-10-30 04:34:23 +03:00
|
|
|
}
|
|
|
|
else if (is_option_with_arg("dump", Qfalse, Qfalse)) {
|
2008-05-20 07:13:52 +04:00
|
|
|
ruby_each_words(s, dump_option, &opt->dump);
|
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
else if (strcmp("help", s) == 0) {
|
2008-10-30 04:34:23 +03:00
|
|
|
if (envopt) goto noenvopt_long;
|
2008-12-08 05:28:17 +03:00
|
|
|
opt->dump |= DUMP_BIT(usage);
|
|
|
|
goto switch_end;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
else {
|
2007-09-29 01:47:31 +04:00
|
|
|
rb_raise(rb_eRuntimeError,
|
|
|
|
"invalid option --%s (-h will show valid options)", s);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2005-01-15 08:58:02 +03:00
|
|
|
case '\r':
|
2006-12-31 18:02:22 +03:00
|
|
|
if (!s[1])
|
|
|
|
break;
|
2005-01-15 08:58:02 +03:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
default:
|
2005-01-15 08:58:02 +03:00
|
|
|
{
|
|
|
|
if (ISPRINT(*s)) {
|
2007-12-08 11:11:52 +03:00
|
|
|
rb_raise(rb_eRuntimeError,
|
|
|
|
"invalid option -%c (-h will show valid options)",
|
|
|
|
(int)(unsigned char)*s);
|
2005-01-15 08:58:02 +03:00
|
|
|
}
|
|
|
|
else {
|
2007-12-08 11:11:52 +03:00
|
|
|
rb_raise(rb_eRuntimeError,
|
2007-12-12 17:30:54 +03:00
|
|
|
"invalid option -\\x%02X (-h will show valid options)",
|
2007-12-08 11:11:52 +03:00
|
|
|
(int)(unsigned char)*s);
|
2005-01-15 08:58:02 +03:00
|
|
|
}
|
|
|
|
}
|
2007-09-29 01:47:31 +04:00
|
|
|
goto switch_end;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-10-30 04:34:23 +03:00
|
|
|
noenvopt:
|
|
|
|
/* "EIdvwWrKU" only */
|
|
|
|
rb_raise(rb_eRuntimeError, "invalid switch in RUBYOPT: -%c", *s);
|
|
|
|
break;
|
|
|
|
|
|
|
|
noenvopt_long:
|
|
|
|
rb_raise(rb_eRuntimeError, "invalid switch in RUBYOPT: --%s", s);
|
|
|
|
break;
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
case 0:
|
|
|
|
break;
|
2008-10-30 04:34:23 +03:00
|
|
|
# undef is_option_end
|
|
|
|
# undef check_envopt
|
|
|
|
# undef need_argument
|
|
|
|
# undef is_option_with_arg
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch_end:
|
2007-09-29 01:47:31 +04:00
|
|
|
return argc0 - argc;
|
|
|
|
}
|
|
|
|
|
2007-11-10 12:22:59 +03:00
|
|
|
void Init_prelude(void);
|
|
|
|
|
|
|
|
static void
|
2008-02-24 00:13:05 +03:00
|
|
|
ruby_init_gems(int enable)
|
2007-11-10 12:22:59 +03:00
|
|
|
{
|
2008-05-12 05:52:53 +04:00
|
|
|
if (enable) rb_define_module("Gem");
|
2007-11-10 12:22:59 +03:00
|
|
|
Init_prelude();
|
2010-03-12 01:15:11 +03:00
|
|
|
rb_const_remove(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"));
|
2007-11-10 12:22:59 +03:00
|
|
|
}
|
|
|
|
|
2008-01-09 09:54:26 +03:00
|
|
|
static int
|
|
|
|
opt_enc_index(VALUE enc_name)
|
|
|
|
{
|
|
|
|
const char *s = RSTRING_PTR(enc_name);
|
|
|
|
int i = rb_enc_find_index(s);
|
|
|
|
|
|
|
|
if (i < 0) {
|
|
|
|
rb_raise(rb_eRuntimeError, "unknown encoding name - %s", s);
|
|
|
|
}
|
|
|
|
else if (rb_enc_dummy_p(rb_enc_from_index(i))) {
|
|
|
|
rb_raise(rb_eRuntimeError, "dummy encoding is not acceptable - %s ", s);
|
|
|
|
}
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2008-06-09 09:18:03 +04:00
|
|
|
#define rb_progname (GET_VM()->progname)
|
2008-06-10 06:25:18 +04:00
|
|
|
VALUE rb_argv0;
|
2008-01-25 10:11:18 +03:00
|
|
|
|
2008-12-08 05:28:17 +03:00
|
|
|
static VALUE
|
|
|
|
false_value(void)
|
|
|
|
{
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
true_value(void)
|
|
|
|
{
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define rb_define_readonly_boolean(name, val) \
|
|
|
|
rb_define_virtual_variable((name), (val) ? true_value : false_value, 0)
|
|
|
|
|
2008-12-15 17:46:50 +03:00
|
|
|
static VALUE
|
* cont.c (rb_fiber_current), dln.c (dln_print_undef, dln_undefined),
eval.c (rb_iterator_p, rb_need_block), load.c: (Init_load), ruby.c
(uscore_get, rb_f_chop), st.c (stat_col), signal.c
(rb_signal_buff_size, ruby_sig_finalize), thread.c
(rb_thread_sleep_forever, rb_thread_sleep_deadly, rb_thread_alone):
protoized.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-02-01 15:51:44 +03:00
|
|
|
uscore_get(void)
|
2008-12-15 17:46:50 +03:00
|
|
|
{
|
|
|
|
VALUE line;
|
|
|
|
|
|
|
|
line = rb_lastline_get();
|
|
|
|
if (TYPE(line) != T_STRING) {
|
|
|
|
rb_raise(rb_eTypeError, "$_ value need to be String (%s given)",
|
|
|
|
NIL_P(line) ? "nil" : rb_obj_classname(line));
|
|
|
|
}
|
|
|
|
return line;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* sub(pattern, replacement) => $_
|
|
|
|
* sub(pattern) { block } => $_
|
2009-01-21 07:59:20 +03:00
|
|
|
*
|
2008-12-15 17:46:50 +03:00
|
|
|
* Equivalent to <code>$_.sub(<i>args</i>)</code>, except that
|
|
|
|
* <code>$_</code> will be updated if substitution occurs.
|
|
|
|
* Available only when -p/-n command line option specified.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_f_sub(argc, argv)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
{
|
|
|
|
VALUE str = rb_funcall3(uscore_get(), rb_intern("sub"), argc, argv);
|
|
|
|
rb_lastline_set(str);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* gsub(pattern, replacement) => string
|
|
|
|
* gsub(pattern) {|...| block } => string
|
2009-01-21 07:59:20 +03:00
|
|
|
*
|
2008-12-15 17:46:50 +03:00
|
|
|
* Equivalent to <code>$_.gsub...</code>, except that <code>$_</code>
|
|
|
|
* receives the modified result.
|
|
|
|
* Available only when -p/-n command line option specified.
|
2009-01-21 07:59:20 +03:00
|
|
|
*
|
2008-12-15 17:46:50 +03:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_f_gsub(argc, argv)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
{
|
|
|
|
VALUE str = rb_funcall3(uscore_get(), rb_intern("gsub"), argc, argv);
|
|
|
|
rb_lastline_set(str);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* chop => string
|
2009-01-21 07:59:20 +03:00
|
|
|
*
|
2008-12-15 17:46:50 +03:00
|
|
|
* Equivalent to <code>($_.dup).chop!</code>, except <code>nil</code>
|
|
|
|
* is never returned. See <code>String#chop!</code>.
|
|
|
|
* Available only when -p/-n command line option specified.
|
2009-01-21 07:59:20 +03:00
|
|
|
*
|
2008-12-15 17:46:50 +03:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
* cont.c (rb_fiber_current), dln.c (dln_print_undef, dln_undefined),
eval.c (rb_iterator_p, rb_need_block), load.c: (Init_load), ruby.c
(uscore_get, rb_f_chop), st.c (stat_col), signal.c
(rb_signal_buff_size, ruby_sig_finalize), thread.c
(rb_thread_sleep_forever, rb_thread_sleep_deadly, rb_thread_alone):
protoized.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-02-01 15:51:44 +03:00
|
|
|
rb_f_chop(void)
|
2008-12-15 17:46:50 +03:00
|
|
|
{
|
|
|
|
VALUE str = rb_funcall3(uscore_get(), rb_intern("chop"), 0, 0);
|
|
|
|
rb_lastline_set(str);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* chomp => $_
|
|
|
|
* chomp(string) => $_
|
2009-01-21 07:59:20 +03:00
|
|
|
*
|
2008-12-15 17:46:50 +03:00
|
|
|
* Equivalent to <code>$_ = $_.chomp(<em>string</em>)</code>. See
|
|
|
|
* <code>String#chomp</code>.
|
|
|
|
* Available only when -p/-n command line option specified.
|
2009-01-21 07:59:20 +03:00
|
|
|
*
|
2008-12-15 17:46:50 +03:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_f_chomp(argc, argv)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
{
|
|
|
|
VALUE str = rb_funcall3(uscore_get(), rb_intern("chomp"), argc, argv);
|
|
|
|
rb_lastline_set(str);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2009-08-05 14:18:21 +04:00
|
|
|
void rb_stdio_set_default_encoding(void);
|
2009-12-13 14:29:33 +03:00
|
|
|
VALUE rb_parser_dump_tree(NODE *node, int comment);
|
2009-08-05 14:12:31 +04:00
|
|
|
|
2007-10-03 05:06:57 +04:00
|
|
|
static VALUE
|
2009-05-17 09:02:58 +04:00
|
|
|
process_options(int argc, char **argv, struct cmdline_options *opt)
|
2007-09-29 01:47:31 +04:00
|
|
|
{
|
|
|
|
NODE *tree = 0;
|
|
|
|
VALUE parser;
|
2008-05-20 07:13:52 +04:00
|
|
|
VALUE iseq;
|
2008-05-07 15:25:23 +04:00
|
|
|
rb_encoding *enc, *lenc;
|
2007-09-29 01:47:31 +04:00
|
|
|
const char *s;
|
2008-05-08 01:43:54 +04:00
|
|
|
char fbuf[MAXPATHLEN];
|
2009-06-22 09:35:51 +04:00
|
|
|
int i = (int)proc_options(argc, argv, opt, 0);
|
2008-12-27 04:15:56 +03:00
|
|
|
rb_thread_t *th = GET_THREAD();
|
|
|
|
rb_env_t *env = 0;
|
2007-09-29 01:47:31 +04:00
|
|
|
|
|
|
|
argc -= i;
|
|
|
|
argv += i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-12-08 05:28:17 +03:00
|
|
|
if (opt->dump & DUMP_BIT(usage)) {
|
|
|
|
usage(origarg.argv[0]);
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2008-02-24 00:13:05 +03:00
|
|
|
if (!(opt->disable & DISABLE_BIT(rubyopt)) &&
|
2008-10-31 02:16:16 +03:00
|
|
|
opt->safe_level == 0 && (s = getenv("RUBYOPT"))) {
|
2008-01-25 07:18:14 +03:00
|
|
|
VALUE src_enc_name = opt->src.enc.name;
|
|
|
|
VALUE ext_enc_name = opt->ext.enc.name;
|
2008-10-07 21:39:44 +04:00
|
|
|
VALUE int_enc_name = opt->intern.enc.name;
|
2008-01-09 09:54:26 +03:00
|
|
|
|
2008-10-14 04:41:09 +04:00
|
|
|
opt->src.enc.name = opt->ext.enc.name = opt->intern.enc.name = 0;
|
2008-10-30 04:34:23 +03:00
|
|
|
moreswitches(s, opt, 1);
|
2008-01-25 07:18:14 +03:00
|
|
|
if (src_enc_name)
|
|
|
|
opt->src.enc.name = src_enc_name;
|
|
|
|
if (ext_enc_name)
|
|
|
|
opt->ext.enc.name = ext_enc_name;
|
2008-10-07 21:39:44 +04:00
|
|
|
if (int_enc_name)
|
|
|
|
opt->intern.enc.name = int_enc_name;
|
1999-10-21 11:52:15 +04:00
|
|
|
}
|
|
|
|
|
2008-12-08 05:28:17 +03:00
|
|
|
if (opt->dump & DUMP_BIT(version)) {
|
1999-01-20 07:59:39 +03:00
|
|
|
ruby_show_version();
|
2007-10-03 05:06:57 +04:00
|
|
|
return Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-12-08 05:28:17 +03:00
|
|
|
if (opt->dump & DUMP_BIT(copyright)) {
|
1999-01-20 07:59:39 +03:00
|
|
|
ruby_show_copyright();
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-10-31 02:16:16 +03:00
|
|
|
if (opt->safe_level >= 4) {
|
2003-06-23 10:52:39 +04:00
|
|
|
OBJ_TAINT(rb_argv);
|
2008-04-30 13:03:03 +04:00
|
|
|
OBJ_TAINT(GET_VM()->load_path);
|
2001-05-30 13:12:34 +04:00
|
|
|
}
|
|
|
|
|
2007-09-29 01:47:31 +04:00
|
|
|
if (!opt->e_script) {
|
2003-02-13 06:02:19 +03:00
|
|
|
if (argc == 0) { /* no more args */
|
2007-09-29 01:47:31 +04:00
|
|
|
if (opt->verbose)
|
2007-10-03 05:06:57 +04:00
|
|
|
return Qtrue;
|
2007-09-29 01:47:31 +04:00
|
|
|
opt->script = "-";
|
2001-09-03 09:37:42 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
else {
|
2007-09-29 01:47:31 +04:00
|
|
|
opt->script = argv[0];
|
|
|
|
if (opt->script[0] == '\0') {
|
|
|
|
opt->script = "-";
|
2003-02-13 06:02:19 +03:00
|
|
|
}
|
2007-09-29 01:47:31 +04:00
|
|
|
else if (opt->do_search) {
|
1999-10-15 12:52:18 +04:00
|
|
|
char *path = getenv("RUBYPATH");
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-09-29 01:47:31 +04:00
|
|
|
opt->script = 0;
|
1999-10-15 12:52:18 +04:00
|
|
|
if (path) {
|
2008-05-08 01:43:54 +04:00
|
|
|
opt->script = dln_find_file_r(argv[0], path, fbuf, sizeof(fbuf));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2007-09-29 01:47:31 +04:00
|
|
|
if (!opt->script) {
|
2008-05-08 01:43:54 +04:00
|
|
|
opt->script = dln_find_file_r(argv[0], getenv(PATH_ENV), fbuf, sizeof(fbuf));
|
1999-10-15 12:52:18 +04:00
|
|
|
}
|
2007-09-29 01:47:31 +04:00
|
|
|
if (!opt->script)
|
|
|
|
opt->script = argv[0];
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2006-12-31 18:02:22 +03:00
|
|
|
argc--;
|
|
|
|
argv++;
|
2003-02-13 03:59:00 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-12-15 05:32:21 +03:00
|
|
|
opt->script_name = rb_str_new_cstr(opt->script);
|
|
|
|
opt->script = RSTRING_PTR(opt->script_name);
|
2008-04-15 21:26:29 +04:00
|
|
|
#if defined DOSISH || defined __CYGWIN__
|
2009-02-19 09:11:41 +03:00
|
|
|
translit_char(RSTRING_PTR(opt->script_name), '\\', '/');
|
2008-04-15 21:26:29 +04:00
|
|
|
#endif
|
2008-12-15 05:32:21 +03:00
|
|
|
rb_obj_freeze(opt->script_name);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-10-31 02:16:16 +03:00
|
|
|
ruby_init_loadpath_safe(opt->safe_level);
|
2009-06-22 20:21:09 +04:00
|
|
|
rb_enc_find_index("encdb");
|
2008-05-07 15:25:23 +04:00
|
|
|
lenc = rb_locale_encoding();
|
2008-09-14 11:07:31 +04:00
|
|
|
rb_enc_associate(rb_progname, lenc);
|
2007-09-29 00:29:32 +04:00
|
|
|
parser = rb_parser_new();
|
2008-12-08 05:28:17 +03:00
|
|
|
if (opt->dump & DUMP_BIT(yydebug)) {
|
|
|
|
rb_parser_set_yydebug(parser, Qtrue);
|
|
|
|
}
|
2008-01-25 07:18:14 +03:00
|
|
|
if (opt->ext.enc.name != 0) {
|
|
|
|
opt->ext.enc.index = opt_enc_index(opt->ext.enc.name);
|
2007-12-31 17:57:46 +03:00
|
|
|
}
|
2008-10-07 21:39:44 +04:00
|
|
|
if (opt->intern.enc.name != 0) {
|
|
|
|
opt->intern.enc.index = opt_enc_index(opt->intern.enc.name);
|
|
|
|
}
|
2008-01-25 07:18:14 +03:00
|
|
|
if (opt->src.enc.name != 0) {
|
|
|
|
opt->src.enc.index = opt_enc_index(opt->src.enc.name);
|
2008-01-25 10:11:18 +03:00
|
|
|
src_encoding_index = opt->src.enc.index;
|
2008-01-25 07:18:14 +03:00
|
|
|
}
|
2009-02-06 06:12:09 +03:00
|
|
|
if (opt->ext.enc.index >= 0) {
|
|
|
|
enc = rb_enc_from_index(opt->ext.enc.index);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
enc = lenc;
|
|
|
|
}
|
|
|
|
rb_enc_set_default_external(rb_enc_from_encoding(enc));
|
2008-10-07 21:39:44 +04:00
|
|
|
if (opt->intern.enc.index >= 0) {
|
|
|
|
enc = rb_enc_from_index(opt->intern.enc.index);
|
|
|
|
rb_enc_set_default_internal(rb_enc_from_encoding(enc));
|
|
|
|
opt->intern.enc.index = -1;
|
|
|
|
}
|
2008-12-15 05:32:21 +03:00
|
|
|
rb_enc_associate(opt->script_name, lenc);
|
|
|
|
{
|
|
|
|
long i;
|
|
|
|
VALUE load_path = GET_VM()->load_path;
|
|
|
|
for (i = 0; i < RARRAY_LEN(load_path); ++i) {
|
|
|
|
rb_enc_associate(RARRAY_PTR(load_path)[i], lenc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ruby_init_gems(!(opt->disable & DISABLE_BIT(gems)));
|
2008-10-18 14:36:20 +04:00
|
|
|
ruby_set_argv(argc, argv);
|
2009-05-17 04:47:49 +04:00
|
|
|
process_sflag(&opt->sflag);
|
2008-02-16 02:03:22 +03:00
|
|
|
|
2008-12-27 04:15:56 +03:00
|
|
|
{
|
|
|
|
/* set eval context */
|
|
|
|
VALUE toplevel_binding = rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING"));
|
|
|
|
rb_binding_t *bind;
|
|
|
|
|
|
|
|
GetBindingPtr(toplevel_binding, bind);
|
|
|
|
GetEnvPtr(bind->env, env);
|
|
|
|
}
|
|
|
|
|
2008-12-28 21:45:24 +03:00
|
|
|
#define PREPARE_PARSE_MAIN(expr) do { \
|
2009-01-15 19:14:43 +03:00
|
|
|
th->parse_in_eval--; \
|
2008-12-28 21:45:24 +03:00
|
|
|
th->base_block = &env->block; \
|
|
|
|
expr; \
|
2009-01-15 19:14:43 +03:00
|
|
|
th->parse_in_eval++; \
|
2008-12-28 21:45:24 +03:00
|
|
|
th->base_block = 0; \
|
|
|
|
} while (0)
|
|
|
|
|
2007-09-29 01:47:31 +04:00
|
|
|
if (opt->e_script) {
|
2008-01-25 21:49:28 +03:00
|
|
|
rb_encoding *eenc;
|
|
|
|
if (opt->src.enc.index >= 0) {
|
|
|
|
eenc = rb_enc_from_index(opt->src.enc.index);
|
2008-01-25 09:12:44 +03:00
|
|
|
}
|
2008-01-25 09:56:50 +03:00
|
|
|
else {
|
2008-05-07 15:25:23 +04:00
|
|
|
eenc = lenc;
|
2008-01-25 09:56:50 +03:00
|
|
|
}
|
2008-01-25 09:12:44 +03:00
|
|
|
rb_enc_associate(opt->e_script, eenc);
|
2009-05-17 04:47:49 +04:00
|
|
|
require_libraries(&opt->req_list);
|
2008-12-27 04:15:56 +03:00
|
|
|
|
2008-12-28 21:45:24 +03:00
|
|
|
PREPARE_PARSE_MAIN({
|
|
|
|
tree = rb_parser_compile_string(parser, opt->script, opt->e_script, 1);
|
|
|
|
});
|
1999-10-15 12:52:18 +04:00
|
|
|
}
|
|
|
|
else {
|
2007-09-29 01:47:31 +04:00
|
|
|
if (opt->script[0] == '-' && !opt->script[1]) {
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
forbid_setid("program input from stdin");
|
|
|
|
}
|
2008-12-27 04:15:56 +03:00
|
|
|
|
2008-12-28 21:45:24 +03:00
|
|
|
PREPARE_PARSE_MAIN({
|
|
|
|
tree = load_file(parser, opt->script, 1, opt);
|
|
|
|
});
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2009-10-14 08:24:16 +04:00
|
|
|
rb_progname = opt->script_name;
|
|
|
|
rb_vm_set_progname(rb_progname);
|
2008-12-08 05:28:17 +03:00
|
|
|
if (opt->dump & DUMP_BIT(yydebug)) return Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-02-06 06:05:27 +03:00
|
|
|
if (opt->ext.enc.index >= 0) {
|
|
|
|
enc = rb_enc_from_index(opt->ext.enc.index);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
enc = lenc;
|
|
|
|
}
|
|
|
|
rb_enc_set_default_external(rb_enc_from_encoding(enc));
|
2008-10-07 21:39:44 +04:00
|
|
|
if (opt->intern.enc.index >= 0) {
|
|
|
|
/* Set in the shebang line */
|
|
|
|
enc = rb_enc_from_index(opt->intern.enc.index);
|
|
|
|
rb_enc_set_default_internal(rb_enc_from_encoding(enc));
|
|
|
|
}
|
2008-12-13 09:58:58 +03:00
|
|
|
else if (!rb_default_internal_encoding())
|
2008-10-07 21:39:44 +04:00
|
|
|
/* Freeze default_internal */
|
|
|
|
rb_enc_set_default_internal(Qnil);
|
2009-07-31 11:37:02 +04:00
|
|
|
rb_stdio_set_default_encoding();
|
2008-10-07 21:39:44 +04:00
|
|
|
|
2007-10-03 05:06:57 +04:00
|
|
|
if (!tree) return Qfalse;
|
2007-09-29 01:47:31 +04:00
|
|
|
|
2009-05-17 04:47:49 +04:00
|
|
|
process_sflag(&opt->sflag);
|
2007-09-29 01:47:31 +04:00
|
|
|
opt->xflag = 0;
|
2001-05-30 13:12:34 +04:00
|
|
|
|
2008-10-31 02:16:16 +03:00
|
|
|
if (opt->safe_level >= 4) {
|
2003-06-23 10:52:39 +04:00
|
|
|
FL_UNSET(rb_argv, FL_TAINT);
|
2008-04-30 13:03:03 +04:00
|
|
|
FL_UNSET(GET_VM()->load_path, FL_TAINT);
|
2001-05-30 13:12:34 +04:00
|
|
|
}
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
|
2008-12-08 05:28:17 +03:00
|
|
|
if (opt->dump & DUMP_BIT(syntax)) {
|
2007-12-04 08:34:37 +03:00
|
|
|
printf("Syntax OK\n");
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
* eval.c (ruby_exec_node, ruby_run_node), ruby.c (process_options):
use iseq instead of NODE.
* gc.c (source_filenames): removed.
* include/ruby/intern.h, parse.y (yycompile, parser_mark, parser_free,
ripper_initialize): rb_source_filename() is no longer used.
* compile.c, compile.h (ERROR_ARGS), parse.y (node_newnode, fixpos,
parser_warn, e_option_supplied, warn_unless_e_option, range_op,
cond0): nd_file is no longer used.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-04-12 07:41:51 +04:00
|
|
|
if (opt->do_print) {
|
2008-12-28 21:45:24 +03:00
|
|
|
PREPARE_PARSE_MAIN({
|
|
|
|
tree = rb_parser_append_print(parser, tree);
|
|
|
|
});
|
* eval.c (ruby_exec_node, ruby_run_node), ruby.c (process_options):
use iseq instead of NODE.
* gc.c (source_filenames): removed.
* include/ruby/intern.h, parse.y (yycompile, parser_mark, parser_free,
ripper_initialize): rb_source_filename() is no longer used.
* compile.c, compile.h (ERROR_ARGS), parse.y (node_newnode, fixpos,
parser_warn, e_option_supplied, warn_unless_e_option, range_op,
cond0): nd_file is no longer used.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-04-12 07:41:51 +04:00
|
|
|
}
|
|
|
|
if (opt->do_loop) {
|
2008-12-28 21:45:24 +03:00
|
|
|
PREPARE_PARSE_MAIN({
|
|
|
|
tree = rb_parser_while_loop(parser, tree, opt->do_line, opt->do_split);
|
|
|
|
});
|
2008-12-15 17:46:50 +03:00
|
|
|
rb_define_global_function("sub", rb_f_sub, -1);
|
|
|
|
rb_define_global_function("gsub", rb_f_gsub, -1);
|
|
|
|
rb_define_global_function("chop", rb_f_chop, 0);
|
|
|
|
rb_define_global_function("chomp", rb_f_chomp, -1);
|
2007-07-05 13:28:00 +04:00
|
|
|
}
|
|
|
|
|
2009-12-09 17:05:59 +03:00
|
|
|
if (opt->dump & DUMP_BIT(parsetree) || opt->dump & DUMP_BIT(parsetree_with_comment)) {
|
|
|
|
rb_io_write(rb_stdout, rb_parser_dump_tree(tree, opt->dump & DUMP_BIT(parsetree_with_comment)));
|
|
|
|
rb_io_flush(rb_stdout);
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2008-12-28 21:45:24 +03:00
|
|
|
PREPARE_PARSE_MAIN({
|
2010-03-16 20:40:00 +03:00
|
|
|
VALUE path = Qnil;
|
|
|
|
if (!opt->e_script && strcmp(opt->script, "-")) path = opt->script_name;
|
|
|
|
iseq = rb_iseq_new_main(tree, opt->script_name, path);
|
2008-12-28 21:45:24 +03:00
|
|
|
});
|
2008-05-20 08:19:27 +04:00
|
|
|
|
2008-05-20 07:13:52 +04:00
|
|
|
if (opt->dump & DUMP_BIT(insns)) {
|
2009-01-19 04:06:56 +03:00
|
|
|
rb_io_write(rb_stdout, rb_iseq_disasm(iseq));
|
2008-05-20 07:13:52 +04:00
|
|
|
rb_io_flush(rb_stdout);
|
2008-05-20 08:19:27 +04:00
|
|
|
return Qtrue;
|
2008-05-20 07:13:52 +04:00
|
|
|
}
|
|
|
|
|
2008-12-08 05:28:17 +03:00
|
|
|
rb_define_readonly_boolean("$-p", opt->do_print);
|
|
|
|
rb_define_readonly_boolean("$-l", opt->do_line);
|
|
|
|
rb_define_readonly_boolean("$-a", opt->do_split);
|
|
|
|
|
2008-10-31 02:16:16 +03:00
|
|
|
rb_set_safe_level(opt->safe_level);
|
|
|
|
|
2008-05-20 07:13:52 +04:00
|
|
|
return iseq;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-10-27 09:58:28 +03:00
|
|
|
struct load_file_arg {
|
|
|
|
VALUE parser;
|
|
|
|
const char *fname;
|
|
|
|
int script;
|
|
|
|
struct cmdline_options *opt;
|
|
|
|
};
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
load_file_internal(VALUE arg)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
extern VALUE rb_stdin;
|
2008-10-27 09:58:28 +03:00
|
|
|
struct load_file_arg *argp = (struct load_file_arg *)arg;
|
|
|
|
VALUE parser = argp->parser;
|
|
|
|
const char *fname = argp->fname;
|
|
|
|
int script = argp->script;
|
|
|
|
struct cmdline_options *opt = argp->opt;
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE f;
|
|
|
|
int line_start = 1;
|
2006-12-31 18:02:22 +03:00
|
|
|
NODE *tree = 0;
|
2008-01-19 02:35:38 +03:00
|
|
|
rb_encoding *enc;
|
2008-10-29 03:23:04 +03:00
|
|
|
ID set_encoding;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
if (!fname)
|
|
|
|
rb_load_fail(fname);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (strcmp(fname, "-") == 0) {
|
|
|
|
f = rb_stdin;
|
|
|
|
}
|
|
|
|
else {
|
2007-09-29 00:29:32 +04:00
|
|
|
int fd, mode = O_RDONLY;
|
2000-06-19 07:37:55 +04:00
|
|
|
#if defined DOSISH || defined __CYGWIN__
|
|
|
|
{
|
2007-09-29 00:29:32 +04:00
|
|
|
const char *ext = strrchr(fname, '.');
|
2008-01-01 15:24:04 +03:00
|
|
|
if (ext && STRCASECMP(ext, ".exe") == 0)
|
2007-09-29 00:29:32 +04:00
|
|
|
mode |= O_BINARY;
|
2000-06-19 07:37:55 +04:00
|
|
|
}
|
|
|
|
#endif
|
2007-09-29 00:29:32 +04:00
|
|
|
if ((fd = open(fname, mode)) < 0) {
|
|
|
|
rb_load_fail(fname);
|
|
|
|
}
|
|
|
|
|
|
|
|
f = rb_io_fdopen(fd, mode, fname);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-10-29 03:23:04 +03:00
|
|
|
CONST_ID(set_encoding, "set_encoding");
|
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;
|
2008-01-25 07:18:14 +03:00
|
|
|
int no_src_enc = !opt->src.enc.name;
|
|
|
|
int no_ext_enc = !opt->ext.enc.name;
|
2008-10-07 21:39:44 +04:00
|
|
|
int no_int_enc = !opt->intern.enc.name;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-10-29 03:30:09 +03:00
|
|
|
enc = rb_ascii8bit_encoding();
|
2008-10-29 03:23:04 +03:00
|
|
|
rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc));
|
2008-03-02 04:13:15 +03:00
|
|
|
|
2007-09-29 01:47:31 +04:00
|
|
|
if (opt->xflag) {
|
2009-08-05 14:19:18 +04:00
|
|
|
search_shebang:
|
1998-01-16 15:13:05 +03:00
|
|
|
forbid_setid("-x");
|
2009-09-13 15:18:51 +04:00
|
|
|
opt->xflag = FALSE;
|
1999-01-20 07:59:39 +03:00
|
|
|
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
|
|
|
}
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
c = rb_io_getbyte(f);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (c == INT2FIX('#')) {
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
c = rb_io_getbyte(f);
|
|
|
|
if (c == INT2FIX('!')) {
|
|
|
|
line = rb_io_gets(f);
|
|
|
|
if (NIL_P(line))
|
|
|
|
return 0;
|
|
|
|
|
2006-08-31 14:47:44 +04:00
|
|
|
if ((p = strstr(RSTRING_PTR(line), "ruby")) == 0) {
|
2009-08-05 14:19:18 +04:00
|
|
|
/* not ruby script, assume -x flag */
|
|
|
|
goto search_shebang;
|
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-12-31 18:02:22 +03: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) {
|
2008-10-30 04:34:23 +03:00
|
|
|
moreswitches(p + 1, opt, 0);
|
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 */
|
2008-08-25 12:36:46 +04:00
|
|
|
rb_io_ungetbyte(f, rb_str_new2("!\n"));
|
2005-05-14 06:48:07 +04:00
|
|
|
}
|
|
|
|
else if (!NIL_P(c)) {
|
2008-08-25 12:36:46 +04:00
|
|
|
rb_io_ungetbyte(f, c);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-08-25 12:36:46 +04:00
|
|
|
rb_io_ungetbyte(f, INT2FIX('#'));
|
2008-01-25 07:18:14 +03:00
|
|
|
if (no_src_enc && opt->src.enc.name) {
|
|
|
|
opt->src.enc.index = opt_enc_index(opt->src.enc.name);
|
2008-01-25 10:11:18 +03:00
|
|
|
src_encoding_index = opt->src.enc.index;
|
2008-01-25 07:18:14 +03:00
|
|
|
}
|
|
|
|
if (no_ext_enc && opt->ext.enc.name) {
|
|
|
|
opt->ext.enc.index = opt_enc_index(opt->ext.enc.name);
|
2008-01-09 09:54:26 +03:00
|
|
|
}
|
2008-10-07 21:39:44 +04:00
|
|
|
if (no_int_enc && opt->intern.enc.name) {
|
|
|
|
opt->intern.enc.index = opt_enc_index(opt->intern.enc.name);
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2000-06-28 12:31:35 +04:00
|
|
|
else if (!NIL_P(c)) {
|
2008-08-25 12:36:46 +04:00
|
|
|
rb_io_ungetbyte(f, c);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2009-05-17 04:47:49 +04:00
|
|
|
require_libraries(&opt->req_list); /* Why here? unnatural */
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-01-25 07:18:14 +03:00
|
|
|
if (opt->src.enc.index >= 0) {
|
|
|
|
enc = rb_enc_from_index(opt->src.enc.index);
|
2008-01-13 07:50:48 +03:00
|
|
|
}
|
|
|
|
else if (f == rb_stdin) {
|
2008-01-25 21:49:28 +03:00
|
|
|
enc = rb_locale_encoding();
|
2008-01-19 02:35:38 +03:00
|
|
|
}
|
|
|
|
else {
|
2008-10-30 12:17:49 +03:00
|
|
|
enc = rb_usascii_encoding();
|
2008-01-13 07:50:48 +03:00
|
|
|
}
|
2008-10-30 12:17:49 +03:00
|
|
|
rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
|
2009-01-21 07:59:20 +03:00
|
|
|
tree = rb_parser_compile_file(parser, fname, f, line_start);
|
2008-10-29 03:23:04 +03:00
|
|
|
rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser));
|
2009-09-13 14:38:36 +04:00
|
|
|
if (script && tree && 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);
|
|
|
|
}
|
2009-02-03 17:37:09 +03:00
|
|
|
else {
|
|
|
|
rb_io_ungetbyte(f, Qnil);
|
|
|
|
}
|
2008-10-27 09:58:28 +03:00
|
|
|
return (VALUE)tree;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
restore_lineno(VALUE lineno)
|
|
|
|
{
|
|
|
|
return rb_gv_set("$.", lineno);
|
|
|
|
}
|
|
|
|
|
|
|
|
static NODE *
|
|
|
|
load_file(VALUE parser, const char *fname, int script, struct cmdline_options *opt)
|
|
|
|
{
|
|
|
|
struct load_file_arg arg;
|
|
|
|
arg.parser = parser;
|
|
|
|
arg.fname = fname;
|
|
|
|
arg.script = script;
|
|
|
|
arg.opt = opt;
|
|
|
|
return (NODE *)rb_ensure(load_file_internal, (VALUE)&arg, restore_lineno, rb_gv_get("$."));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2006-12-31 18:02:22 +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
|
|
|
{
|
2007-09-29 01:47:31 +04:00
|
|
|
struct cmdline_options opt;
|
|
|
|
|
2008-06-09 08:20:07 +04:00
|
|
|
return load_file(rb_parser_new(), fname, 0, cmdline_options_init(&opt));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2007-09-29 01:47:31 +04:00
|
|
|
#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
|
|
|
|
#if !defined(_WIN32) && !(defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
|
2006-02-01 16:27:47 +03:00
|
|
|
#define USE_ENVSPACE_FOR_ARG0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef USE_ENVSPACE_FOR_ARG0
|
2005-04-28 03:21:58 +04:00
|
|
|
extern char **environ;
|
2007-09-29 01:47:31 +04:00
|
|
|
#endif
|
2005-04-28 03:21:58 +04:00
|
|
|
|
2009-05-17 03:55:46 +04:00
|
|
|
static size_t
|
2007-09-29 01:47:31 +04:00
|
|
|
get_arglen(int argc, char **argv)
|
2005-04-28 03:21:58 +04:00
|
|
|
{
|
2007-09-29 01:47:31 +04:00
|
|
|
char *s = argv[0];
|
2005-04-28 03:21:58 +04:00
|
|
|
int i;
|
|
|
|
|
2008-04-15 21:26:29 +04:00
|
|
|
if (!argc) return 0;
|
2005-04-28 03:21:58 +04:00
|
|
|
s += strlen(s);
|
2007-09-29 01:47:31 +04:00
|
|
|
/* See if all the arguments are contiguous in memory */
|
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
if (argv[i] == s + 1) {
|
2005-04-28 03:21:58 +04:00
|
|
|
s++;
|
|
|
|
s += strlen(s); /* this one is ok too */
|
|
|
|
}
|
2007-09-29 01:47:31 +04:00
|
|
|
else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#if defined(USE_ENVSPACE_FOR_ARG0)
|
|
|
|
if (environ && (s == environ[0])) {
|
|
|
|
s += strlen(s);
|
|
|
|
for (i = 1; environ[i]; i++) {
|
|
|
|
if (environ[i] == s + 1) {
|
|
|
|
s++;
|
|
|
|
s += strlen(s); /* this one is ok too */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ruby_setenv("", NULL); /* duplicate environ vars */
|
2005-04-28 03:21:58 +04:00
|
|
|
}
|
2007-09-29 01:47:31 +04:00
|
|
|
#endif
|
|
|
|
return s - argv[0];
|
2005-04-28 03:21:58 +04:00
|
|
|
}
|
|
|
|
#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
|
|
|
{
|
2008-06-01 22:23:10 +04:00
|
|
|
char *s;
|
2002-08-21 19:47:54 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-09-29 01:47:31 +04:00
|
|
|
if (origarg.argv == 0)
|
2006-12-31 18:02:22 +03:00
|
|
|
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)
|
2007-05-22 11:38:50 +04:00
|
|
|
if (i > PST_CLEN) {
|
|
|
|
union pstun un;
|
|
|
|
char buf[PST_CLEN + 1]; /* PST_CLEN is 64 (HP-UX 11.23) */
|
2008-12-16 05:37:45 +03:00
|
|
|
strlcpy(buf, s, sizeof(buf));
|
2007-05-22 11:38:50 +04:00
|
|
|
un.pst_command = buf;
|
|
|
|
pstat(PSTAT_SETCMD, un, PST_CLEN, 0, 0);
|
2001-05-02 08:22:21 +04:00
|
|
|
}
|
|
|
|
else {
|
2007-05-22 11:38:50 +04:00
|
|
|
union pstun un;
|
|
|
|
un.pst_command = s;
|
|
|
|
pstat(PSTAT_SETCMD, un, i, 0, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
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
|
|
|
#else
|
|
|
|
|
2009-05-17 04:47:49 +04:00
|
|
|
if ((size_t)i >= origarg.len) {
|
|
|
|
i = (long)(origarg.len - 1);
|
2001-09-03 09:37:42 +04:00
|
|
|
}
|
2006-12-31 18:02:22 +03:00
|
|
|
|
2007-09-29 01:47:31 +04:00
|
|
|
memcpy(origarg.argv[0], s, i);
|
2007-11-09 04:10:06 +03:00
|
|
|
|
2007-09-29 01:47:31 +04:00
|
|
|
{
|
2008-06-01 22:52:15 +04:00
|
|
|
int j;
|
2008-06-01 22:23:10 +04:00
|
|
|
char *t = origarg.argv[0] + i;
|
|
|
|
*t = '\0';
|
|
|
|
|
2009-05-17 04:47:49 +04:00
|
|
|
if ((size_t)(i + 1) < origarg.len) {
|
|
|
|
memset(t + 1, ' ', origarg.len - i - 1);
|
|
|
|
}
|
2007-11-09 04:10:06 +03:00
|
|
|
for (j = 1; j < origarg.argc; j++) {
|
|
|
|
origarg.argv[j] = t;
|
|
|
|
}
|
2007-09-29 01:47:31 +04:00
|
|
|
}
|
2002-08-12 17:39:22 +04:00
|
|
|
#endif
|
2008-10-18 14:36:20 +04:00
|
|
|
rb_progname = rb_obj_freeze(rb_external_str_new(s, i));
|
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) {
|
2008-10-18 14:36:20 +04:00
|
|
|
rb_progname = rb_obj_freeze(rb_external_str_new(name, strlen(name)));
|
2009-05-17 09:02:58 +04:00
|
|
|
rb_vm_set_progname(rb_progname);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2008-06-09 08:20:07 +04:00
|
|
|
init_ids(struct cmdline_options *opt)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-06-09 08:20:07 +04:00
|
|
|
rb_uid_t uid = getuid();
|
|
|
|
rb_uid_t euid = geteuid();
|
|
|
|
rb_gid_t gid = getgid();
|
|
|
|
rb_gid_t egid = getegid();
|
|
|
|
|
|
|
|
if (uid != euid) opt->setids |= 1;
|
|
|
|
if (egid != gid) opt->setids |= 2;
|
|
|
|
if (uid && opt->setids) {
|
2008-10-31 02:16:16 +03:00
|
|
|
if (opt->safe_level < 1) opt->safe_level = 1;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-09 08:20:07 +04:00
|
|
|
#undef forbid_setid
|
1998-01-16 15:13:05 +03:00
|
|
|
static void
|
2008-06-09 08:20:07 +04:00
|
|
|
forbid_setid(const char *s, struct cmdline_options *opt)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-06-09 08:20:07 +04:00
|
|
|
if (opt->setids & 1)
|
* 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);
|
2008-06-09 08:20:07 +04:00
|
|
|
if (opt->setids & 2)
|
* 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);
|
2008-10-31 02:16:16 +03:00
|
|
|
if (opt->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
|
2008-06-18 16:08:16 +04:00
|
|
|
verbose_setter(VALUE val, ID id, void *data)
|
2003-07-29 22:26:55 +04:00
|
|
|
{
|
2008-06-18 16:08:16 +04:00
|
|
|
VALUE *variable = data;
|
|
|
|
*variable = RTEST(val) ? Qtrue : val;
|
2003-07-29 22:26:55 +04:00
|
|
|
}
|
|
|
|
|
2004-03-03 07:55:35 +03:00
|
|
|
static VALUE
|
2008-06-18 16:08:16 +04:00
|
|
|
opt_W_getter(ID id, void *data)
|
2004-03-03 07:55:35 +03:00
|
|
|
{
|
2008-06-18 16:08:16 +04:00
|
|
|
VALUE *variable = data;
|
|
|
|
switch (*variable) {
|
2008-06-17 18:02:20 +04:00
|
|
|
case Qnil:
|
2006-12-31 18:02:22 +03:00
|
|
|
return INT2FIX(0);
|
2008-06-17 18:02:20 +04:00
|
|
|
case Qfalse:
|
2006-12-31 18:02:22 +03:00
|
|
|
return INT2FIX(1);
|
2008-06-17 18:02:20 +04:00
|
|
|
case Qtrue:
|
2006-12-31 18:02:22 +03:00
|
|
|
return INT2FIX(2);
|
2008-06-17 18:02:20 +04:00
|
|
|
}
|
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
|
|
|
{
|
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);
|
2009-06-21 17:35:41 +04:00
|
|
|
rb_define_hooked_variable("$-W", &ruby_verbose, opt_W_getter, rb_gvar_readonly_setter);
|
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
|
|
|
|
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_global_const("ARGV", rb_argv);
|
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_set_argv(int argc, char **argv)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
int i;
|
2008-03-01 11:59:04 +03:00
|
|
|
VALUE av = rb_argv;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
#if defined(USE_DLN_A_OUT)
|
2007-09-29 01:47:31 +04:00
|
|
|
if (origarg.argv)
|
|
|
|
dln_argv0 = origarg.argv[0];
|
2006-12-31 18:02:22 +03:00
|
|
|
else
|
|
|
|
dln_argv0 = argv[0];
|
1998-01-16 15:13:05 +03:00
|
|
|
#endif
|
2008-03-01 11:59:04 +03:00
|
|
|
rb_ary_clear(av);
|
2006-12-31 18:02:22 +03:00
|
|
|
for (i = 0; i < argc; i++) {
|
2008-10-18 14:36:20 +04:00
|
|
|
VALUE arg = rb_external_str_new(argv[i], strlen(argv[i]));
|
2003-03-25 11:26:08 +03:00
|
|
|
|
|
|
|
OBJ_FREEZE(arg);
|
2008-03-01 11:59:04 +03:00
|
|
|
rb_ary_push(av, arg);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +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_process_options(int argc, char **argv)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2007-09-29 01:47:31 +04:00
|
|
|
struct cmdline_options opt;
|
2009-02-22 07:04:31 +03:00
|
|
|
VALUE iseq;
|
* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
ruby_nerrs): purge global variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-05 12:12:18 +04:00
|
|
|
|
2008-12-12 08:25:39 +03:00
|
|
|
ruby_script(argv[0]); /* for the time being */
|
2008-06-10 06:25:18 +04:00
|
|
|
rb_argv0 = rb_str_new4(rb_progname);
|
* gc.c, include/ruby/ruby.h: rename rb_register_mark_object()
to rb_gc_register_mark_object().
* eval.c, vm.c: initialize vm->mark_object_ary at
Init_top_self().
* bignum.c, complex.c, encoding.c, ext/win32ole/win32ole.c,
io.c, load.c, marshal.c, rational.c, ruby.c, vm.c:
use rb_gc_register_mark_object() instead of
rb_global_variable() or rb_gc_register_address().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-15 18:59:14 +04:00
|
|
|
rb_gc_register_mark_object(rb_argv0);
|
2009-05-17 09:02:58 +04:00
|
|
|
iseq = process_options(argc, argv, cmdline_options_init(&opt));
|
2009-02-22 07:04:31 +03:00
|
|
|
return (void*)(struct RData*)iseq;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2007-09-29 12:45:24 +04:00
|
|
|
|
|
|
|
void
|
|
|
|
ruby_sysinit(int *argc, char ***argv)
|
|
|
|
{
|
2009-05-17 03:55:46 +04:00
|
|
|
#if defined(_WIN32)
|
2007-09-29 12:45:24 +04:00
|
|
|
void rb_w32_sysinit(int *argc, char ***argv);
|
|
|
|
rb_w32_sysinit(argc, argv);
|
|
|
|
#endif
|
|
|
|
origarg.argc = *argc;
|
|
|
|
origarg.argv = *argv;
|
|
|
|
#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
|
|
|
|
origarg.len = get_arglen(origarg.argc, origarg.argv);
|
|
|
|
#endif
|
2007-10-03 05:06:57 +04:00
|
|
|
#if defined(USE_DLN_A_OUT)
|
|
|
|
dln_argv0 = origarg.argv[0];
|
|
|
|
#endif
|
2007-09-29 12:45:24 +04:00
|
|
|
}
|