kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/shellwords.rb (Shellwords#shellescape): Drop the //n flag

Browse source 
that only causes warnings with no real effect.  [Bug #5637]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2012-01-01 03:26:20 +00:00
parent 069f7ec90a
commit d367b1b9f1
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Jan 1 12:23:10 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]
Sat Dec 31 06:28:37 2011 NARUSE, Yui <naruse@ruby-lang.org> Sat Dec 31 06:28:37 2011 NARUSE, Yui <naruse@ruby-lang.org>
* thread.c (rb_barrier_waiting): save the number of waiting threads * thread.c (rb_barrier_waiting): save the number of waiting threads

12
lib/shellwords.rb
View file

@ -75,15 +75,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) def shellescape(str)
# An empty argument will be skipped, so return empty quotes. # An empty argument will be skipped, so return empty quotes.
return "''" if str.empty? return "''" if str.empty?
str = str.dup str = str.dup
# Process as a single byte sequence because not all shell # Treat multibyte characters as is. It is caller's responsibility
# implementations are multibyte aware. # to encode the string in the right encoding for the shell
str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1") # environment.
str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/, "\\\\\\1")
# A LF cannot be escaped with a backslash because a backslash + LF # A LF cannot be escaped with a backslash because a backslash + LF
# combo is regarded as line continuation and simply ignored. # combo is regarded as line continuation and simply ignored.

8
test/test_shellwords.rb
View file

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
require 'test/unit' require 'test/unit'
require 'shellwords' require 'shellwords'
@ -36,4 +37,11 @@ class TestShellwords < Test::Unit::TestCase
shellwords(bad_cmd) shellwords(bad_cmd)
end end
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 end