nobu	2008-01-01 01:04:11 +0900 (Tue, 01 Jan 2008)

  New Revision: 14821

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c
    trunk/version.h

  Log:
    * ruby.c (process_options): rejects dummy encoding.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=14821&r2=14820&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ruby.c?r1=14821&r2=14820&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14821&r2=14820&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14820)
+++ ChangeLog	(revision 14821)
@@ -1,3 +1,7 @@
+Tue Jan  1 01:04:06 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ruby.c (process_options): rejects dummy encoding.
+
 Mon Dec 31 23:53:55 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (proc_options, process_options): delays finding encoding
Index: version.h
===================================================================
--- version.h	(revision 14820)
+++ version.h	(revision 14821)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-12-31"
+#define RUBY_RELEASE_DATE "2008-01-01"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071231
+#define RUBY_RELEASE_CODE 20080101
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 0
-#define RUBY_RELEASE_YEAR 2007
-#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_YEAR 2008
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 1
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby.c
===================================================================
--- ruby.c	(revision 14820)
+++ ruby.c	(revision 14821)
@@ -969,6 +969,9 @@
 	if ((opt->enc_index = rb_enc_find_index(s)) < 0) {
 	    rb_raise(rb_eRuntimeError, "unknown encoding name - %s", s);
 	}
+	else if (rb_enc_dummy_p(rb_enc_from_index(opt->enc_index))) {
+	    rb_raise(rb_eRuntimeError, "dummy encoding is not acceptable - %s ", s);
+	}
     }
     if (opt->e_script) {
 	if (opt->enc_index >= 0)

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