yugui	2009-06-25 01:07:52 +0900 (Thu, 25 Jun 2009)

  New Revision: 23843

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23843

  Log:
    merges r23813 and r23821 from trunk into ruby_1_9_1.
    --
    * ruby.c (process_options), enc/prelude.rb: encdb and transdb are
      extension libraries.
    --
    * ruby.c (process_options): don't specify .so for encdb here.
      "." is replaced by "_" in load_encoding.
    * encoding.c (load_encoding): add .so here.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/encoding.c
    branches/ruby_1_9_1/ruby.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/encoding.c
===================================================================
--- ruby_1_9_1/encoding.c	(revision 23842)
+++ ruby_1_9_1/encoding.c	(revision 23843)
@@ -456,11 +456,11 @@
 static int
 load_encoding(const char *name)
 {
-    VALUE enclib = rb_sprintf("enc/%s", name);
+    VALUE enclib = rb_sprintf("enc/%s.so", name);
     VALUE verbose = ruby_verbose;
     VALUE debug = ruby_debug;
     VALUE loaded;
-    char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib);
+    char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib) - 3;
     int idx;
 
     while (s < e) {
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23842)
+++ ruby_1_9_1/ChangeLog	(revision 23843)
@@ -1,3 +1,10 @@
+Tue Jun 23 01:17:38 2009  Tanaka Akira  <akr@f...>
+
+	* ruby.c (process_options): don't specify .so for encdb here.
+	  "." is replaced by "_" in load_encoding.
+
+	* encoding.c (load_encoding): add .so here. 
+
 Mon Jun 22 14:41:47 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (process_options), enc/prelude.rb: encdb and transdb are
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23842)
+++ ruby_1_9_1/version.h	(revision 23843)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-06-25"
-#define RUBY_PATCHLEVEL 200
+#define RUBY_PATCHLEVEL 201
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_1/ruby.c
===================================================================
--- ruby_1_9_1/ruby.c	(revision 23842)
+++ ruby_1_9_1/ruby.c	(revision 23843)
@@ -1274,7 +1274,7 @@
     rb_obj_freeze(opt->script_name);
 
     ruby_init_loadpath_safe(opt->safe_level);
-    rb_enc_find_index("encdb.so");
+    rb_enc_find_index("encdb");
     lenc = rb_locale_encoding();
     rb_enc_associate(rb_progname, lenc);
     parser = rb_parser_new();

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