* process.c (security): always give warning for insecure PATH.

* dir.c (my_getcwd): do not rely on MAXPATHLEN.

* file.c (rb_file_s_readlink): ditto.

* file.c (path_check_1): ditto.

* eval.c (rb_yield_0): should not call rb_f_block_given_p().

* string.c (rb_str_chomp_bang): should terminate string by NUL.

* eval.c (rb_yield_0): better error message.


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

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/resolv.rb b/lib/resolv.rb
index dd7bddc6d6..5caaa1af5f 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -76,7 +76,7 @@ DNS stub resolver.
 
 --- Resolv::DNS#getresource(name, typeclass)
 --- Resolv::DNS#getresources(name, typeclass)
---- Resolv::DNS#each_resources(name, typeclass) {|resource| ...}
+--- Resolv::DNS#each_resource(name, typeclass) {|resource| ...}
     They lookup DNS resources of ((|name|)).
     ((|name|)) must be a instance of Resolv::Name or String.
 
@@ -370,7 +370,7 @@ class Resolv
     end
 
     def each_address(name)
-      each_resources(name, Resource::IN::A) {|resource| yield resource.address}
+      each_resource(name, Resource::IN::A) {|resource| yield resource.address}
     end
 
     def getname(address)
@@ -395,21 +395,21 @@ class Resolv
       else
         raise ResolvError.new("cannot interpret as address: #{address}")
       end
-      each_resources(ptr, Resource::IN::PTR) {|resource| yield resource.name}
+      each_resource(ptr, Resource::IN::PTR) {|resource| yield resource.name}
     end
 
     def getresource(name, typeclass)
-      each_resources(name, typeclass) {|resource| return resource}
+      each_resource(name, typeclass) {|resource| return resource}
       raise ResolvError.new("DNS result has no information for #{name}")
     end
 
     def getresources(name, typeclass)
       ret = []
-      each_resources(name, typeclass) {|resource| ret << resource}
+      each_resource(name, typeclass) {|resource| ret << resource}
       return ret
     end
 
-    def each_resources(name, typeclass, &proc)
+    def each_resource(name, typeclass, &proc)
       lazy_initialize
       q = Queue.new
       senders = {}
@@ -1594,7 +1594,7 @@ class Resolv
 
     def initialize(address)
       unless address.kind_of?(String) && address.length == 16
-        raise ArgumentError.new('IPv4 address muse be 16 bytes')
+        raise ArgumentError.new('IPv6 address muse be 16 bytes')
       end
       @address = address
     end