From aa23bfaf08fb8eafa9c48fc0c3d79afc21ad3bf9 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 1 Nov 2004 02:55:29 +0000 Subject: [PATCH] * io.c (pipe_open): avoid conflict of variable name. [ruby-dev:24662] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f4635a98e..ee8311e169 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Nov 1 11:52:18 2004 NAKAMURA Usaku + + * io.c (pipe_open): avoid conflict of variable name. [ruby-dev:24662] + Mon Nov 1 11:46:19 2004 WATANABE Hirofumi * process.c (rb_f_exec): should check whether prog is NULL. diff --git a/io.c b/io.c index 4c3bcd45dd..a71214121b 100644 --- a/io.c +++ b/io.c @@ -2783,7 +2783,7 @@ pipe_open(argc, argv, pname, mode) #elif defined(_WIN32) FILE *fpr, *fpw; int openmode = rb_io_mode_modenum(mode); - char *prog = NULL; + char *exename = NULL; #endif char *cmd; @@ -2854,9 +2854,9 @@ pipe_open(argc, argv, pname, mode) cmd = ALLOCA_N(char, rb_w32_argv_size(args)); rb_w32_join_argv(cmd, args); free(args); - prog = pname; + exename = pname; } - while ((pid = rb_w32_pipe_exec(cmd, prog, openmode, &fpr, &fpw)) == -1) { + while ((pid = rb_w32_pipe_exec(cmd, exename, openmode, &fpr, &fpw)) == -1) { /* exec failed */ switch (errno) { case EAGAIN: