2000-05-09 00:53:16 -04:00
|
|
|
/**********************************************************************
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
ruby.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
$Date$
|
|
|
|
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-24 23:29:39 -04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
2000-05-01 05:42:38 -04:00
|
|
|
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
|
2000-05-09 00:53:16 -04:00
|
|
|
Copyright (C) 2000 Information-technology Promotion Agency, Japan
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-05-09 00:53:16 -04:00
|
|
|
**********************************************************************/
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2005-11-04 23:43:46 -05:00
|
|
|
#ifdef __CYGWIN__
|
1998-01-16 07:19:22 -05:00
|
|
|
#include <windows.h>
|
2007-07-26 00:38:07 -04:00
|
|
|
#include <sys/cygwin.h>
|
1998-01-16 07:19:22 -05:00
|
|
|
#endif
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-14 22:18:08 -05:00
|
|
|
#ifdef _WIN32_WCE
|
|
|
|
#include <winsock.h>
|
2007-06-09 23:06:15 -04:00
|
|
|
#include "ruby/wince.h"
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-14 22:18:08 -05:00
|
|
|
#endif
|
2007-06-09 23:06:15 -04:00
|
|
|
#include "ruby/ruby.h"
|
|
|
|
#include "ruby/node.h"
|
2007-09-28 16:29:32 -04:00
|
|
|
#include "ruby/encoding.h"
|
2007-10-02 21:06:57 -04:00
|
|
|
#include "eval_intern.h"
|
1998-01-16 07:13:05 -05:00
|
|
|
#include "dln.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <sys/types.h>
|
1999-01-19 23:59:39 -05:00
|
|
|
#include <ctype.h>
|
|
|
|
|
|
|
|
#ifdef __hpux
|
|
|
|
#include <sys/pstat.h>
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
2007-09-28 16: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 06:19:22 -05:00
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
|
|
# include <sys/param.h>
|
|
|
|
#endif
|
|
|
|
#ifndef MAXPATHLEN
|
|
|
|
# define MAXPATHLEN 1024
|
|
|
|
#endif
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2007-09-29 04:45:24 -04:00
|
|
|
#if defined(__MACOS__) && defined(__MWERKS__)
|
|
|
|
#include <console.h>
|
|
|
|
#endif
|
|
|
|
|
2007-06-09 23:06:15 -04:00
|
|
|
#include "ruby/util.h"
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
#ifndef HAVE_STDLIB_H
|
1998-01-16 07:13:05 -05:00
|
|
|
char *getenv();
|
1999-01-19 23:59:39 -05:00
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
/* TODO: move to VM */
|
1999-08-13 01:45:20 -04:00
|
|
|
VALUE ruby_debug = Qfalse;
|
|
|
|
VALUE ruby_verbose = Qfalse;
|
2007-11-13 07:41:41 -05:00
|
|
|
VALUE rb_parser_get_yydebug(VALUE);
|
|
|
|
VALUE rb_parser_set_yydebug(VALUE, VALUE);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-07-05 06:12:52 -04:00
|
|
|
char *ruby_inplace_mode = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
struct cmdline_options {
|
2007-10-02 21:06:57 -04:00
|
|
|
int argc;
|
|
|
|
char **argv;
|
2007-09-28 17:47:31 -04:00
|
|
|
int sflag, xflag;
|
|
|
|
int do_loop, do_print;
|
|
|
|
int do_check, do_line;
|
|
|
|
int do_split, do_search;
|
|
|
|
int usage;
|
|
|
|
int version;
|
|
|
|
int copyright;
|
2007-11-10 04:22:59 -05:00
|
|
|
int disable_gems;
|
2007-09-28 17:47:31 -04:00
|
|
|
int verbose;
|
|
|
|
int yydebug;
|
|
|
|
char *script;
|
|
|
|
VALUE e_script;
|
2007-12-20 23:40:13 -05:00
|
|
|
const char *enc_name;
|
2007-09-28 17:47:31 -04:00
|
|
|
int enc_index;
|
|
|
|
};
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
static NODE *load_file(VALUE, const char *, int, struct cmdline_options *);
|
|
|
|
static void forbid_setid(const char *);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-09-28 17:50:01 -04:00
|
|
|
static struct {
|
2007-09-28 17:47:31 -04:00
|
|
|
int argc;
|
|
|
|
char **argv;
|
|
|
|
#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
|
|
|
|
int len;
|
|
|
|
#endif
|
|
|
|
} origarg;
|
1998-01-16 07:19:22 -05:00
|
|
|
|
1999-08-13 01: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 06:44:21 -04:00
|
|
|
usage(const char *name)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
/* This message really ought to be max 23 lines.
|
1999-12-07 04:25:55 -05:00
|
|
|
* Removed -h because the user already knows that option. Others? */
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2007-07-26 00:57:48 -04:00
|
|
|
static const char *const usage_msg[] = {
|
2006-12-31 10:02:22 -05: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]",
|
|
|
|
"-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)",
|
|
|
|
"-Kkcode specifies KANJI (Japanese) code-set",
|
|
|
|
"-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",
|
|
|
|
"-T[level] turn on tainting checks",
|
|
|
|
"-v print version number, then turn on verbose mode",
|
|
|
|
"-w turn warnings on for your script",
|
|
|
|
"-W[level] set warning level; 0=silence, 1=medium, 2=verbose (default)",
|
|
|
|
"-x[directory] strip off text before #!ruby line and perhaps cd to directory",
|
2007-11-14 21:27:08 -05:00
|
|
|
"--disable-gems disable gem libraries",
|
2006-12-31 10:02:22 -05:00
|
|
|
"--copyright print the copyright",
|
|
|
|
"--version print the version",
|
|
|
|
NULL
|
|
|
|
};
|
2007-07-26 00:57:48 -04:00
|
|
|
const char *const *p = usage_msg;
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2000-08-15 02:22:49 -04:00
|
|
|
printf("Usage: %s [switches] [--] [programfile] [arguments]\n", name);
|
1999-08-13 01:45:20 -04:00
|
|
|
while (*p)
|
2000-08-15 02:22:49 -04:00
|
|
|
printf(" %s\n", *p++);
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
|
2007-11-09 03:48:13 -05:00
|
|
|
static rb_encoding *
|
|
|
|
locale_encoding(void)
|
|
|
|
{
|
2007-12-20 21:52:23 -05:00
|
|
|
VALUE codeset = rb_locale_charmap(Qnil);
|
2007-12-20 23:09:45 -05:00
|
|
|
char *name;
|
2007-12-20 21:52:23 -05:00
|
|
|
int idx;
|
|
|
|
|
2007-12-20 23:09:45 -05:00
|
|
|
if (codeset == Qnil)
|
2007-12-22 18:47:18 -05:00
|
|
|
return rb_ascii8bit_encoding();
|
2007-12-20 23:09:45 -05:00
|
|
|
|
2007-12-20 23:22:59 -05:00
|
|
|
name = StringValueCStr(codeset);
|
2007-12-20 21:52:23 -05:00
|
|
|
idx = rb_enc_find_index(name);
|
|
|
|
if (idx < 0)
|
2007-12-22 18:47:18 -05:00
|
|
|
return rb_ascii8bit_encoding();
|
2007-12-20 21:52:23 -05:00
|
|
|
return rb_enc_from_index(idx);
|
2007-11-09 03:48:13 -05:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
extern VALUE rb_load_path;
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2007-07-26 00:38:07 -04:00
|
|
|
#ifndef CharNext /* defined as CharNext[AW] on Windows. */
|
|
|
|
#define CharNext(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined DOSISH || defined __CYGWIN__
|
|
|
|
static inline void
|
|
|
|
translate_char(char *p, int from, int to)
|
|
|
|
{
|
|
|
|
while (*p) {
|
|
|
|
if ((unsigned char)*p == from)
|
|
|
|
*p = to;
|
|
|
|
p = CharNext(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2001-05-28 12:07:34 -04:00
|
|
|
#if defined _WIN32 || defined __CYGWIN__ || defined __DJGPP__
|
2007-07-26 00:38:07 -04:00
|
|
|
static VALUE
|
|
|
|
rubylib_mangled_path(const char *s, unsigned int l)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
static char *newp, *oldp;
|
|
|
|
static int newl, oldl, notfound;
|
2007-07-26 00:38:07 -04:00
|
|
|
char *ptr;
|
|
|
|
VALUE ret;
|
2000-07-24 05:58:10 -04:00
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
if (!newp && !notfound) {
|
|
|
|
newp = getenv("RUBYLIB_PREFIX");
|
|
|
|
if (newp) {
|
2007-07-26 00:38:07 -04:00
|
|
|
oldp = newp = strdup(newp);
|
1999-08-13 01:45:20 -04:00
|
|
|
while (*newp && !ISSPACE(*newp) && *newp != ';') {
|
2007-07-26 00:38:07 -04:00
|
|
|
newp = CharNext(newp); /* Skip digits. */
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
2007-07-26 00:38:07 -04:00
|
|
|
oldl = newp - oldp;
|
1999-08-13 01:45:20 -04:00
|
|
|
while (*newp && (ISSPACE(*newp) || *newp == ';')) {
|
2007-07-26 00:38:07 -04:00
|
|
|
newp = CharNext(newp); /* Skip whitespace. */
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
newl = strlen(newp);
|
2007-07-26 00:38:07 -04:00
|
|
|
if (newl == 0 || oldl == 0) {
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_fatal("malformed RUBYLIB_PREFIX");
|
|
|
|
}
|
2007-07-26 00:38:07 -04:00
|
|
|
translate_char(newp, '\\', '/');
|
2001-05-02 00:22:21 -04:00
|
|
|
}
|
|
|
|
else {
|
1999-08-13 01:45:20 -04:00
|
|
|
notfound = 1;
|
|
|
|
}
|
|
|
|
}
|
2000-07-24 05:58:10 -04:00
|
|
|
if (!newp || l < oldl || strncasecmp(oldp, s, oldl) != 0) {
|
2007-07-26 00:38:07 -04:00
|
|
|
return rb_str_new(s, l);
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
2007-07-26 00:38:07 -04:00
|
|
|
ret = rb_str_new(0, l + newl - oldl);
|
|
|
|
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 01:45:20 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
|
2007-07-26 00:38:07 -04:00
|
|
|
static VALUE
|
|
|
|
rubylib_mangled_path2(const char *s)
|
|
|
|
{
|
|
|
|
return rubylib_mangled_path(s, strlen(s));
|
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
#else
|
2007-07-26 00:38:07 -04:00
|
|
|
#define rubylib_mangled_path rb_str_new
|
|
|
|
#define rubylib_mangled_path2 rb_str_new2
|
1999-08-13 01:45:20 -04:00
|
|
|
#endif
|
|
|
|
|
2007-07-26 00:38:07 -04:00
|
|
|
static void
|
|
|
|
push_include(const char *path, VALUE (*filter)(VALUE))
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-08-13 01:45:20 -04:00
|
|
|
const char sep = PATH_SEP_CHAR;
|
2007-07-26 00:38:07 -04:00
|
|
|
const char *p, *s;
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2007-07-26 00:38:07 -04:00
|
|
|
p = path;
|
|
|
|
while (*p) {
|
|
|
|
while (*p == sep)
|
|
|
|
p++;
|
|
|
|
if (!*p) break;
|
|
|
|
for (s = p; *s && *s != sep; s = CharNext(s));
|
|
|
|
rb_ary_push(rb_load_path, (*filter)(rubylib_mangled_path(p, s - p)));
|
|
|
|
p = s;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2007-07-26 00: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 07:13:05 -05:00
|
|
|
}
|
|
|
|
else {
|
2007-07-26 00:38:07 -04:00
|
|
|
rb_str_resize(buf, len);
|
|
|
|
p = strncpy(RSTRING_PTR(buf), p, len);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
2007-07-26 00: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 05:25:37 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-26 00: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-20 17: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 06:44:21 -04:00
|
|
|
identical_path(VALUE path)
|
2005-04-20 17:44:20 -04:00
|
|
|
{
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
2007-07-26 00:38:07 -04:00
|
|
|
void
|
2005-04-20 17:44:20 -04:00
|
|
|
ruby_incpush(const char *path)
|
|
|
|
{
|
|
|
|
ruby_push_include(path, identical_path);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
expand_include_path(VALUE path)
|
2005-04-20 17:44:20 -04:00
|
|
|
{
|
2006-08-31 06:47:44 -04:00
|
|
|
char *p = RSTRING_PTR(path);
|
2006-12-31 10:02:22 -05:00
|
|
|
if (!p)
|
|
|
|
return path;
|
|
|
|
if (*p == '.' && p[1] == '/')
|
|
|
|
return path;
|
2005-04-20 17:44:20 -04:00
|
|
|
return rb_file_expand_path(path, Qnil);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ruby_incpush_expand(const char *path)
|
|
|
|
{
|
|
|
|
ruby_push_include(path, expand_include_path);
|
|
|
|
}
|
|
|
|
|
2002-10-03 07:20:31 -04:00
|
|
|
#if defined DOSISH || defined __CYGWIN__
|
2001-05-28 12:07:34 -04:00
|
|
|
#define LOAD_RELATIVE 1
|
|
|
|
#endif
|
|
|
|
|
2007-05-17 22: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;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2000-08-02 05: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 06:44:21 -04:00
|
|
|
ruby_init_loadpath(void)
|
2000-08-01 05:25:37 -04:00
|
|
|
{
|
2001-05-28 12:07:34 -04:00
|
|
|
#if defined LOAD_RELATIVE
|
2006-12-31 10:02:22 -05:00
|
|
|
char libpath[MAXPATHLEN + 1];
|
2000-08-03 05:50:41 -04:00
|
|
|
char *p;
|
2000-11-20 02:31:55 -05:00
|
|
|
int rest;
|
2007-05-17 22:11:42 -04:00
|
|
|
|
2001-05-28 12:07:34 -04:00
|
|
|
#if defined _WIN32 || defined __CYGWIN__
|
|
|
|
GetModuleFileName(libruby, libpath, sizeof libpath);
|
2000-08-03 05:50:41 -04:00
|
|
|
#elif defined(DJGPP)
|
|
|
|
extern char *__dos_argv0;
|
2004-03-12 06:19:22 -05:00
|
|
|
strncpy(libpath, __dos_argv0, sizeof(libpath) - 1);
|
2002-10-03 07:20:31 -04:00
|
|
|
#elif defined(__human68k__)
|
|
|
|
extern char **_argv;
|
2004-03-12 06:19:22 -05:00
|
|
|
strncpy(libpath, _argv[0], sizeof(libpath) - 1);
|
2000-10-02 03:48:42 -04:00
|
|
|
#elif defined(__EMX__)
|
2004-03-12 06:19:22 -05:00
|
|
|
_execname(libpath, sizeof(libpath) - 1);
|
2000-08-03 05:50:41 -04:00
|
|
|
#endif
|
2001-02-09 09:11:23 -05:00
|
|
|
|
2004-03-12 06:19:22 -05:00
|
|
|
libpath[sizeof(libpath) - 1] = '\0';
|
2007-07-26 00:38:07 -04:00
|
|
|
#if defined DOSISH
|
2002-10-03 07:20:31 -04:00
|
|
|
translate_char(libpath, '\\', '/');
|
2007-07-26 00:38:07 -04:00
|
|
|
#elif defined __CYGWIN__
|
|
|
|
{
|
|
|
|
char rubylib[FILENAME_MAX];
|
|
|
|
cygwin_conv_to_posix_path(libpath, rubylib);
|
|
|
|
strncpy(libpath, rubylib, sizeof(libpath));
|
|
|
|
}
|
2001-02-09 09:11:23 -05:00
|
|
|
#endif
|
|
|
|
p = strrchr(libpath, '/');
|
2000-08-03 05:50:41 -04:00
|
|
|
if (p) {
|
|
|
|
*p = 0;
|
2006-12-31 10:02:22 -05:00
|
|
|
if (p - libpath > 3 && !strcasecmp(p - 4, "/bin")) {
|
2000-08-03 05:50:41 -04:00
|
|
|
p -= 4;
|
|
|
|
*p = 0;
|
|
|
|
}
|
2001-05-02 00:22:21 -04:00
|
|
|
}
|
|
|
|
else {
|
2000-08-03 05:50:41 -04:00
|
|
|
strcpy(libpath, ".");
|
|
|
|
p = libpath + 1;
|
|
|
|
}
|
|
|
|
|
2004-03-12 06:19:22 -05:00
|
|
|
rest = sizeof(libpath) - 1 - (p - libpath);
|
2000-08-03 05:50:41 -04:00
|
|
|
|
|
|
|
#define RUBY_RELATIVE(path) (strncpy(p, (path), rest), libpath)
|
|
|
|
#else
|
|
|
|
#define RUBY_RELATIVE(path) (path)
|
|
|
|
#endif
|
2007-07-26 00:38:07 -04:00
|
|
|
#define incpush(path) rb_ary_push(rb_load_path, rubylib_mangled_path2(path))
|
2000-08-03 05:50:41 -04:00
|
|
|
|
2000-08-01 05:25:37 -04:00
|
|
|
if (rb_safe_level() == 0) {
|
2000-08-02 05:22:27 -04:00
|
|
|
ruby_incpush(getenv("RUBYLIB"));
|
2000-08-01 05:25:37 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef RUBY_SEARCH_PATH
|
2007-07-26 00:38:07 -04:00
|
|
|
incpush(RUBY_RELATIVE(RUBY_SEARCH_PATH));
|
2000-08-01 05:25:37 -04:00
|
|
|
#endif
|
|
|
|
|
2007-07-26 00:38:07 -04:00
|
|
|
incpush(RUBY_RELATIVE(RUBY_SITE_LIB2));
|
2000-08-01 05:25:37 -04:00
|
|
|
#ifdef RUBY_SITE_THIN_ARCHLIB
|
2007-07-26 00:38:07 -04:00
|
|
|
incpush(RUBY_RELATIVE(RUBY_SITE_THIN_ARCHLIB));
|
2000-08-01 05:25:37 -04:00
|
|
|
#endif
|
2007-07-26 00:38:07 -04:00
|
|
|
incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
|
|
|
|
incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
|
2000-08-01 05:25:37 -04:00
|
|
|
|
2007-11-03 07:35:59 -04:00
|
|
|
incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB2));
|
|
|
|
#ifdef RUBY_VENDOR_THIN_ARCHLIB
|
|
|
|
incpush(RUBY_RELATIVE(RUBY_VENDOR_THIN_ARCHLIB));
|
|
|
|
#endif
|
|
|
|
incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCHLIB));
|
|
|
|
incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB));
|
|
|
|
|
2007-07-26 00:38:07 -04:00
|
|
|
incpush(RUBY_RELATIVE(RUBY_LIB));
|
2000-08-01 05:25:37 -04:00
|
|
|
#ifdef RUBY_THIN_ARCHLIB
|
2007-07-26 00:38:07 -04:00
|
|
|
incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB));
|
2000-08-01 05:25:37 -04:00
|
|
|
#endif
|
2007-07-26 00:38:07 -04:00
|
|
|
incpush(RUBY_RELATIVE(RUBY_ARCHLIB));
|
2000-08-01 05:25:37 -04:00
|
|
|
|
|
|
|
if (rb_safe_level() == 0) {
|
2007-07-26 00:38:07 -04:00
|
|
|
incpush(".");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
struct req_list {
|
2000-02-17 02:11:22 -05:00
|
|
|
char *name;
|
1998-01-16 07:13:05 -05:00
|
|
|
struct req_list *next;
|
* intern.h: add prototypes.
rb_gc_enable(), rb_gc_disable(), rb_gc_start(), rb_str_new5()
rb_str_buf_append(), rb_str_buf_cat(), rb_str_buf_cat2(),
rb_str_dup_frozen()
* ruby.h: added declaration.
rb_defout, rb_stdin, rb_stdout, rb_stderr, ruby_errinfo
* rubyio.h: changed double include guard macro to RUBYIO_H.
* array.c (inspect_call): make static.
* eval.c (dvar_asgn): ditto.
* io.c (rb_io_close_read): ditto.
* lex.c (rb_reserved_word): ditto.
* ruby.c: (req_list_head, req_list_last): ditto.
* ruby.c (require_libraries): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2001-12-17 02:52:35 -05:00
|
|
|
};
|
2007-09-28 17:47:31 -04:00
|
|
|
static struct {
|
|
|
|
struct req_list *last, head;
|
|
|
|
} req_list = {&req_list.head,};
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
add_modules(const char *mod)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct req_list *list;
|
|
|
|
|
|
|
|
list = ALLOC(struct req_list);
|
2006-12-31 10:02:22 -05:00
|
|
|
list->name = ALLOC_N(char, strlen(mod) + 1);
|
2000-02-17 02:11:22 -05:00
|
|
|
strcpy(list->name, mod);
|
1999-01-19 23:59:39 -05:00
|
|
|
list->next = 0;
|
2007-09-28 17:47:31 -04:00
|
|
|
req_list.last->next = list;
|
|
|
|
req_list.last = list;
|
1998-01-16 07:13:05 -05: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 02:32:32 -04:00
|
|
|
extern void Init_ext(void);
|
2007-09-30 21:58:44 -04:00
|
|
|
extern VALUE rb_vm_top_self(void);
|
2000-06-28 04: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 02:52:35 -05: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 06:44:21 -04:00
|
|
|
require_libraries(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2007-09-28 17:47:31 -04:00
|
|
|
struct req_list *list = req_list.head.next;
|
1998-01-16 07:13:05 -05:00
|
|
|
struct req_list *tmp;
|
2007-09-30 21:58:44 -04:00
|
|
|
ID require = rb_intern("require");
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-04-11 06:10:18 -04:00
|
|
|
Init_ext(); /* should be called here for some reason :-( */
|
2007-09-28 17:47:31 -04:00
|
|
|
req_list.last = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
while (list) {
|
2007-09-30 21:58:44 -04:00
|
|
|
VALUE feature = rb_str_new2(list->name);
|
1998-01-16 07:13:05 -05:00
|
|
|
tmp = list->next;
|
2000-02-17 02:11:22 -05:00
|
|
|
free(list->name);
|
1998-01-16 07:13:05 -05:00
|
|
|
free(list);
|
|
|
|
list = tmp;
|
2007-09-30 21:58:44 -04:00
|
|
|
rb_funcall2(rb_vm_top_self(), require, 1, &feature);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2007-09-28 17:47:31 -04:00
|
|
|
req_list.head.next = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2007-09-28 17:47:31 -04:00
|
|
|
process_sflag(struct cmdline_options *opt)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2007-09-28 17:47:31 -04:00
|
|
|
if (opt->sflag) {
|
2002-08-21 11:47:54 -04:00
|
|
|
long n;
|
1999-10-15 04:52:18 -04:00
|
|
|
VALUE *args;
|
|
|
|
|
2006-09-02 10:42:08 -04:00
|
|
|
n = RARRAY_LEN(rb_argv);
|
|
|
|
args = RARRAY_PTR(rb_argv);
|
1999-12-02 01:58:52 -05:00
|
|
|
while (n > 0) {
|
2001-05-02 00:22:21 -04:00
|
|
|
VALUE v = *args++;
|
|
|
|
char *s = StringValuePtr(v);
|
1999-10-15 04:52:18 -04:00
|
|
|
char *p;
|
2005-04-30 20:13:48 -04:00
|
|
|
int hyphen = Qfalse;
|
1999-10-15 04:52:18 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (s[0] != '-')
|
|
|
|
break;
|
1999-12-02 01:58:52 -05:00
|
|
|
n--;
|
2006-12-31 10:02:22 -05:00
|
|
|
if (s[1] == '-' && s[2] == '\0')
|
|
|
|
break;
|
1999-10-15 04:52:18 -04:00
|
|
|
|
2005-04-30 20:13:48 -04:00
|
|
|
v = Qtrue;
|
|
|
|
/* check if valid name before replacing - with _ */
|
|
|
|
for (p = s + 1; *p; p++) {
|
|
|
|
if (*p == '=') {
|
|
|
|
*p++ = '\0';
|
|
|
|
v = rb_str_new2(p);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (*p == '-') {
|
|
|
|
hyphen = Qtrue;
|
|
|
|
}
|
|
|
|
else if (*p != '_' && !ISALNUM(*p)) {
|
|
|
|
VALUE name_error[2];
|
2006-12-31 10:02:22 -05:00
|
|
|
name_error[0] =
|
|
|
|
rb_str_new2("invalid name for global variable - ");
|
2005-04-30 20: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-28 17:47:31 -04:00
|
|
|
rb_exc_raise(rb_class_new_instance(2, name_error, rb_eNameError));
|
2005-04-30 20:13:48 -04:00
|
|
|
}
|
1999-10-15 04:52:18 -04:00
|
|
|
}
|
2005-04-30 20:13:48 -04:00
|
|
|
s[0] = '$';
|
|
|
|
if (hyphen) {
|
|
|
|
for (p = s + 1; *p; ++p) {
|
2006-12-31 10:02:22 -05:00
|
|
|
if (*p == '-')
|
|
|
|
*p = '_';
|
2005-04-30 20:13:48 -04:00
|
|
|
}
|
1999-10-15 04:52:18 -04:00
|
|
|
}
|
2005-04-30 20:13:48 -04:00
|
|
|
rb_gv_set(s, v);
|
1999-10-15 04:52:18 -04:00
|
|
|
}
|
2006-09-02 10:42:08 -04:00
|
|
|
n = RARRAY_LEN(rb_argv) - n;
|
1999-10-15 04:52:18 -04:00
|
|
|
while (n--) {
|
|
|
|
rb_ary_shift(rb_argv);
|
|
|
|
}
|
|
|
|
}
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->sflag = 0;
|
1999-10-15 04:52:18 -04:00
|
|
|
}
|
|
|
|
|
2007-07-05 05:28:00 -04:00
|
|
|
NODE *rb_parser_append_print(VALUE, NODE *);
|
|
|
|
NODE *rb_parser_while_loop(VALUE, NODE *, int, int);
|
2007-09-28 17:47:31 -04:00
|
|
|
static int proc_options(int argc, char **argv, struct cmdline_options *opt);
|
1999-10-21 03:52:15 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static char *
|
2007-09-28 17:47:31 -04:00
|
|
|
moreswitches(const char *s, struct cmdline_options *opt)
|
1999-10-21 03:52:15 -04:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
int argc;
|
|
|
|
char *argv[3];
|
2006-07-21 10:58:18 -04:00
|
|
|
const char *p = s;
|
1999-10-21 03:52:15 -04:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
argc = 2;
|
|
|
|
argv[0] = argv[2] = 0;
|
1999-10-21 03:52:15 -04:00
|
|
|
while (*s && !ISSPACE(*s))
|
|
|
|
s++;
|
2006-12-31 10:02:22 -05:00
|
|
|
argv[1] = ALLOCA_N(char, s - p + 2);
|
1999-12-06 04:04:03 -05:00
|
|
|
argv[1][0] = '-';
|
2006-12-31 10:02:22 -05:00
|
|
|
strncpy(argv[1] + 1, p, s - p);
|
|
|
|
argv[1][s - p + 1] = '\0';
|
2007-09-28 17:47:31 -04:00
|
|
|
proc_options(argc, argv, opt);
|
1999-10-21 03:52:15 -04:00
|
|
|
while (*s && ISSPACE(*s))
|
|
|
|
s++;
|
2006-07-21 10:58:18 -04:00
|
|
|
return (char *)s;
|
1999-10-21 03:52:15 -04:00
|
|
|
}
|
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
static int
|
|
|
|
proc_options(int argc, char **argv, struct cmdline_options *opt)
|
1999-10-15 04:52:18 -04:00
|
|
|
{
|
2007-09-28 17:47:31 -04:00
|
|
|
int argc0 = argc;
|
2006-07-21 10:58:18 -04:00
|
|
|
const char *s;
|
1999-10-16 06:33:06 -04:00
|
|
|
|
2006-12-31 10:02:22 -05: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 04:12:18 -04:00
|
|
|
return 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
for (argc--, argv++; argc > 0; argc--, argv++) {
|
|
|
|
if (argv[0][0] != '-' || !argv[0][1])
|
|
|
|
break;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
s = argv[0] + 1;
|
1998-01-16 07:13:05 -05:00
|
|
|
reswitch:
|
|
|
|
switch (*s) {
|
|
|
|
case 'a':
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->do_split = Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'p':
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->do_print = Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
/* through */
|
|
|
|
case 'n':
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->do_loop = Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'd':
|
1999-08-13 01:45:20 -04:00
|
|
|
ruby_debug = Qtrue;
|
1999-10-16 06:33:06 -04:00
|
|
|
ruby_verbose = Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'y':
|
2007-11-13 07:41:41 -05:00
|
|
|
opt->yydebug = 1;
|
1998-01-16 07:13:05 -05:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'v':
|
2007-09-28 17:47:31 -04:00
|
|
|
if (opt->verbose) {
|
2001-02-27 02:52:11 -05:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
ruby_show_version();
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->verbose = 1;
|
1998-01-16 07:13:05 -05:00
|
|
|
case 'w':
|
1999-10-16 06:33:06 -04:00
|
|
|
ruby_verbose = Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
2003-07-29 14:26:55 -04:00
|
|
|
case 'W':
|
|
|
|
{
|
|
|
|
int numlen;
|
|
|
|
int v = 2; /* -W as -W2 */
|
|
|
|
|
|
|
|
if (*++s) {
|
|
|
|
v = scan_oct(s, 1, &numlen);
|
2006-12-31 10:02:22 -05:00
|
|
|
if (numlen == 0)
|
|
|
|
v = 1;
|
2003-07-29 14:26:55 -04:00
|
|
|
s += numlen;
|
|
|
|
}
|
|
|
|
switch (v) {
|
|
|
|
case 0:
|
2006-12-31 10:02:22 -05:00
|
|
|
ruby_verbose = Qnil;
|
|
|
|
break;
|
2003-07-29 14:26:55 -04:00
|
|
|
case 1:
|
2006-12-31 10:02:22 -05:00
|
|
|
ruby_verbose = Qfalse;
|
|
|
|
break;
|
2003-07-29 14:26:55 -04:00
|
|
|
default:
|
2006-12-31 10:02:22 -05:00
|
|
|
ruby_verbose = Qtrue;
|
|
|
|
break;
|
2003-07-29 14:26:55 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
goto reswitch;
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
case 'c':
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->do_check = Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 's':
|
|
|
|
forbid_setid("-s");
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->sflag = 1;
|
1998-01-16 07:13:05 -05:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
case 'h':
|
2007-09-28 17:47:31 -04:00
|
|
|
usage(origarg.argv[0]);
|
2007-09-30 21:52:32 -04:00
|
|
|
rb_exit(EXIT_SUCCESS);
|
|
|
|
break;
|
1999-08-13 01:45:20 -04:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
case 'l':
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->do_line = Qtrue;
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_output_rs = rb_rs;
|
1998-01-16 07:13:05 -05:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'S':
|
|
|
|
forbid_setid("-S");
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->do_search = Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
s++;
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'e':
|
|
|
|
forbid_setid("-e");
|
1999-08-13 01:45:20 -04:00
|
|
|
if (!*++s) {
|
|
|
|
s = argv[1];
|
2006-12-31 10:02:22 -05:00
|
|
|
argc--, argv++;
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
if (!s) {
|
2007-09-28 17:47:31 -04:00
|
|
|
rb_raise(rb_eRuntimeError, "no code specified for -e");
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
2007-09-28 17: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 07:13:05 -05:00
|
|
|
}
|
2007-09-28 17:47:31 -04:00
|
|
|
rb_str_cat2(opt->e_script, s);
|
|
|
|
rb_str_cat2(opt->e_script, "\n");
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'r':
|
|
|
|
forbid_setid("-r");
|
|
|
|
if (*++s) {
|
|
|
|
add_modules(s);
|
|
|
|
}
|
|
|
|
else if (argv[1]) {
|
|
|
|
add_modules(argv[1]);
|
2006-12-31 10:02:22 -05:00
|
|
|
argc--, argv++;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'i':
|
|
|
|
forbid_setid("-i");
|
2006-12-31 10:02:22 -05:00
|
|
|
if (ruby_inplace_mode)
|
|
|
|
free(ruby_inplace_mode);
|
|
|
|
ruby_inplace_mode = strdup(s + 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'x':
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->xflag = Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
s++;
|
|
|
|
if (*s && chdir(s) < 0) {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_fatal("Can't chdir to %s", s);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2000-01-04 23:41:21 -05:00
|
|
|
case 'C':
|
1998-01-16 07:13:05 -05:00
|
|
|
case 'X':
|
|
|
|
s++;
|
|
|
|
if (!*s) {
|
|
|
|
s = argv[1];
|
2006-12-31 10:02:22 -05:00
|
|
|
argc--, argv++;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2000-01-04 23:41:21 -05:00
|
|
|
if (!s || !*s) {
|
|
|
|
rb_fatal("Can't chdir");
|
|
|
|
}
|
|
|
|
if (chdir(s) < 0) {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_fatal("Can't chdir to %s", s);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'F':
|
1999-12-06 04:04:03 -05:00
|
|
|
if (*++s) {
|
* 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-24 23:29:39 -04:00
|
|
|
rb_fs = rb_reg_new(rb_str_new2(s), 0);
|
1999-12-06 04:04:03 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
|
2007-10-16 16:07:20 -04:00
|
|
|
case 'E':
|
|
|
|
if (!*++s) {
|
2007-10-22 11:29:53 -04:00
|
|
|
s = argv[1];
|
|
|
|
argc--, argv++;
|
2007-10-16 16:07:20 -04:00
|
|
|
}
|
|
|
|
goto encoding;
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
case 'K':
|
1999-12-06 04:04:03 -05:00
|
|
|
if (*++s) {
|
2007-09-28 16:29:32 -04:00
|
|
|
rb_encoding *enc = 0;
|
|
|
|
switch (*s) {
|
|
|
|
case 'E': case 'e':
|
|
|
|
enc = ONIG_ENCODING_EUC_JP;
|
|
|
|
break;
|
|
|
|
case 'S': case 's':
|
|
|
|
enc = ONIG_ENCODING_SJIS;
|
|
|
|
break;
|
|
|
|
case 'U': case 'u':
|
|
|
|
enc = ONIG_ENCODING_UTF8;
|
|
|
|
break;
|
|
|
|
case 'N': case 'n': case 'A': case 'a':
|
|
|
|
enc = ONIG_ENCODING_ASCII;
|
|
|
|
break;
|
2007-10-16 01:48:40 -04:00
|
|
|
}
|
2007-10-16 16:07:20 -04:00
|
|
|
if (enc) {
|
2007-12-20 23:40:13 -05:00
|
|
|
opt->enc_name = rb_enc_name(enc);
|
2007-09-28 16:29:32 -04:00
|
|
|
}
|
1999-12-06 04:04:03 -05:00
|
|
|
s++;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case 'T':
|
|
|
|
{
|
|
|
|
int numlen;
|
|
|
|
int v = 1;
|
|
|
|
|
|
|
|
if (*++s) {
|
|
|
|
v = scan_oct(s, 2, &numlen);
|
2006-12-31 10:02:22 -05:00
|
|
|
if (numlen == 0)
|
|
|
|
v = 1;
|
2002-05-22 08:32:15 -04:00
|
|
|
s += numlen;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
rb_set_safe_level(v);
|
|
|
|
}
|
2002-05-22 08:32:15 -04:00
|
|
|
goto reswitch;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
case 'I':
|
|
|
|
forbid_setid("-I");
|
|
|
|
if (*++s)
|
2005-04-20 17:44:20 -04:00
|
|
|
ruby_incpush_expand(s);
|
1998-01-16 07:13:05 -05:00
|
|
|
else if (argv[1]) {
|
2005-04-20 17:44:20 -04:00
|
|
|
ruby_incpush_expand(argv[1]);
|
2006-12-31 10:02:22 -05:00
|
|
|
argc--, argv++;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2002-05-23 03:41:53 -04:00
|
|
|
break;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
case '0':
|
|
|
|
{
|
|
|
|
int numlen;
|
|
|
|
int v;
|
|
|
|
char c;
|
|
|
|
|
|
|
|
v = scan_oct(s, 4, &numlen);
|
|
|
|
s += numlen;
|
2006-12-31 10:02:22 -05:00
|
|
|
if (v > 0377)
|
|
|
|
rb_rs = Qnil;
|
1998-01-16 07:13:05 -05:00
|
|
|
else if (v == 0 && numlen >= 2) {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_rs = rb_str_new2("\n\n");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
c = v & 0xff;
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_rs = rb_str_new(&c, 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
goto reswitch;
|
|
|
|
|
|
|
|
case '-':
|
2003-01-16 02:38:40 -05:00
|
|
|
if (!s[1] || (s[1] == '\r' && !s[2])) {
|
2006-12-31 10:02:22 -05:00
|
|
|
argc--, argv++;
|
1998-01-16 07:13:05 -05:00
|
|
|
goto switch_end;
|
|
|
|
}
|
|
|
|
s++;
|
|
|
|
if (strcmp("copyright", s) == 0)
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->copyright = 1;
|
2001-10-02 00:31:23 -04:00
|
|
|
else if (strcmp("debug", s) == 0) {
|
|
|
|
ruby_debug = Qtrue;
|
|
|
|
ruby_verbose = Qtrue;
|
|
|
|
}
|
2007-11-10 04:22:59 -05:00
|
|
|
else if (strcmp("disable-gems", s) == 0)
|
|
|
|
opt->disable_gems = 1;
|
2007-10-16 16:07:20 -04:00
|
|
|
else if (strcmp("encoding", s) == 0) {
|
|
|
|
if (!--argc || !(s = *++argv)) {
|
|
|
|
noencoding:
|
|
|
|
rb_raise(rb_eRuntimeError, "missing argument for --encoding");
|
|
|
|
}
|
|
|
|
encoding:
|
2007-12-20 23:40:13 -05:00
|
|
|
opt->enc_name = s;
|
2007-10-16 16:07:20 -04:00
|
|
|
}
|
|
|
|
else if (strncmp("encoding=", s, 9) == 0) {
|
2007-10-17 04:39:33 -04:00
|
|
|
if (!*(s += 9)) goto noencoding;
|
2007-10-16 16:07:20 -04:00
|
|
|
goto encoding;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
else if (strcmp("version", s) == 0)
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->version = 1;
|
1999-10-16 06:33:06 -04:00
|
|
|
else if (strcmp("verbose", s) == 0) {
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->verbose = 1;
|
1999-10-16 06:33:06 -04:00
|
|
|
ruby_verbose = Qtrue;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
else if (strcmp("yydebug", s) == 0)
|
2007-11-13 07:41:41 -05:00
|
|
|
opt->yydebug = 1;
|
1999-08-13 01:45:20 -04:00
|
|
|
else if (strcmp("help", s) == 0) {
|
2007-09-28 17:47:31 -04:00
|
|
|
usage(origarg.argv[0]);
|
2007-09-30 21:52:32 -04:00
|
|
|
rb_exit(EXIT_SUCCESS);
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
else {
|
2007-09-28 17:47:31 -04:00
|
|
|
rb_raise(rb_eRuntimeError,
|
|
|
|
"invalid option --%s (-h will show valid options)", s);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2005-01-15 00:58:02 -05:00
|
|
|
case '\r':
|
2006-12-31 10:02:22 -05:00
|
|
|
if (!s[1])
|
|
|
|
break;
|
2005-01-15 00:58:02 -05:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
default:
|
2005-01-15 00:58:02 -05:00
|
|
|
{
|
|
|
|
if (ISPRINT(*s)) {
|
2007-12-08 03:11:52 -05:00
|
|
|
rb_raise(rb_eRuntimeError,
|
|
|
|
"invalid option -%c (-h will show valid options)",
|
|
|
|
(int)(unsigned char)*s);
|
2005-01-15 00:58:02 -05:00
|
|
|
}
|
|
|
|
else {
|
2007-12-08 03:11:52 -05:00
|
|
|
rb_raise(rb_eRuntimeError,
|
2007-12-12 09:30:54 -05:00
|
|
|
"invalid option -\\x%02X (-h will show valid options)",
|
2007-12-08 03:11:52 -05:00
|
|
|
(int)(unsigned char)*s);
|
2005-01-15 00:58:02 -05:00
|
|
|
}
|
|
|
|
}
|
2007-09-28 17:47:31 -04:00
|
|
|
goto switch_end;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch_end:
|
2007-09-28 17:47:31 -04:00
|
|
|
return argc0 - argc;
|
|
|
|
}
|
|
|
|
|
2007-11-10 04:22:59 -05:00
|
|
|
void Init_prelude(void);
|
|
|
|
|
|
|
|
static void
|
|
|
|
ruby_init_gems(struct cmdline_options *opt)
|
|
|
|
{
|
|
|
|
VALUE gem;
|
|
|
|
gem = rb_define_module("Gem");
|
|
|
|
rb_const_set(gem, rb_intern("Enable"), opt->disable_gems ? Qfalse : Qtrue);
|
|
|
|
Init_prelude();
|
|
|
|
}
|
|
|
|
|
2007-10-02 21:06:57 -04:00
|
|
|
static VALUE
|
|
|
|
process_options(VALUE arg)
|
2007-09-28 17:47:31 -04:00
|
|
|
{
|
2007-10-02 21:06:57 -04:00
|
|
|
struct cmdline_options *opt = (struct cmdline_options *)arg;
|
|
|
|
int argc = opt->argc;
|
|
|
|
char **argv = opt->argv;
|
2007-09-28 17:47:31 -04:00
|
|
|
NODE *tree = 0;
|
|
|
|
VALUE parser;
|
2007-11-09 03:48:13 -05:00
|
|
|
rb_encoding *enc;
|
2007-09-28 17:47:31 -04:00
|
|
|
const char *s;
|
|
|
|
int i = proc_options(argc, argv, opt);
|
|
|
|
|
|
|
|
argc -= i;
|
|
|
|
argv += i;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-10-21 03:52:15 -04:00
|
|
|
if (rb_safe_level() == 0 && (s = getenv("RUBYOPT"))) {
|
2006-12-31 10:02:22 -05:00
|
|
|
while (ISSPACE(*s))
|
|
|
|
s++;
|
|
|
|
if (*s == 'T' || (*s == '-' && *(s + 1) == 'T')) {
|
1999-10-21 03:52:15 -04:00
|
|
|
int numlen;
|
|
|
|
int v = 1;
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (*s != 'T')
|
|
|
|
++s;
|
1999-10-21 03:52:15 -04:00
|
|
|
if (*++s) {
|
|
|
|
v = scan_oct(s, 2, &numlen);
|
2006-12-31 10:02:22 -05:00
|
|
|
if (numlen == 0)
|
|
|
|
v = 1;
|
1999-10-21 03:52:15 -04:00
|
|
|
}
|
|
|
|
rb_set_safe_level(v);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
while (s && *s) {
|
|
|
|
if (*s == '-') {
|
|
|
|
s++;
|
2002-05-23 01:35:32 -04:00
|
|
|
if (ISSPACE(*s)) {
|
2006-12-31 10:02:22 -05:00
|
|
|
do {
|
|
|
|
s++;
|
|
|
|
} while (ISSPACE(*s));
|
2002-05-23 01:35:32 -04:00
|
|
|
continue;
|
|
|
|
}
|
1999-10-21 03:52:15 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
if (!*s)
|
|
|
|
break;
|
2007-09-12 10:14:32 -04:00
|
|
|
if (!strchr("IdvwWrK", *s))
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_raise(rb_eRuntimeError,
|
* regerror.c, string.c, io.c, lib/getoptlong.rb, lib/net/imap.rb,
compile.c, sprintf.c, parse.y, ext/win32ole/win32ole.c,
ext/tk/sample/demos-en/entry3.rb, ext/tk/lib/tcltk.rb,
ext/openssl/ossl_bn.c, numeric.c, vm.c,
benchmark/bm_so_meteor_contest.rb, bignum.c, ruby.c: don't "illegal"
for non law violation context.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14377 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-12-20 21:31:11 -05:00
|
|
|
"invalid switch in RUBYOPT: -%c", *s);
|
2007-09-28 17:47:31 -04:00
|
|
|
s = moreswitches(s, opt);
|
1999-10-21 03:52:15 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
if (opt->version) {
|
1999-01-19 23:59:39 -05:00
|
|
|
ruby_show_version();
|
2007-10-02 21:06:57 -04:00
|
|
|
return Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2007-09-28 17:47:31 -04:00
|
|
|
if (opt->copyright) {
|
1999-01-19 23:59:39 -05:00
|
|
|
ruby_show_copyright();
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2001-05-30 05:12:34 -04:00
|
|
|
if (rb_safe_level() >= 4) {
|
2003-06-23 02:52:39 -04:00
|
|
|
OBJ_TAINT(rb_argv);
|
|
|
|
OBJ_TAINT(rb_load_path);
|
2001-05-30 05:12:34 -04:00
|
|
|
}
|
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
if (!opt->e_script) {
|
2003-02-12 22:02:19 -05:00
|
|
|
if (argc == 0) { /* no more args */
|
2007-09-28 17:47:31 -04:00
|
|
|
if (opt->verbose)
|
2007-10-02 21:06:57 -04:00
|
|
|
return Qtrue;
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->script = "-";
|
2001-09-03 01:37:42 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
else {
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->script = argv[0];
|
|
|
|
if (opt->script[0] == '\0') {
|
|
|
|
opt->script = "-";
|
2003-02-12 22:02:19 -05:00
|
|
|
}
|
2007-09-28 17:47:31 -04:00
|
|
|
else if (opt->do_search) {
|
1999-10-15 04:52:18 -04:00
|
|
|
char *path = getenv("RUBYPATH");
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->script = 0;
|
1999-10-15 04:52:18 -04:00
|
|
|
if (path) {
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->script = dln_find_file(argv[0], path);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2007-09-28 17:47:31 -04:00
|
|
|
if (!opt->script) {
|
|
|
|
opt->script = dln_find_file(argv[0], getenv(PATH_ENV));
|
1999-10-15 04:52:18 -04:00
|
|
|
}
|
2007-09-28 17:47:31 -04:00
|
|
|
if (!opt->script)
|
|
|
|
opt->script = argv[0];
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2004-01-18 06:49:46 -05:00
|
|
|
#if defined DOSISH || defined __CYGWIN__
|
2006-07-04 08:50:30 -04:00
|
|
|
/* assume that we can change argv[n] if never change its length. */
|
2007-09-28 17:47:31 -04:00
|
|
|
translate_char(opt->script, '\\', '/');
|
2002-10-03 07:20:31 -04:00
|
|
|
#endif
|
2006-12-31 10:02:22 -05:00
|
|
|
argc--;
|
|
|
|
argv++;
|
2003-02-12 19:59:00 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
ruby_script(opt->script);
|
1999-10-15 04:52:18 -04:00
|
|
|
ruby_set_argv(argc, argv);
|
2007-09-28 17:47:31 -04:00
|
|
|
process_sflag(opt);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-08-02 05:22:27 -04:00
|
|
|
ruby_init_loadpath();
|
2007-11-10 04:22:59 -05:00
|
|
|
ruby_init_gems(opt);
|
2007-09-28 16:29:32 -04:00
|
|
|
parser = rb_parser_new();
|
2007-11-13 07:41:41 -05:00
|
|
|
if (opt->yydebug) rb_parser_set_yydebug(parser, Qtrue);
|
2007-12-20 23:40:13 -05:00
|
|
|
if ((s = opt->enc_name) != 0) {
|
|
|
|
if ((opt->enc_index = rb_enc_find_index(s)) < 0) {
|
|
|
|
rb_raise(rb_eRuntimeError, "unknown encoding name - %s", s);
|
|
|
|
}
|
|
|
|
}
|
2007-09-28 17:47:31 -04:00
|
|
|
if (opt->e_script) {
|
2007-10-16 16:07:20 -04:00
|
|
|
if (opt->enc_index >= 0)
|
|
|
|
rb_enc_associate_index(opt->e_script, opt->enc_index);
|
2000-06-28 04:31:35 -04:00
|
|
|
require_libraries();
|
2007-09-28 17:47:31 -04:00
|
|
|
tree = rb_parser_compile_string(parser, opt->script, opt->e_script, 1);
|
1999-10-15 04:52:18 -04:00
|
|
|
}
|
|
|
|
else {
|
2007-09-28 17: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 04:12:18 -04:00
|
|
|
forbid_setid("program input from stdin");
|
|
|
|
}
|
2007-09-28 17:47:31 -04:00
|
|
|
tree = load_file(parser, opt->script, 1, opt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2007-10-02 21:06:57 -04:00
|
|
|
if (!tree) return Qfalse;
|
2007-09-28 17:47:31 -04:00
|
|
|
|
|
|
|
process_sflag(opt);
|
|
|
|
opt->xflag = 0;
|
2001-05-30 05:12:34 -04:00
|
|
|
|
|
|
|
if (rb_safe_level() >= 4) {
|
2003-06-23 02:52:39 -04:00
|
|
|
FL_UNSET(rb_argv, FL_TAINT);
|
|
|
|
FL_UNSET(rb_load_path, FL_TAINT);
|
2001-05-30 05: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 04:12:18 -04:00
|
|
|
|
2007-12-04 00:34:37 -05:00
|
|
|
if (opt->do_check) {
|
|
|
|
printf("Syntax OK\n");
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
if (tree) {
|
|
|
|
if (opt->do_print) {
|
|
|
|
tree = rb_parser_append_print(parser, tree);
|
|
|
|
}
|
|
|
|
if (opt->do_loop) {
|
|
|
|
tree = rb_parser_while_loop(parser, tree, opt->do_line, opt->do_split);
|
|
|
|
}
|
2007-07-05 05:28:00 -04:00
|
|
|
}
|
|
|
|
|
2007-10-22 21:42:53 -04:00
|
|
|
if (opt->enc_index >= 0) {
|
2007-11-09 03:48:13 -05:00
|
|
|
enc = rb_enc_from_index(opt->enc_index);
|
2007-10-22 21:42:53 -04:00
|
|
|
}
|
|
|
|
else {
|
2007-11-09 03:48:13 -05:00
|
|
|
enc = locale_encoding();
|
2007-10-22 21:42:53 -04:00
|
|
|
}
|
2007-12-01 09:05:53 -05:00
|
|
|
rb_enc_set_default_external(rb_enc_from_encoding(enc));
|
2007-10-16 16:07:20 -04:00
|
|
|
|
2007-10-02 21:06:57 -04:00
|
|
|
return (VALUE)tree;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
static NODE *
|
2007-09-28 17:47:31 -04:00
|
|
|
load_file(VALUE parser, const char *fname, int script, struct cmdline_options *opt)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
extern VALUE rb_stdin;
|
|
|
|
VALUE f;
|
|
|
|
int line_start = 1;
|
2006-12-31 10:02:22 -05:00
|
|
|
NODE *tree = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
if (!fname)
|
|
|
|
rb_load_fail(fname);
|
1998-01-16 07:13:05 -05:00
|
|
|
if (strcmp(fname, "-") == 0) {
|
|
|
|
f = rb_stdin;
|
|
|
|
}
|
|
|
|
else {
|
2007-09-28 16:29:32 -04:00
|
|
|
int fd, mode = O_RDONLY;
|
2000-06-18 23:37:55 -04:00
|
|
|
#if defined DOSISH || defined __CYGWIN__
|
|
|
|
{
|
2007-09-28 16:29:32 -04:00
|
|
|
const char *ext = strrchr(fname, '.');
|
2000-06-18 23:37:55 -04:00
|
|
|
if (ext && strcasecmp(ext, ".exe") == 0)
|
2007-09-28 16:29:32 -04:00
|
|
|
mode |= O_BINARY;
|
2000-06-18 23:37:55 -04:00
|
|
|
}
|
|
|
|
#endif
|
2007-09-28 16:29:32 -04:00
|
|
|
if ((fd = open(fname, mode)) < 0) {
|
|
|
|
rb_load_fail(fname);
|
|
|
|
}
|
|
|
|
|
|
|
|
f = rb_io_fdopen(fd, mode, fname);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if (script) {
|
2001-07-14 11:17:19 -04:00
|
|
|
VALUE c = 1; /* something not nil */
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE line;
|
1999-01-19 23:59:39 -05:00
|
|
|
char *p;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
if (opt->xflag) {
|
1998-01-16 07:13:05 -05:00
|
|
|
forbid_setid("-x");
|
2007-09-28 17:47:31 -04:00
|
|
|
opt->xflag = Qfalse;
|
1999-01-19 23:59:39 -05:00
|
|
|
while (!NIL_P(line = rb_io_gets(f))) {
|
1998-01-16 07:13:05 -05:00
|
|
|
line_start++;
|
2006-08-31 06: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 07:13:05 -05: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 01:47:45 -05:00
|
|
|
rb_raise(rb_eLoadError, "no Ruby script found in input");
|
1998-01-16 07:13:05 -05: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-24 23:29:39 -04:00
|
|
|
c = rb_io_getbyte(f);
|
1998-01-16 07:13:05 -05: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-24 23: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 06:47:44 -04:00
|
|
|
if ((p = strstr(RSTRING_PTR(line), "ruby")) == 0) {
|
1998-01-16 07:19:22 -05:00
|
|
|
/* not ruby script, kick the program */
|
|
|
|
char **argv;
|
|
|
|
char *path;
|
2006-08-31 06:47:44 -04:00
|
|
|
char *pend = RSTRING_PTR(line) + RSTRING_LEN(line);
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2006-08-31 06:47:44 -04:00
|
|
|
p = RSTRING_PTR(line); /* skip `#!' */
|
2006-12-31 10:02:22 -05:00
|
|
|
if (pend[-1] == '\n')
|
|
|
|
pend--; /* chomp line */
|
|
|
|
if (pend[-1] == '\r')
|
|
|
|
pend--;
|
1998-01-16 07:19:22 -05:00
|
|
|
*pend = '\0';
|
1999-01-19 23:59:39 -05:00
|
|
|
while (p < pend && ISSPACE(*p))
|
1998-01-16 07:19:22 -05:00
|
|
|
p++;
|
|
|
|
path = p; /* interpreter path */
|
1999-01-19 23:59:39 -05:00
|
|
|
while (p < pend && !ISSPACE(*p))
|
1998-01-16 07:19:22 -05:00
|
|
|
p++;
|
|
|
|
*p++ = '\0';
|
|
|
|
if (p < pend) {
|
2007-09-28 17:47:31 -04:00
|
|
|
argv = ALLOCA_N(char *, origarg.argc + 3);
|
1998-01-16 07:19:22 -05:00
|
|
|
argv[1] = p;
|
2007-09-28 17:47:31 -04:00
|
|
|
MEMCPY(argv + 2, origarg.argv + 1, char *, origarg.argc);
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
else {
|
2007-09-28 17:47:31 -04:00
|
|
|
argv = origarg.argv;
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
argv[0] = path;
|
|
|
|
execv(path, argv);
|
2000-03-07 03:37:59 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_fatal("Can't exec %s", path);
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
start_read:
|
1999-01-19 23:59:39 -05:00
|
|
|
p += 4;
|
2006-12-31 10:02:22 -05: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-04-30 20:13:48 -04:00
|
|
|
if ((p = strstr(p, " -")) != 0) {
|
1999-10-21 03:58:14 -04:00
|
|
|
p++; /* skip space before `-' */
|
1999-01-19 23:59:39 -05:00
|
|
|
while (*p == '-') {
|
2007-09-28 17:47:31 -04:00
|
|
|
p = moreswitches(p + 1, opt);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2005-05-13 22:48:07 -04:00
|
|
|
|
|
|
|
/* push back shebang for pragma may exist in next line */
|
* 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-24 23:29:39 -04:00
|
|
|
rb_io_ungetc(f, rb_str_new2("!\n"));
|
2005-05-13 22:48:07 -04:00
|
|
|
}
|
|
|
|
else if (!NIL_P(c)) {
|
|
|
|
rb_io_ungetc(f, c);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2005-05-13 22:48:07 -04:00
|
|
|
rb_io_ungetc(f, INT2FIX('#'));
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2000-06-28 04:31:35 -04:00
|
|
|
else if (!NIL_P(c)) {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_io_ungetc(f, c);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2000-06-28 04:31:35 -04:00
|
|
|
require_libraries(); /* Why here? unnatural */
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2007-10-16 16:07:20 -04:00
|
|
|
if (opt->enc_index >= 0) rb_enc_associate_index(f, opt->enc_index);
|
2007-09-28 16:29:32 -04:00
|
|
|
tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start);
|
|
|
|
if (script && rb_parser_end_seen_p(parser)) {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_global_const("DATA", f);
|
|
|
|
}
|
|
|
|
else if (f != rb_stdin) {
|
|
|
|
rb_io_close(f);
|
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
return tree;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-12-31 10:02:22 -05: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 06:44:21 -04:00
|
|
|
rb_load_file(const char *fname)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2007-09-28 17:47:31 -04:00
|
|
|
struct cmdline_options opt;
|
|
|
|
|
|
|
|
MEMZERO(&opt, opt, 1);
|
|
|
|
return load_file(rb_parser_new(), fname, 0, &opt);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
VALUE rb_progname;
|
|
|
|
VALUE rb_argv;
|
|
|
|
VALUE rb_argv0;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
|
|
|
|
#if !defined(_WIN32) && !(defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
|
2006-02-01 08:27:47 -05:00
|
|
|
#define USE_ENVSPACE_FOR_ARG0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef USE_ENVSPACE_FOR_ARG0
|
2005-04-27 19:21:58 -04:00
|
|
|
extern char **environ;
|
2007-09-28 17:47:31 -04:00
|
|
|
#endif
|
2005-04-27 19:21:58 -04:00
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
static int
|
|
|
|
get_arglen(int argc, char **argv)
|
2005-04-27 19:21:58 -04:00
|
|
|
{
|
2007-09-28 17:47:31 -04:00
|
|
|
char *s = argv[0];
|
2005-04-27 19:21:58 -04:00
|
|
|
int i;
|
|
|
|
|
|
|
|
s += strlen(s);
|
2007-09-28 17: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-27 19:21:58 -04:00
|
|
|
s++;
|
|
|
|
s += strlen(s); /* this one is ok too */
|
|
|
|
}
|
2007-09-28 17: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-27 19:21:58 -04:00
|
|
|
}
|
2007-09-28 17:47:31 -04:00
|
|
|
#endif
|
|
|
|
return s - argv[0];
|
2005-04-27 19:21:58 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
set_arg0(VALUE val, ID id)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2007-11-08 20:10:06 -05:00
|
|
|
char *s, *t;
|
2002-08-21 11:47:54 -04:00
|
|
|
long i;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
if (origarg.argv == 0)
|
2006-12-31 10:02:22 -05:00
|
|
|
rb_raise(rb_eRuntimeError, "$0 not initialized");
|
2001-05-02 00:22:21 -04:00
|
|
|
StringValue(val);
|
2006-08-31 06:47:44 -04:00
|
|
|
s = RSTRING_PTR(val);
|
|
|
|
i = RSTRING_LEN(val);
|
2005-04-27 19:21:58 -04:00
|
|
|
#if defined(PSTAT_SETCMD)
|
2007-05-22 03:38:50 -04:00
|
|
|
if (i > PST_CLEN) {
|
|
|
|
union pstun un;
|
|
|
|
char buf[PST_CLEN + 1]; /* PST_CLEN is 64 (HP-UX 11.23) */
|
|
|
|
strncpy(buf, s, PST_CLEN);
|
|
|
|
buf[PST_CLEN] = '\0';
|
|
|
|
un.pst_command = buf;
|
|
|
|
pstat(PSTAT_SETCMD, un, PST_CLEN, 0, 0);
|
2001-05-02 00:22:21 -04:00
|
|
|
}
|
|
|
|
else {
|
2007-05-22 03:38:50 -04:00
|
|
|
union pstun un;
|
|
|
|
un.pst_command = s;
|
|
|
|
pstat(PSTAT_SETCMD, un, i, 0, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2001-09-03 01:37:42 -04:00
|
|
|
#elif defined(HAVE_SETPROCTITLE)
|
2002-10-29 16:35:28 -05:00
|
|
|
setproctitle("%.*s", (int)i, s);
|
2001-09-03 01:37:42 -04:00
|
|
|
#else
|
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
if (i >= origarg.len) {
|
|
|
|
i = origarg.len;
|
2001-09-03 01:37:42 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
memcpy(origarg.argv[0], s, i);
|
2007-11-08 20:10:06 -05:00
|
|
|
t = origarg.argv[0] + i;
|
|
|
|
*t = '\0';
|
|
|
|
|
|
|
|
if (i + 1 < origarg.len) memset(t + 1, ' ', origarg.len - i - 1);
|
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
{
|
|
|
|
int j;
|
2007-11-08 20:10:06 -05:00
|
|
|
for (j = 1; j < origarg.argc; j++) {
|
|
|
|
origarg.argv[j] = t;
|
|
|
|
}
|
2007-09-28 17:47:31 -04:00
|
|
|
}
|
2002-08-12 09:39:22 -04:00
|
|
|
#endif
|
2007-09-28 17:47:31 -04:00
|
|
|
rb_progname = rb_tainted_str_new(s, i);
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
ruby_script(const char *name)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
if (name) {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_progname = rb_tainted_str_new2(name);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int uid, euid, gid, egid;
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
init_ids(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
uid = (int)getuid();
|
|
|
|
euid = (int)geteuid();
|
|
|
|
gid = (int)getgid();
|
|
|
|
egid = (int)getegid();
|
|
|
|
#ifdef VMS
|
|
|
|
uid |= gid << 16;
|
|
|
|
euid |= egid << 16;
|
|
|
|
#endif
|
|
|
|
if (uid && (euid != uid || egid != gid)) {
|
|
|
|
rb_set_safe_level(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
forbid_setid(const char *s)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
if (euid != uid)
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eSecurityError, "no %s allowed while running setuid", s);
|
1998-01-16 07:13:05 -05:00
|
|
|
if (egid != gid)
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eSecurityError, "no %s allowed while running setgid", s);
|
1999-01-19 23:59:39 -05:00
|
|
|
if (rb_safe_level() > 0)
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eSecurityError, "no %s allowed in tainted mode", s);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-07-29 14:26:55 -04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
verbose_setter(VALUE val, ID id, VALUE *variable)
|
2003-07-29 14:26:55 -04:00
|
|
|
{
|
|
|
|
ruby_verbose = RTEST(val) ? Qtrue : val;
|
|
|
|
}
|
|
|
|
|
2004-03-02 23:55:35 -05: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 06:44:21 -04:00
|
|
|
opt_W_getter(VALUE val, ID id)
|
2004-03-02 23:55:35 -05:00
|
|
|
{
|
2006-12-31 10:02:22 -05:00
|
|
|
if (ruby_verbose == Qnil)
|
|
|
|
return INT2FIX(0);
|
|
|
|
if (ruby_verbose == Qfalse)
|
|
|
|
return INT2FIX(1);
|
|
|
|
if (ruby_verbose == Qtrue)
|
|
|
|
return INT2FIX(2);
|
2004-03-09 20:17:12 -05:00
|
|
|
return Qnil; /* not reached */
|
2004-03-02 23:55:35 -05:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
ruby_prog_init(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
init_ids();
|
|
|
|
|
2003-07-29 14:26:55 -04:00
|
|
|
rb_define_hooked_variable("$VERBOSE", &ruby_verbose, 0, verbose_setter);
|
|
|
|
rb_define_hooked_variable("$-v", &ruby_verbose, 0, verbose_setter);
|
|
|
|
rb_define_hooked_variable("$-w", &ruby_verbose, 0, verbose_setter);
|
2004-03-02 23:55:35 -05:00
|
|
|
rb_define_virtual_variable("$-W", opt_W_getter, 0);
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_define_variable("$DEBUG", &ruby_debug);
|
|
|
|
rb_define_variable("$-d", &ruby_debug);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
rb_define_hooked_variable("$0", &rb_progname, 0, set_arg0);
|
2004-04-01 21:36:48 -05:00
|
|
|
rb_define_hooked_variable("$PROGRAM_NAME", &rb_progname, 0, set_arg0);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
rb_define_readonly_variable("$*", &rb_argv);
|
2005-12-11 19:36:54 -05:00
|
|
|
rb_argv = rb_ary_new();
|
1998-01-16 07:19:22 -05:00
|
|
|
rb_define_global_const("ARGV", rb_argv);
|
|
|
|
rb_global_variable(&rb_argv0);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
#ifdef MSDOS
|
|
|
|
/*
|
|
|
|
* There is no way we can refer to them from ruby, so close them to save
|
|
|
|
* space.
|
|
|
|
*/
|
|
|
|
(void)fclose(stdaux);
|
|
|
|
(void)fclose(stdprn);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
ruby_set_argv(int argc, char **argv)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
#if defined(USE_DLN_A_OUT)
|
2007-09-28 17:47:31 -04:00
|
|
|
if (origarg.argv)
|
|
|
|
dln_argv0 = origarg.argv[0];
|
2006-12-31 10:02:22 -05:00
|
|
|
else
|
|
|
|
dln_argv0 = argv[0];
|
1998-01-16 07:13:05 -05:00
|
|
|
#endif
|
2001-03-13 00:45:13 -05:00
|
|
|
rb_ary_clear(rb_argv);
|
2006-12-31 10:02:22 -05:00
|
|
|
for (i = 0; i < argc; i++) {
|
2003-03-25 03:26:08 -05:00
|
|
|
VALUE arg = rb_tainted_str_new2(argv[i]);
|
|
|
|
|
|
|
|
OBJ_FREEZE(arg);
|
|
|
|
rb_ary_push(rb_argv, arg);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-09-28 17:47:31 -04: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)
|
|
|
|
|
* 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 04: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 06:44:21 -04:00
|
|
|
ruby_process_options(int argc, char **argv)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2007-09-28 17:47:31 -04:00
|
|
|
struct cmdline_options opt;
|
* 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 04:12:18 -04:00
|
|
|
NODE *tree;
|
|
|
|
|
2007-09-28 17:47:31 -04:00
|
|
|
MEMZERO(&opt, opt, 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
ruby_script(argv[0]); /* for the time being */
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_argv0 = rb_progname;
|
2007-10-02 21:06:57 -04:00
|
|
|
opt.argc = argc;
|
|
|
|
opt.argv = argv;
|
2007-10-16 16:07:20 -04:00
|
|
|
opt.enc_index = -1;
|
2007-10-02 21:06:57 -04:00
|
|
|
tree = (NODE *)rb_vm_call_cfunc(rb_vm_top_self(),
|
|
|
|
process_options, (VALUE)&opt,
|
|
|
|
0, rb_progname);
|
2007-09-28 17:47:31 -04: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);
|
1998-01-16 07:13:05 -05: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 04:12:18 -04:00
|
|
|
return tree;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2007-09-29 04:45:24 -04:00
|
|
|
|
|
|
|
void
|
|
|
|
ruby_sysinit(int *argc, char ***argv)
|
|
|
|
{
|
|
|
|
#if defined(__APPLE__) && (defined(__MACH__) || defined(__DARWIN__))
|
|
|
|
int i, n = *argc, len = 0;
|
|
|
|
char **v1 = *argv, **v2, *p;
|
|
|
|
|
|
|
|
for (i = 0; i < n; ++i) {
|
|
|
|
len += strlen(v1[i]) + 1;
|
|
|
|
}
|
|
|
|
v2 = malloc((n + 1)* sizeof(char*) + len);
|
|
|
|
p = (char *)&v2[n + 1];
|
|
|
|
for (i = 0; i < n; ++i) {
|
|
|
|
int l = strlen(v1[i]);
|
|
|
|
memcpy(p, v1[i], l + 1);
|
|
|
|
v2[i] = p;
|
|
|
|
p += l + 1;
|
|
|
|
}
|
|
|
|
v2[n] = 0;
|
|
|
|
*argv = v2;
|
|
|
|
#elif defined(__MACOS__) && defined(__MWERKS__)
|
|
|
|
*argc = ccommand(argv);
|
|
|
|
#elif defined(_WIN32)
|
|
|
|
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-02 21:06:57 -04:00
|
|
|
#if defined(USE_DLN_A_OUT)
|
|
|
|
dln_argv0 = origarg.argv[0];
|
|
|
|
#endif
|
2007-09-29 04:45:24 -04:00
|
|
|
}
|