* ruby.c (set_arg0): support RSTRING_LEN on HP-UX. a patch from

  WATANABE Tetsuya <Tetsuya.WATANABE AT nifty.com>.  [ruby-dev:30806]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 18 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 5a3afa1652..077ed7c6f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 22 16:37:36 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (set_arg0): support RSTRING_LEN on HP-UX.  a patch from
+	  WATANABE Tetsuya <Tetsuya.WATANABE AT nifty.com>.  [ruby-dev:30806]
+
 Mon May 21 13:40:00 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* compile.c, vm_macro.def: support tail call optimization
diff --git a/ruby.c b/ruby.c
index 6dec7a2c8c..61ba65baa9 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1092,18 +1092,18 @@ set_arg0(VALUE val, ID id)
     s = RSTRING_PTR(val);
     i = RSTRING_LEN(val);
 #if defined(PSTAT_SETCMD)
-    if (i >= PST_CLEN) {
-	union pstun j;
-	j.pst_command = s;
-	i = PST_CLEN;
-	RSTRING_LEN(val) = i;
-	*(s + i) = '\0';
-	pstat(PSTAT_SETCMD, j, PST_CLEN, 0, 0);
+    if (i > PST_CLEN) {
+	union pstun un;
+	char buf[PST_CLEN + 1];	/* PST_CLEN is 64 (HP-UX 11.23) */
+	strncpy(buf, s, PST_CLEN);
+	buf[PST_CLEN] = '\0';
+	un.pst_command = buf;
+	pstat(PSTAT_SETCMD, un, PST_CLEN, 0, 0);
     }
     else {
-	union pstun j;
-	j.pst_command = s;
-	pstat(PSTAT_SETCMD, j, i, 0, 0);
+	union pstun un;
+	un.pst_command = s;
+	pstat(PSTAT_SETCMD, un, i, 0, 0);
     }
     rb_progname = rb_tainted_str_new(s, i);
 #elif defined(HAVE_SETPROCTITLE)
diff --git a/version.h b/version.h
index ca5979f19f..ec99af4872 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-05-21"
+#define RUBY_RELEASE_DATE "2007-05-22"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070521
+#define RUBY_RELEASE_CODE 20070522
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 22
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];