summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHo-Sheng Hsiao <hosheng.hsiao@gmail.com>2012-04-02 18:45:02 -0400
committerHo-Sheng Hsiao <hosh@opscode.com>2012-05-10 14:51:43 -0400
commitec7dfe16926ebb7ecfefda365e5706954b761c3a (patch)
treecf062be53e0a451870a8c27accbb175a95c8afc7 /lib
parent146de90bee9a19f97a2b13595d39cbd99cb7eb77 (diff)
downloadmixlib-shellout-ec7dfe16926ebb7ecfefda365e5706954b761c3a.tar.gz
[CHEF-2994][WINDOWS] Expanded Utils.should_run_under_cmd?() to work like Ruby system()
Diffstat (limited to 'lib')
-rw-r--r--lib/mixlib/shellout/windows.rb35
1 files changed, 34 insertions, 1 deletions
diff --git a/lib/mixlib/shellout/windows.rb b/lib/mixlib/shellout/windows.rb
index 1703236..7bebb3b 100644
--- a/lib/mixlib/shellout/windows.rb
+++ b/lib/mixlib/shellout/windows.rb
@@ -231,8 +231,41 @@ module Mixlib
# api: semi-private
# If there are special characters parsable by cmd.exe (such as file redirection), then
# this method should return true.
+ #
+ # This parser is based on
+ # https://github.com/ruby/ruby/blob/9073db5cb1d3173aff62be5b48d00f0fb2890991/win32/win32.c#L1437
def self.should_run_under_cmd?(command)
- !!(command =~ /[%&|<>{}@^]/)
+ return true if command =~ /^@/
+
+ quote = nil
+ env = false
+ env_first_char = false
+
+ command.dup.each_char do |c|
+ case c
+ when "'", '"'
+ if (!quote)
+ quote = c
+ elsif quote == c
+ quote = nil
+ end
+ next
+ when '>', '<', '|', '&', "\n"
+ return true unless quote
+ when '%'
+ return true if env
+ env = env_first_char = true
+ next
+ else
+ next unless env
+ if env_first_char
+ env_first_char = false
+ env = false and next if c !~ /[A-Za-z_]/
+ end
+ env = false if c !~ /[A-Za-z1-9_]/
+ end
+ end
+ return false
end
def self.pathext