matz	2008-04-24 17:20:56 +0900 (Thu, 24 Apr 2008)

  New Revision: 16180

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c
    trunk/version.h

  Log:
    * ruby.c (process_options): set safe_level before loading script.
      [ruby-dev:34421]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=16180&r2=16179&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ruby.c?r1=16180&r2=16179&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16180&r2=16179&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16179)
+++ ChangeLog	(revision 16180)
@@ -1,3 +1,8 @@
+Thu Apr 24 17:19:01 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* ruby.c (process_options): set safe_level before loading script.
+	  [ruby-dev:34421]
+
 Thu Apr 24 14:15:11 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* dln.c (dln_find_1): prior files with extensions to files sans
Index: version.h
===================================================================
--- version.h	(revision 16179)
+++ version.h	(revision 16180)
@@ -50,7 +50,7 @@
     RUBY_RELEASE_STR" "		    \
     STRINGIZE(RUBY_RELEASE_NUM)") " \
     "["RUBY_PLATFORM"]"
-# define RUBY_COPYRIGHT		    \
+# define RUBY_COPYRIGHT 	    \
     "ruby - Copyright (C) "	    \
     STRINGIZE(RUBY_BIRTH_YEAR)"-"   \
     STRINGIZE(RUBY_RELEASE_YEAR)" " \
Index: ruby.c
===================================================================
--- ruby.c	(revision 16179)
+++ ruby.c	(revision 16180)
@@ -1073,6 +1073,7 @@
     }
     rb_enc_set_default_external(rb_enc_from_encoding(enc));
 
+    rb_set_safe_level_force(safe);
     if (opt->e_script) {
 	rb_encoding *eenc;
 	if (opt->src.enc.index >= 0) {
@@ -1091,7 +1092,6 @@
 	}
 	tree = load_file(parser, opt->script, 1, opt);
     }
-    rb_set_safe_level_force(safe);
 
     if (!tree) return Qfalse;
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/