merge revision(s) 34284:34286:

	* lib/shellwords.rb: Fix rdoc markups.

	* lib/shellwords.rb (Shellwords#shellsplit): Fix a bug where
	  consecutive backslashes in double quotes are all removed except
	  the one at the tail.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 18 deletions

diff --git a/lib/shellwords.rb b/lib/shellwords.rb
index 6f31a38ee2..abc4e80ad4 100644
--- a/lib/shellwords.rb
+++ b/lib/shellwords.rb
@@ -17,25 +17,23 @@
 #   - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
 #
 module Shellwords
-  #
   # Splits a string into an array of tokens in the same way the UNIX
   # Bourne shell does.
   #
   #   argv = Shellwords.split('here are "two words"')
   #   argv #=> ["here", "are", "two words"]
   #
-  # +String#shellsplit+ is a shorthand for this function.
+  # String#shellsplit is a shorthand for this function.
   #
   #   argv = 'here are "two words"'.shellsplit
   #   argv #=> ["here", "are", "two words"]
-  #
   def shellsplit(line)
     words = []
     field = ''
     line.scan(/\G\s*(?>([^\s\\\'\"]+)|'([^\']*)'|"((?:[^\"\\]|\\.)*)"|(\\.?)|(\S))(\s|\z)?/m) do
       |word, sq, dq, esc, garbage, sep|
       raise ArgumentError, "Unmatched double quote: #{line.inspect}" if garbage
-      field << (word || sq || (dq || esc).gsub(/\\(?=.)/, ''))
+      field << (word || sq || (dq || esc).gsub(/\\(.)/, '\\1'))
       if sep
         words << field
         field = ''
@@ -52,7 +50,6 @@ module Shellwords
     alias split shellsplit
   end
 
-  #
   # Escapes a string so that it can be safely used in a Bourne shell
   # command line.
   #
@@ -63,7 +60,7 @@ module Shellwords
   #     # ...
   #   }
   #
-  # +String#shellescape+ is a shorthand for this function.
+  # String#shellescape is a shorthand for this function.
   #
   #   open("| grep #{pattern.shellescape} file") { |pipe|
   #     # ...
@@ -73,7 +70,6 @@ module Shellwords
   # 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?
@@ -98,7 +94,6 @@ module Shellwords
     alias escape shellescape
   end
 
-  #
   # Builds a command line string from an argument list +array+ joining
   # all elements escaped for Bourne shell and separated by a space.
   #
@@ -106,7 +101,7 @@ module Shellwords
   #     # ...
   #   }
   #
-  # +Array#shelljoin+ is a shorthand for this function.
+  # Array#shelljoin is a shorthand for this function.
   #
   #   open('|' + ['grep', pattern, *files].shelljoin) { |pipe|
   #     # ...
@@ -124,38 +119,32 @@ module Shellwords
 end
 
 class String
-  #
   # call-seq:
   #   str.shellsplit => array
   #
   # Splits +str+ into an array of tokens in the same way the UNIX
-  # Bourne shell does.  See +Shellwords::shellsplit+ for details.
-  #
+  # Bourne shell does.  See Shellwords::shellsplit for details.
   def shellsplit
     Shellwords.split(self)
   end
 
-  #
   # call-seq:
   #   str.shellescape => string
   #
   # Escapes +str+ so that it can be safely used in a Bourne shell
-  # command line.  See +Shellwords::shellescape+ for details.
-  #
+  # command line.  See Shellwords::shellescape for details.
   def shellescape
     Shellwords.escape(self)
   end
 end
 
 class Array
-  #
   # call-seq:
   #   array.shelljoin => string
   #
   # Builds a command line string from an argument list +array+ joining
   # all elements escaped for Bourne shell and separated by a space.
-  # See +Shellwords::shelljoin+ for details.
-  #
+  # See Shellwords::shelljoin for details.
   def shelljoin
     Shellwords.join(self)
   end