From 350aee1bdacbc128730a86b22e93001a99b785dd Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 11 Jul 2002 08:22:18 +0000
Subject: * string.c (rb_str_slice_bang): if there's no corresponding  
 substring, slice! should return nil without exception.

* array.c (rb_ary_insert): type fixed.

* string.c (rb_str_split_m): accept separator value nil as well.

* string.c (rb_str_become): was leaking memory.

* class.c (rb_include_module): should not alter other
  classes/modules by inclusion.  by this fix, local order may not
  be preserved for some cases.

* class.c (include_class_new): module may be T_ICLASS; retrieve
  original module information.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/net/ftp.rb      |  4 ++--
 lib/net/protocol.rb |  2 +-
 lib/net/telnet.rb   |  4 ++--
 lib/ping.rb         |  2 +-
 lib/pstore.rb       | 11 +++++++++--
 5 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 1d8cbba55..75e087a20 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -55,7 +55,7 @@ module Net
 	@passive = true
 	return SOCKSsocket.open(host, port)
       else
-	return TCPsocket.open(host, port)
+	return TCPSocket.open(host, port)
       end
     end
     private :open_socket
@@ -173,7 +173,7 @@ module Net
     private :sendport
     
     def makeport
-      sock = TCPserver.open(@sock.addr[3], 0)
+      sock = TCPServer.open(@sock.addr[3], 0)
       port = sock.addr[1]
       host = sock.addr[3]
       resp = sendport(host, port)
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 0398e512e..df38725cb 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -395,7 +395,7 @@ module Net
     def connect( otime )
       D "opening connection to #{@address}..."
       timeout( otime ) {
-          @socket = TCPsocket.new( @address, @port )
+          @socket = TCPSocket.new( @address, @port )
       }
       @rbuf = ''
     end
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index 91c4faedb..62a8246d1 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -313,10 +313,10 @@ module Net
 
         begin
           if @options["Timeout"] == false
-            @sock = TCPsocket.open(@options["Host"], @options["Port"])
+            @sock = TCPSocket.open(@options["Host"], @options["Port"])
           else
             timeout(@options["Timeout"]) do
-              @sock = TCPsocket.open(@options["Host"], @options["Port"])
+              @sock = TCPSocket.open(@options["Host"], @options["Port"])
             end
           end
         rescue TimeoutError
diff --git a/lib/ping.rb b/lib/ping.rb
index d698dd0c5..d90551e67 100644
--- a/lib/ping.rb
+++ b/lib/ping.rb
@@ -44,7 +44,7 @@ module Ping
   def pingecho(host, timeout=5, service="echo")
     begin
       timeout(timeout) do
-	s = TCPsocket.new(host, service)
+	s = TCPSocket.new(host, service)
 	s.close
       end
     rescue Errno::ECONNREFUSED
diff --git a/lib/pstore.rb b/lib/pstore.rb
index 23b2d878a..dfec76e47 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -42,10 +42,17 @@ class PStore
 
   def [](name)
     in_transaction
+    @table[name]
+  end
+  def fetch(name, default=PStore::Error)
     unless @table.key? name
-      raise PStore::Error, format("undefined root name `%s'", name)
+      if default==PStore::Error
+	raise PStore::Error, format("undefined root name `%s'", name)
+      else
+	default
+      end
     end
-    @table[name]
+    self[name]
   end
   def []=(name, value)
     in_transaction
-- 
cgit