From b7fe63791fc23b526dd11b48bc5d86fddacb564f Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 28 Dec 2008 09:42:09 +0000 Subject: merges r21099 from trunk into ruby_1_9_1. * win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size is 2, not 0, because it will be converted to "". git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/win32.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7bd1aadc3..3e6e89248 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 27 20:26:59 2008 NAKAMURA Usaku + + * win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size + is 2, not 0, because it will be converted to "". + Sat Dec 27 19:40:56 2008 Nobuyoshi Nakada * process.c (after_exec): needs to reset before restart timer diff --git a/win32/win32.c b/win32/win32.c index d346a925d..316b69b87 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -715,7 +715,7 @@ rb_w32_argv_size(char *const *argv) } } len += p - *t + n + 1; - if (quote) len += 2; + if (p - *t == 0 || quote) len += 2; } return len; } -- cgit