diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-12 18:42:03 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-12 18:42:03 +0000 |
| commit | 8c72fc9bf09071300b6283411b4481456aac7e34 (patch) | |
| tree | 7b107fcfad5476a304edf94b6f9a119cee1d8c7d | |
| parent | 44d20d61c7babae9fd2ac3c6578208efa631d5a3 (diff) | |
* lib/shellwords.rb (Shellwords#shellsplit): Fix a bug where
consecutive backslashes in double quotes are all removed except
the one at the tail.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/shellwords.rb | 2 | ||||
| -rw-r--r-- | test/test_shellwords.rb | 9 |
3 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Jan 13 03:38:36 2012 Akinori MUSHA <knu@iDaemons.org> + + * lib/shellwords.rb (Shellwords#shellsplit): Fix a bug where + consecutive backslashes in double quotes are all removed except + the one at the tail. + Fri Jan 13 03:28:00 2012 Luis Lavena <luislavena@gmail.com> * ext/socket/extconf.rb (if ipv6): only define _WIN32_WINNT if was not diff --git a/lib/shellwords.rb b/lib/shellwords.rb index a83d1f1c86..20ddfe2646 100644 --- a/lib/shellwords.rb +++ b/lib/shellwords.rb @@ -41,7 +41,7 @@ module Shellwords line.scan(/\G\s*(?>([^\s\\\'\"]+)|'([^\']*)'|"((?:[^\"\\]|\\.)*)"|(\\.?)|(\S))(\s|\z)?/m) do |word, sq, dq, esc, garbage, sep| raise ArgumentError, "Unmatched double quote: #{line.inspect}" if garbage - field << (word || sq || (dq || esc).gsub(/\\(?=.)/, '')) + field << (word || sq || (dq || esc).gsub(/\\(.)/, '\\1')) if sep words << field field = '' diff --git a/test/test_shellwords.rb b/test/test_shellwords.rb index 593f0e0aea..bd44aec1af 100644 --- a/test/test_shellwords.rb +++ b/test/test_shellwords.rb @@ -38,6 +38,15 @@ class TestShellwords < Test::Unit::TestCase end end + def test_backslashes + cmdline, expected = [ + %q{/a//b///c////d/////e/ "/a//b///c////d/////e/ "'/a//b///c////d/////e/ '/a//b///c////d/////e/ }, + %q{a/b/c//d//e a/b/c//d//e /a//b///c////d/////e/ a/b/c//d//e } + ].map { |str| str.tr("/", "\\\\") } + + assert_equal [expected], shellwords(cmdline) + end + def test_multibyte_characters # This is not a spec. It describes the current behavior which may # be changed in future. There would be no multibyte character |