diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-12 07:38:38 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-12 07:38:38 +0000 |
| commit | b760f18a9fa3a8e0ec14a52248b968dfd54e357e (patch) | |
| tree | 0c23c61061fcbf8b6bc23681e77aa43909c31740 /lib | |
| parent | f4df871a4f0d9af8f54870487b3624661aaaef26 (diff) | |
merge revision(s) 34166:
* lib/shellwords.rb (Shellwords#shellescape): Drop the //n flag
that only causes warnings with no real effect. [Bug #5637]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/shellwords.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/shellwords.rb b/lib/shellwords.rb index f1300612bb..6f31a38ee2 100644 --- a/lib/shellwords.rb +++ b/lib/shellwords.rb @@ -69,15 +69,21 @@ module Shellwords # # ... # } # + # It is caller's responsibility to encode the string in the right + # encoding for the shell environment where this string is used. + # Multibyte characters are treated as multibyte characters, not + # bytes. + # def shellescape(str) # An empty argument will be skipped, so return empty quotes. return "''" if str.empty? str = str.dup - # Process as a single byte sequence because not all shell - # implementations are multibyte aware. - str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1") + # Treat multibyte characters as is. It is caller's responsibility + # to encode the string in the right encoding for the shell + # environment. + str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/, "\\\\\\1") # A LF cannot be escaped with a backslash because a backslash + LF # combo is regarded as line continuation and simply ignored. |