merges r20869 from trunk into ruby_1_9_1.

* ruby.c (process_options): get rid of warning on DOSISH.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index cb46629c3b..f5a93f7dde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Dec 19 15:51:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): get rid of warning on DOSISH.
+
 Thu Dec 18 19:31:54 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* lib/irb/init.rb (IRB.opt_parse): (M17N) adds -U and -E as command
diff --git a/ruby.c b/ruby.c
index 0d4a9903b5..33cf0cc109 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1259,7 +1259,7 @@ process_options(VALUE arg)
     opt->script_name = rb_str_new_cstr(opt->script);
     opt->script = RSTRING_PTR(opt->script_name);
 #if defined DOSISH || defined __CYGWIN__
-    translate_char(opt->script, '\\', '/');
+    translate_char(RSTRING_PTR(opt->script_name), '\\', '/');
 #endif
     rb_obj_freeze(opt->script_name);