kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/fileutils.rb (fu_same?): check by inode instead of path name, to detect two hard links pointing to the same content.

Browse source 
* test/fileutils.rb: did not create correctly looped symlinks.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
aamine 2003-11-18 10:05:21 +00:00
parent 0c15b3a222
commit 1c0cee4f83
3 changed files with 16 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Tue Nov 18 19:05:04 2003 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (fu_same?): check by inode instead of path
name, to detect two hard links pointing to the same content.
* test/fileutils.rb: did not create correctly looped symlinks.
Tue Nov 18 18:23:05 2003 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> Tue Nov 18 18:23:05 2003 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* ext/stringio/stringio.c (strio_read): behave as IO at empty string. * ext/stringio/stringio.c (strio_read): behave as IO at empty string.

32
lib/fileutils.rb
View file

@ -739,35 +739,9 @@ module FileUtils
end end
def fu_same?( a, b ) def fu_same?( a, b )
fu_resolve_symlink(a) == fu_resolve_symlink(b) File.stat(a).ino == File.stat(b).ino
end rescue Errno::ENOENT
return false
def fu_resolve_symlink( path, limit = 128 )
raise Errno::ELOOP, "too many levels of symlic links: #{path}" if limit < 0
if File.symlink?(path)
then fu_resolve_symlink(fu_readlink(File.expand_path(path)), limit-1)
else path
end
end
def fu_readlink( path )
dest = File.readlink(path)
if absolute_path?(dest)
then dest
else File.dirname(File.expand_path(path)) + '/' + dest
path = File.readlink(path)
end
end
def absolute_path?( path )
if have_drive_letter?
then %r<\A([a-z]:)?/> === path
else %r<\A/> === path
end
end
def have_drive_letter?
File::ALT_SEPARATOR ? true : false
end end
def fu_stream_blksize( *streams ) def fu_stream_blksize( *streams )

12
test/fileutils/test_fileutils.rb
View file

@ -149,11 +149,11 @@ end
cp 'tmp/cptmp', 'tmp/cptmp' cp 'tmp/cptmp', 'tmp/cptmp'
} }
if have_symlink? if have_symlink?
File.symlink 'tmp/cptmp', 'tmp/cptmp_symlink' File.symlink 'cptmp', 'tmp/cptmp_symlink'
assert_raises(ArgumentError) { assert_raises(ArgumentError) {
cp 'tmp/cptmp', 'tmp/cptmp_symlink' cp 'tmp/cptmp', 'tmp/cptmp_symlink'
} }
File.symlink 'tmp/symlink', 'tmp/symlink' File.symlink 'symlink', 'tmp/symlink'
assert_raises(Errno::ELOOP) { assert_raises(Errno::ELOOP) {
cp 'tmp/symlink', 'tmp/symlink' cp 'tmp/symlink', 'tmp/symlink'
} }
@ -180,11 +180,11 @@ end
mv 'tmp/cptmp', 'tmp/cptmp' mv 'tmp/cptmp', 'tmp/cptmp'
} }
if have_symlink? if have_symlink?
File.symlink 'tmp/cptmp', 'tmp/cptmp_symlink' File.symlink 'cptmp', 'tmp/cptmp_symlink'
assert_raises(ArgumentError) { assert_raises(ArgumentError) {
mv 'tmp/cptmp', 'tmp/cptmp_symlink' mv 'tmp/cptmp', 'tmp/cptmp_symlink'
} }
File.symlink 'tmp/symlink', 'tmp/symlink' File.symlink 'symlink', 'tmp/symlink'
assert_raises(Errno::ELOOP) { assert_raises(Errno::ELOOP) {
mv 'tmp/symlink', 'tmp/symlink' mv 'tmp/symlink', 'tmp/symlink'
} }
@ -412,11 +412,11 @@ end
install 'tmp/cptmp', 'tmp/cptmp' install 'tmp/cptmp', 'tmp/cptmp'
} }
if have_symlink? if have_symlink?
File.symlink 'tmp/cptmp', 'tmp/cptmp_symlink' File.symlink 'cptmp', 'tmp/cptmp_symlink'
assert_raises(ArgumentError) { assert_raises(ArgumentError) {
install 'tmp/cptmp', 'tmp/cptmp_symlink' install 'tmp/cptmp', 'tmp/cptmp_symlink'
} }
File.symlink 'tmp/symlink', 'tmp/symlink' File.symlink 'symlink', 'tmp/symlink'
assert_raises(Errno::ELOOP) { assert_raises(Errno::ELOOP) {
install 'tmp/symlink', 'tmp/symlink' install 'tmp/symlink', 'tmp/symlink'
} }