diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-01-19 14:13:01 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-01-19 14:13:01 +0000 |
| commit | 4ae8470a48e9491ccccb6f989f0481aa8e8c8e78 (patch) | |
| tree | 901fc40402a684969dbf2bb8109c010e65e89dd8 | |
| parent | 02e3fb8cf64576ad021486dc6870bae698ec9f81 (diff) | |
| download | ruby-4ae8470a48e9491ccccb6f989f0481aa8e8c8e78.tar.gz | |
* lib/shellwords.rb (shellwords): A backslash ('\') in single
quotes should not be regarded as meta character. This bug or
maybe feature was inherited from Perl's shellwords.pl.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/shellwords.rb | 3 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sun Jan 19 23:08:18 2003 Akinori MUSHA <knu@iDaemons.org> + + * lib/shellwords.rb (shellwords): A backslash ('\') in single + quotes should not be regarded as meta character. This bug or + maybe feature was inherited from Perl's shellwords.pl. + Sat Jan 18 14:53:49 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> * bignum.c (rb_cstr_to_inum): should not erase all 0s, but diff --git a/lib/shellwords.rb b/lib/shellwords.rb index 9fd7571172..6fb40e8a27 100644 --- a/lib/shellwords.rb +++ b/lib/shellwords.rb @@ -26,9 +26,8 @@ module Shellwords snippet.gsub!(/\\(.)/, '\1') elsif line =~ /\A"/ then #" raise ArgumentError, "Unmatched double quote: #{line}" - elsif line.sub!(/\A'(([^'\\]|\\.)*)'/, '') then #' + elsif line.sub!(/\A'([^']*)'/, '') then #' snippet = $1 - snippet.gsub!(/\\(.)/, '\1') elsif line =~ /\A'/ then #' raise ArgumentError, "Unmatched single quote: #{line}" elsif line.sub!(/\A\\(.)/, '') then |