diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:42:09 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:42:09 +0000 |
| commit | 259ed6176f32bed0e02fd3a546977efc432da755 (patch) | |
| tree | 2127b867e42f8c7d07277e51cfcc2ee699b5e27a | |
| parent | a929fd040a7dff2ab7739ad5e1389db4c2c2ec12 (diff) | |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/win32.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Dec 27 20:26:59 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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 <nobu@ruby-lang.org> * process.c (after_exec): needs to reset before restart timer diff --git a/win32/win32.c b/win32/win32.c index d346a925d6..316b69b873 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; } |