nobu	2008-07-07 02:04:07 +0900 (Mon, 07 Jul 2008)

  New Revision: 17918

  Modified files:
    branches/mvm/.merged-trunk-revision
    branches/mvm/ChangeLog
    branches/mvm/file.c
    branches/mvm/thread_pthread.c

  Log:
    * merged from trunk r17907:17917.

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

Index: mvm/ChangeLog
===================================================================
--- mvm/ChangeLog	(revision 17917)
+++ mvm/ChangeLog	(revision 17918)
@@ -1,3 +1,13 @@
+Mon Jul  7 01:24:43 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (rb_file_s_extname): fix for file name with spaces.
+	  [ruby-talk:307404]
+
+Mon Jul  7 00:59:37 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* thread_pthread.c (ruby_init_stack): prior STACK_END_ADDRESS if
+	  found.  [ruby-core:17624]
+
 Mon Jul  7 00:35:10 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* bignum.c (big2str_power_cache): moved to VM specific data.
Index: mvm/thread_pthread.c
===================================================================
--- mvm/thread_pthread.c	(revision 17917)
+++ mvm/thread_pthread.c	(revision 17918)
@@ -257,6 +257,10 @@
 } native_main_thread;
 #endif
 
+#ifdef STACK_END_ADDRESS
+extern void *STACK_END_ADDRESS;
+#endif
+
 #undef ruby_init_stack
 void
 ruby_init_stack(VALUE *addr
@@ -267,12 +271,16 @@
 {
 #ifndef STACKADDR_AVAILABLE
     native_main_thread.id = pthread_self();
+#ifdef STACK_END_ADDRESS
+    native_main_thread.stack_start = STACK_END_ADDRESS;
+#else
     if (!native_main_thread.stack_start ||
         STACK_UPPER(&addr,
                     native_main_thread.stack_start > addr,
                     native_main_thread.stack_start < addr)) {
         native_main_thread.stack_start = addr;
     }
+#endif
 #ifdef __ia64
     if (!native_main_thread.register_stack_start ||
         (VALUE*)bsp < native_main_thread.register_stack_start) {
Index: mvm/.merged-trunk-revision
===================================================================
--- mvm/.merged-trunk-revision	(revision 17917)
+++ mvm/.merged-trunk-revision	(revision 17918)
@@ -1 +1 @@
-17907
+17917
Index: mvm/file.c
===================================================================
--- mvm/file.c	(revision 17917)
+++ mvm/file.c	(revision 17918)
@@ -3120,7 +3120,7 @@
 		p = last;
 		break;
 	    }
-	    e = dot;
+	    if (*last == '.') e = dot;
 	    continue;
 #else
 	    e = p;	  /* get the last dot of the last component */

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