diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-10 07:17:53 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-10 07:17:53 +0000 |
| commit | df6547cb7f160eaa3bc69d41a055b2c33ffc0e93 (patch) | |
| tree | b10b6489ef3dee4fc819499d3731bc66f8b8f21e /lib/shellwords.rb | |
| parent | 600e26720e2f505dece5fc96f36ab51580a67f8c (diff) | |
| download | ruby-df6547cb7f160eaa3bc69d41a055b2c33ffc0e93.tar.gz ruby-df6547cb7f160eaa3bc69d41a055b2c33ffc0e93.tar.xz ruby-df6547cb7f160eaa3bc69d41a055b2c33ffc0e93.zip | |
* dir.c (rb_glob2): do not allocate buffer from heap to avoid
memory leaks. use string object for buffering instead.
[ruby-dev:24738]
* dir.c (join_path): ditto.
* io.c (io_read): external input buffer may be modified even after
rb_str_locktmp(). [ruby-dev:24735]
* dir.c (fnmatch): p or s may be NULL. [ruby-dev:24749]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7242 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/shellwords.rb')
| -rw-r--r-- | lib/shellwords.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/shellwords.rb b/lib/shellwords.rb index 99c0bf843..e87b9e656 100644 --- a/lib/shellwords.rb +++ b/lib/shellwords.rb @@ -41,8 +41,8 @@ module Shellwords snippet = $1 elsif line =~ /\A'/ then raise ArgumentError, "Unmatched single quote: #{line}" - elsif line.sub!(/\A\\(.)/, '') then - snippet = $1 + elsif line.sub!(/\A\\(.)?/, '') then + snippet = $1 || '\\' elsif line.sub!(/\A([^\s\\'"]+)/, '') then snippet = $1 else |