shyouhei	2009-02-19 18:02:43 +0900 (Thu, 19 Feb 2009)

  New Revision: 22450

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

  Log:
    merge revision(s) 20581:
    * pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'.
      just ignores '*' in these cases.
      [ruby-dev:37289]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/pack.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22449)
+++ ruby_1_8_7/ChangeLog	(revision 22450)
@@ -1,3 +1,9 @@
+Thu Feb 19 18:02:10 2009  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'.
+	  just ignores '*' in these cases.
+	  [ruby-dev:37289]
+
 Thu Feb 19 17:26:11 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* pack.c (pack_pack): fixed length for odd length string.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22449)
+++ ruby_1_8_7/version.h	(revision 22450)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-19"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090219
-#define RUBY_PATCHLEVEL 129
+#define RUBY_PATCHLEVEL 130
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/pack.c
===================================================================
--- ruby_1_8_7/pack.c	(revision 22449)
+++ ruby_1_8_7/pack.c	(revision 22450)
@@ -494,7 +494,9 @@
 	    }
 	}
 	if (*p == '*') {	/* set data length */
-	    len = strchr("@Xxu", type) ? 0 : items;
+	    len = strchr("@Xxu", type) ? 0
+                : strchr("PMm", type) ? 1
+                : items;
 	    p++;
 	}
 	else if (ISDIGIT(*p)) {

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