Skip to content

Commit

Permalink
[ruby/fileutils] Make copy methods handle FIFOs and UNIX sockets
Browse files Browse the repository at this point in the history
Previously, this was broken.  Trying to copy a FIFO would raise a
NoMethodError if File.mkfifo was defined.  Trying to copy a UNIX
socket would raise a RuntimeError as File.mknod is not something
Ruby defines.

Handle the FIFO issue using File.mkfifo instead of mkfifo.

Handle the UNIX Socket issue by creating a unix socket.

Continue to not support character or block devices, raising a
RuntimeError for both.

Add tests for FIFO, UNIX Socket, and character/block devices.

ruby/fileutils@123903532d
  • Loading branch information
jeremyevans authored and hsbt committed Sep 27, 2019
1 parent 366dd9d commit 1d99163
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 9 deletions.
21 changes: 12 additions & 9 deletions lib/fileutils.rb
Expand Up @@ -1383,18 +1383,21 @@ def copy(dest)
end
when symlink?
File.symlink File.readlink(path()), dest
when chardev?
raise "cannot handle device file" unless File.respond_to?(:mknod)
mknod dest, ?c, 0666, lstat().rdev
when blockdev?
raise "cannot handle device file" unless File.respond_to?(:mknod)
mknod dest, ?b, 0666, lstat().rdev
when chardev?, blockdev?
raise "cannot handle device file"
when socket?
raise "cannot handle socket" unless File.respond_to?(:mknod)
mknod dest, nil, lstat().mode, 0
begin
require 'socket'
rescue LoadError
raise "cannot handle socket"
else
raise "cannot handle socket" unless defined?(UNIXServer)
end
UNIXServer.new(dest).close
File.chmod lstat().mode, dest
when pipe?
raise "cannot handle FIFO" unless File.respond_to?(:mkfifo)
mkfifo dest, 0666
File.mkfifo dest, lstat().mode
when door?
raise "cannot handle door: #{path()}"
else
Expand Down
28 changes: 28 additions & 0 deletions test/fileutils/test_fileutils.rb
Expand Up @@ -440,6 +440,34 @@ def test_cp_r_symlink_preserve
}
end if have_symlink? and !no_broken_symlink?

def test_cp_r_fifo
Dir.mkdir('tmp/cpr_src')
File.mkfifo 'tmp/cpr_src/fifo', 0600
cp_r 'tmp/cpr_src', 'tmp/cpr_dest'
assert_equal(true, File.pipe?('tmp/cpr_dest/fifo'))
end if File.respond_to?(:mkfifo)

def test_cp_r_dev
devs = Dir['/dev/*']
chardev = Dir['/dev/*'].find{|f| File.chardev?(f)}
blockdev = Dir['/dev/*'].find{|f| File.blockdev?(f)}
Dir.mkdir('tmp/cpr_dest')
assert_raise(RuntimeError) { cp_r chardev, 'tmp/cpr_dest/cd' }
assert_raise(RuntimeError) { cp_r blockdev, 'tmp/cpr_dest/bd' }
end

begin
require 'socket'
rescue LoadError
else
def test_cp_r_socket
Dir.mkdir('tmp/cpr_src')
UNIXServer.new('tmp/cpr_src/socket').close
cp_r 'tmp/cpr_src', 'tmp/cpr_dest'
assert_equal(true, File.socket?('tmp/cpr_dest/socket'))
end if defined?(UNIXServer)
end

def test_cp_r_pathname
# pathname
touch 'tmp/cprtmp'
Expand Down

0 comments on commit 1d99163

Please sign in to comment.