1 files changed, 6 insertions, 3 deletions
diff --git a/ruby.c b/ruby.c
index 5a51bbb52a..29ae065039 100644
--- a/ruby.c
+++ b/ruby.c
@@ -967,6 +967,7 @@ process_options(VALUE arg)
     NODE *tree = 0;
     VALUE parser;
     VALUE iseq;
+    VALUE args;
     rb_encoding *enc, *lenc;
     const char *s;
     char fbuf[MAXPATHLEN];
@@ -1067,7 +1068,7 @@ process_options(VALUE arg)
 #if defined DOSISH || defined __CYGWIN__
     translate_char(RSTRING_PTR(rb_progname), '\\', '/');
 #endif
-    opt->script_name = rb_str_new4(rb_progname);
+    opt->script_name = rb_progname;
     opt->script = RSTRING_PTR(opt->script_name);
     safe = rb_safe_level();
     rb_set_safe_level_force(0);
@@ -1077,8 +1078,10 @@ process_options(VALUE arg)
     ruby_init_loadpath();
     ruby_init_gems(!(opt->disable & DISABLE_BIT(gems)));
     lenc = rb_locale_encoding();
-    for (i = 0; i < RARRAY_LEN(rb_argv); i++) {
-	rb_enc_associate(RARRAY_PTR(rb_argv)[i], lenc);
+    rb_enc_associate(rb_progname, lenc);
+    opt->script_name = rb_str_new4(rb_progname);
+    for (i = 0, args = rb_argv; i < RARRAY_LEN(args); i++) {
+	rb_enc_associate(RARRAY_PTR(args)[i], lenc);
     }
     parser = rb_parser_new();
     if (opt->yydebug) rb_parser_set_yydebug(parser, Qtrue);