From 39117b176a0a663da952fbb064aba74dae1cd967 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 16 Aug 2006 02:11:21 +0000 Subject: * ruby.c (set_arg0): fill argv other than the first with an empty string instead of NULL. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ruby.c | 17 ++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a3e5b0c1..b12d5e3d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 16 11:09:26 2006 Nobuyoshi Nakada + + * ruby.c (set_arg0): fill argv other than the first with an empty + string instead of NULL. + Wed Aug 16 11:08:00 2006 Nobuyoshi Nakada * win32/win32.h: removed an excess macro. fixed: [ruby-dev:29258] diff --git a/ruby.c b/ruby.c index 797905155..39b209d9e 100644 --- a/ruby.c +++ b/ruby.c @@ -1065,18 +1065,13 @@ set_arg0(val, id) if (i >= len) { i = len; - memcpy(origargv[0], s, i); - origargv[0][i] = '\0'; - } - else { - memcpy(origargv[0], s, i); - s = origargv[0]+i; - *s++ = '\0'; - while (++i < len) - *s++ = ' '; - for (i = 1; i < origargc; i++) - origargv[i] = 0; } + memcpy(origargv[0], s, i); + s = origargv[0] + i; + *s = '\0'; + if (++i < len) memset(s + 1, ' ', len - i); + for (i = 1; i < origargc; i++) + origargv[i] = s; rb_progname = rb_tainted_str_new2(origargv[0]); #endif } -- cgit