shyouhei	2008-06-29 19:20:35 +0900 (Sun, 29 Jun 2008)

  New Revision: 17705

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ruby.c
    branches/ruby_1_8_7/version.h

  Log:
    merge revision(s) 17586,17612:
    * ruby.c (set_arg0, ruby_prog_init): freeze $0.  a patch from Keita
      Yamaguchi <keita.yamaguchi at gmail.com>.
    * test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
      $0.  [ruby-dev:35261]
    * lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ruby.c?r1=17705&r2=17704&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=17705&r2=17704&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=17705&r2=17704&diff_format=u

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 17704)
+++ ruby_1_8_7/ChangeLog	(revision 17705)
@@ -1,3 +1,15 @@
+Sun Jun 29 19:19:08 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
+	  $0.  [ruby-dev:35261]
+
+	* lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.
+
+Sun Jun 29 19:19:08 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ruby.c (set_arg0, ruby_prog_init): freeze $0.  a patch from Keita
+	  Yamaguchi <keita.yamaguchi at gmail.com>.
+
 Sun Jun 29 18:33:33 2008  Tanaka Akira  <akr@f...>
 
 	* process.c: include sys/resource.h if HAVE_SYS_RESOURCE_H is defined.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 17704)
+++ ruby_1_8_7/version.h	(revision 17705)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-29"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 34
+#define RUBY_PATCHLEVEL 35
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/ruby.c
===================================================================
--- ruby_1_8_7/ruby.c	(revision 17704)
+++ ruby_1_8_7/ruby.c	(revision 17705)
@@ -1044,6 +1044,7 @@
     VALUE val;
     ID id;
 {
+    VALUE progname;
     char *s;
     long i;
 #if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
@@ -1068,10 +1069,10 @@
 	j.pst_command = s;
 	pstat(PSTAT_SETCMD, j, i, 0, 0);
     }
-    rb_progname = rb_tainted_str_new(s, i);
+    progname = rb_tainted_str_new(s, i);
 #elif defined(HAVE_SETPROCTITLE)
     setproctitle("%.*s", (int)i, s);
-    rb_progname = rb_tainted_str_new(s, i);
+    progname = rb_tainted_str_new(s, i);
 #else
     if (len == 0) {
 	char *s = origargv[0];
@@ -1106,8 +1107,9 @@
     if (++i < len) memset(s + 1, ' ', len - i);
     for (i = 1; i < origargc; i++)
 	origargv[i] = s;
-    rb_progname = rb_tainted_str_new2(origargv[0]);
+    progname = rb_tainted_str_new2(origargv[0]);
 #endif
+    rb_progname = rb_obj_freeze(progname);
 }
 
 void
@@ -1115,7 +1117,7 @@
     const char *name;
 {
     if (name) {
-	rb_progname = rb_tainted_str_new2(name);
+	rb_progname = rb_obj_freeze(rb_tainted_str_new2(name));
 	ruby_sourcefile = rb_source_filename(name);
     }
 }

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