From 6fc32eb8bbd0ab3c9b24dd73a3b6b17fd180379d Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 11 Oct 2003 05:37:41 +0000
Subject: [PATCH] * lib/pathname.rb (realpath_rec): fix handling of symlink to
 absolute path.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       |  5 +++++
 lib/pathname.rb | 14 ++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b1a3785e3..aa59c423a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 11 14:35:14 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (realpath_rec): fix handling of symlink to absolute
+	  path.
+
 Sat Oct 11 10:19:39 2003  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/monitor.rb: handle exceptions correctly. Thanks, Gennady
diff --git a/lib/pathname.rb b/lib/pathname.rb
index ff6a1b2421..eff3b6cd15 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -111,11 +111,7 @@ class Pathname
   # it may return relative pathname.
   # Otherwise it returns absolute pathname.
   def realpath(force_absolute=true)
-    if relative? && force_absolute
-      path = File.join Dir.pwd, @path
-    else
-      path = @path
-    end
+    path = @path
     stats = {}
     if %r{\A/} =~ path || realpath_root?('.', stats)
       resolved = '/'
@@ -123,7 +119,12 @@ class Pathname
       resolved = '.'
     end
     resolved = realpath_rec(resolved, path, stats)
-    Pathname.new(resolved)
+    if %r{\A/} !~ resolved && force_absolute
+      # Note that Dir.pwd and resolved has no symlinks.
+      Pathname.new(File.join(Dir.pwd, resolved)).cleanpath
+    else
+      Pathname.new(resolved)
+    end
   end
 
   def realpath_root?(path, stats) # :nodoc:
@@ -156,6 +157,7 @@ class Pathname
         if File.lstat(path).symlink?
           raise Errno::ELOOP.new(path) if rec.include? path
           link = File.readlink path
+          resolved = '/' if %r{\A/} =~ link
           begin
             rec[path] = true
             resolved = realpath_rec(resolved, link, stats, rec)