ruby-changes:12139
From: nobu <ko1@a...>
Date: Mon, 22 Jun 2009 14:36:09 +0900 (JST)
Subject: [ruby-changes:12139] Ruby:r23812 (trunk): * ruby.c (process_options): set progname earlier.
nobu 2009-06-22 14:35:51 +0900 (Mon, 22 Jun 2009) New Revision: 23812 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23812 Log: * ruby.c (process_options): set progname earlier. Modified files: trunk/ChangeLog trunk/ruby.c Index: ChangeLog =================================================================== --- ChangeLog (revision 23811) +++ ChangeLog (revision 23812) @@ -1,3 +1,7 @@ +Mon Jun 22 14:35:45 2009 Nobuyoshi Nakada <nobu@r...> + + * ruby.c (process_options): set progname earlier. + Mon Jun 22 13:50:23 2009 Nobuyoshi Nakada <nobu@r...> * io.c (rb_io_fdatasync): new method IO#fdatasync. Index: ruby.c =================================================================== --- ruby.c (revision 23811) +++ ruby.c (revision 23812) @@ -1224,7 +1224,7 @@ rb_encoding *enc, *lenc; const char *s; char fbuf[MAXPATHLEN]; - long i = proc_options(argc, argv, opt, 0); + int i = (int)proc_options(argc, argv, opt, 0); rb_thread_t *th = GET_THREAD(); rb_env_t *env = 0; @@ -1340,6 +1340,8 @@ } } ruby_init_gems(!(opt->disable & DISABLE_BIT(gems))); + rb_progname = opt->script_name; + rb_vm_set_progname(rb_progname); ruby_set_argv(argc, argv); process_sflag(&opt->sflag); @@ -1447,7 +1449,6 @@ rb_define_readonly_boolean("$-a", opt->do_split); rb_set_safe_level(opt->safe_level); - rb_progname = opt->script_name; return iseq; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/