merge revision(s) 17849:

	* ruby.c: Mac OS X needs origargc times of '\0' in
	  origargv. [ruby-dev:35308]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 46 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index ed2d05058..ef25a61a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 10 18:35:07 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ruby.c: Mac OS X needs origargc times of '\0' in
+	  origargv. [ruby-dev:35308]
+
 Thu Jul 10 13:51:03 2008  Tanaka Akira  <akr@fsij.org>
 
 	* include/ruby/ruby.h (POSFIXABLE): use FIXNUM_MAX+1 instead of
diff --git a/ruby.c b/ruby.c
index dafca05c7..6fbb6d2dc 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1029,6 +1029,39 @@ set_arg0space()
 #define set_arg0space() ((void)0)
 #endif
 
+static int
+get_arglen(int argc, char **argv)
+{
+    char *s = argv[0];
+    int i;
+
+    if (!argc) return 0;
+    s += strlen(s);
+    /* See if all the arguments are contiguous in memory */
+    for (i = 1; i < argc; i++) {
+	if (argv[i] == s + 1) {
+	    s++;
+	    s += strlen(s);	/* this one is ok too */
+	}
+	else {
+	    break;
+	}
+    }
+#if defined(USE_ENVSPACE_FOR_ARG0)
+    if (environ && (s == environ[0])) {
+	s += strlen(s);
+	for (i = 1; environ[i]; i++) {
+	    if (environ[i] == s + 1) {
+		s++;
+		s += strlen(s);	/* this one is ok too */
+	    }
+	}
+	ruby_setenv("", NULL); /* duplicate environ vars */
+    }
+#endif
+    return s - argv[0];
+}
+
 static void
 set_arg0(val, id)
     VALUE val;
@@ -1037,8 +1070,9 @@ set_arg0(val, id)
     VALUE progname;
     char *s;
     long i;
+    int j;
 #if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
-    static int len;
+    static int len = 0;
 #endif
 
     if (origargv == 0) rb_raise(rb_eRuntimeError, "$0 not initialized");
@@ -1065,27 +1099,7 @@ set_arg0(val, id)
     progname = rb_tainted_str_new(s, i);
 #else
     if (len == 0) {
-	char *s = origargv[0];
-	int i;
-
-	s += strlen(s);
-	/* See if all the arguments are contiguous in memory */
-	for (i = 1; i < origargc; i++) {
-	    if (origargv[i] == s + 1) {
-		s++;
-		s += strlen(s);	/* this one is ok too */
-	    }
-	    else {
-		break;
-	    }
-	}
-#if defined(USE_ENVSPACE_FOR_ARG0)
-	if (s + 1 == envspace.begin) {
-	    s = envspace.end;
-	    ruby_setenv("", NULL); /* duplicate environ vars */
-	}
-#endif
-	len = s - origargv[0];
+	len = get_arglen(origargc, origargv);
     }
 
     if (i >= len) {
@@ -1095,8 +1109,10 @@ set_arg0(val, id)
     s = origargv[0] + i;
     *s = '\0';
     if (++i < len) memset(s + 1, ' ', len - i);
-    for (i = 1; i < origargc; i++)
-	origargv[i] = s;
+    for (i = len-1, j = origargc-1; j > 0 && i >= 0; --i, --j) {
+	origargv[j] = origargv[0] + i;
+	*origargv[j] = '\0';
+    }
     progname = rb_tainted_str_new2(origargv[0]);
 #endif
     rb_progname = rb_obj_freeze(progname);
diff --git a/version.h b/version.h
index d5897e63b..869d3a504 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-07-10"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080710
-#define RUBY_PATCHLEVEL 270
+#define RUBY_PATCHLEVEL 271
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8