From e6a6561121ef4475a0fd136524983bb22afbb3dc Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 13 Jun 2012 00:55:31 +0000 Subject: [PATCH] process.c: treat '=' only in the first word * process.c (rb_exec_fillarg): treat '=' only in the first word. if the first word does not contain '=', it is the command name and environment assignments cannot be anymore. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ process.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cb28598dee..167a1db94c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 13 09:55:29 2012 Nobuyoshi Nakada + + * process.c (rb_exec_fillarg): treat '=' only in the first word. if + the first word does not contain '=', it is the command name and + environment assignments cannot be anymore. + Tue Jun 12 23:45:36 2012 NARUSE, Yui * lib/mkmf.rb: add dummy clean-static target to prevent errors for the diff --git a/process.c b/process.c index 7cfbaf466c..a0ea94ec85 100644 --- a/process.c +++ b/process.c @@ -1851,6 +1851,7 @@ rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, str #ifndef _WIN32 if (e->use_shell) { const char *p; + int first = 1; int has_meta = 0; int has_nonspace = 0; /* @@ -1880,8 +1881,12 @@ rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, str for (p = RSTRING_PTR(prog); *p; p++) { if (!has_nonspace && *p != ' ' && *p != '\t') has_nonspace = 1; - if (!has_meta && strchr("*?{}[]<>()~&|\\$;'`\"\n#=", *p)) + if (has_nonspace && (*p == ' ' || *p == '\t')) + first = 0; + if (!has_meta && strchr("*?{}[]<>()~&|\\$;'`\"\n#", *p)) has_meta = 1; + if (first && *p == '=') + has_meta = 1; if (has_nonspace && has_meta) break; }