summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-09 03:34:47 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-09 03:34:47 +0000
commit1936d0ab51ce5fe23a01892cfa0c03aee6127583 (patch)
tree86c83c72e201fa4aa545bcdb3c322d7421cacc52
parent97aa5cbb5fcc2befb096e4c3f4638c722e621a4f (diff)
downloadruby-1936d0ab51ce5fe23a01892cfa0c03aee6127583.tar.gz
ruby-1936d0ab51ce5fe23a01892cfa0c03aee6127583.tar.xz
ruby-1936d0ab51ce5fe23a01892cfa0c03aee6127583.zip
* io.c (pipe_open): should set prog if argc != 0.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7518 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dbfd37485..cd3b0d523 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 9 12:31:53 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * io.c (pipe_open): should set prog if argc != 0.
+
Thu Dec 9 10:54:36 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/dbm/dbm.c (fdbm_select): [ruby-dev:25132]
diff --git a/io.c b/io.c
index 8a6e1f40e..8256b5778 100644
--- a/io.c
+++ b/io.c
@@ -2915,7 +2915,8 @@ pipe_open(argc, argv, mode)
}
}
#else
- prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
+ if (argc)
+ prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
fp = popen(StringValueCStr(prog), mode);
if (!fp) rb_sys_fail(RSTRING(prog)->ptr);
fd = fileno(fp);