2000-04-10

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

3 files changed, 19 insertions, 16 deletions

diff --git a/lib/ftplib.rb b/lib/ftplib.rb
index 0b90749274..4cb1b752d6 100644
--- a/lib/ftplib.rb
+++ b/lib/ftplib.rb
@@ -2,7 +2,7 @@
 # ftplib.rb
 #
 
-$stderr.puts 'Warning: ftplib.rb is obsolute: use net/ftp'
+$stderr.puts 'Warning: ftplib.rb is obsolete: use net/ftp'
 
 require 'net/ftp'
 
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f510e9c509..805be307d0 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -327,7 +327,7 @@ def create_makefile(target)
   $DLDFLAGS = CONFIG["DLDFLAGS"]
 
   if RUBY_PLATFORM =~ /beos/
-    $libs = $libs + " -lruby"
+    $libs = $libs + " " + CONFIG["LIBRUBYARG"]
     $DLDFLAGS = $DLDFLAGS + " -L" + CONFIG["prefix"] + "/lib"
   end
 
diff --git a/lib/shellwords.rb b/lib/shellwords.rb
index 60996be17c..7b16c6cb52 100644
--- a/lib/shellwords.rb
+++ b/lib/shellwords.rb
@@ -2,43 +2,46 @@
 # original is shellwords.pl
 #
 # Usage:
-#       require 'shellwords.rb'
+#       require 'shellwords'
 #       words = Shellwords.shellwords(line)
 #
 #	   or
 #
+#       require 'shellwords'
 #       include Shellwords
 #       words = shellwords(line)
 
 module Shellwords
   def shellwords(line)
-    return '' unless line
-    line.sub! /^\s+/, ''
+    unless line.kind_of?(String)
+      raise ArgumentError, "Argument must be String class object."
+    end
+    line.sub!(/^\s+/, '')
     words = []
     while line != ''
       field = ''
       while true
-	if line.sub! /^"(([^"\\]|\\.)*)"/, '' then #"
+	if line.sub!(/^"(([^"\\]|\\.)*)"/, '') then #"
 	  snippet = $1
-	  snippet.gsub! /\\(.)/, '\1'
+	  snippet.gsub!(/\\(.)/, '\1')
 	elsif line =~ /^"/ then #"
-	  raise ArgError, "Unmatched double quote: #{line}"
-        elsif line.sub! /^'(([^'\\]|\\.)*)'/, '' then #'
+	  raise ArgumentError, "Unmatched double quote: #{line}"
+        elsif line.sub!(/^'(([^'\\]|\\.)*)'/, '') then #'
 	  snippet = $1
-	  snippet.gsub! /\\(.)/, '\1'
+	  snippet.gsub!(/\\(.)/, '\1')
 	elsif line =~ /^'/ then #'
-	  raise ArgError, "Unmatched single quote: #{line}"
-	elsif line.sub! /^\\(.)/, '' then
+	  raise ArgumentError, "Unmatched single quote: #{line}"
+	elsif line.sub!(/^\\(.)/, '') then
 	  snippet = $1
-	elsif line.sub! /^([^\s\\'"]+)/, '' then #'
+	elsif line.sub!(/^([^\s\\'"]+)/, '') then #'
 	  snippet = $1
 	else
-	  line.sub! /^\s+/, ''
+	  line.sub!(/^\s+/, '')
 	  break
 	end
-	field += snippet
+	field.concat(snippet)
       end
-      words += field
+      words.push(field)
     end
     words
   end