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 | |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/shellwords.rb | 12 | ||||
-rw-r--r-- | test/test_shellwords.rb | 8 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 23 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sun Feb 12 16:38:13 2012 Akinori MUSHA <knu@iDaemons.org> + + * lib/shellwords.rb (Shellwords#shellescape): Drop the //n flag + that only causes warnings with no real effect. [Bug #5637] + Sun Feb 12 16:34:55 2012 Akinori MUSHA <knu@iDaemons.org> * tool/merger.rb (#default_merge_branch): Add support for 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. diff --git a/test/test_shellwords.rb b/test/test_shellwords.rb index d48a8882c8..593f0e0aea 100644 --- a/test/test_shellwords.rb +++ b/test/test_shellwords.rb @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- require 'test/unit' require 'shellwords' @@ -36,4 +37,11 @@ class TestShellwords < Test::Unit::TestCase shellwords(bad_cmd) end 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 + # used as shell meta-character that needs to be escaped. + assert_equal "\\あ\\い", "あい".shellescape + end end @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 98 +#define RUBY_PATCHLEVEL 99 #define RUBY_RELEASE_DATE "2012-02-12" #define RUBY_RELEASE_YEAR 2012 |