ruby-changes:15875
From: nobu <ko1@a...>
Date: Sun, 16 May 2010 13:55:49 +0900 (JST)
Subject: [ruby-changes:15875] Ruby:r27813 (trunk): * error.c (rb_loaderror): use locale string, not ascii-8bit.
nobu 2010-05-16 13:55:29 +0900 (Sun, 16 May 2010) New Revision: 27813 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27813 Log: * error.c (rb_loaderror): use locale string, not ascii-8bit. Modified files: trunk/ChangeLog trunk/common.mk trunk/error.c Index: ChangeLog =================================================================== --- ChangeLog (revision 27812) +++ ChangeLog (revision 27813) @@ -1,3 +1,7 @@ +Sun May 16 13:55:25 2010 Nobuyoshi Nakada <nobu@r...> + + * error.c (rb_loaderror): use locale string, not ascii-8bit. + Sun May 16 11:39:15 2010 Nobuyoshi Nakada <nobu@r...> * include/ruby/missing.h (signbit): add missing prototype. Index: common.mk =================================================================== --- common.mk (revision 27812) +++ common.mk (revision 27813) @@ -540,7 +540,8 @@ {$(VPATH)}util.h enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}known_errors.inc \ - $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h + $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) $(ENCODING_H_INCLUDES) \ + {$(VPATH)}debug.h eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_intern.h {$(VPATH)}vm.h \ $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_error.c \ {$(VPATH)}eval_jump.c {$(VPATH)}debug.h {$(VPATH)}gc.h {$(VPATH)}iseq.h Index: error.c =================================================================== --- error.c (revision 27812) +++ error.c (revision 27813) @@ -11,6 +11,7 @@ #include "ruby/ruby.h" #include "ruby/st.h" +#include "ruby/encoding.h" #include "vm_core.h" #include <stdio.h> @@ -1469,7 +1470,7 @@ VALUE mesg; va_start(args, fmt); - mesg = rb_vsprintf(fmt, args); + mesg = rb_enc_vsprintf(rb_locale_encoding(), fmt, args); va_end(args); rb_exc_raise(rb_exc_new3(rb_eLoadError, mesg)); } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/