Skip to content

Commit 1451551

Browse files
committed
gh-154726: Fix shutil.copyfile() for device symlinks with follow_symlinks=False
1 parent 0fa144b commit 1451551

3 files changed

Lines changed: 20 additions & 1 deletion

File tree

Lib/shutil.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,11 @@ def copyfile(src, dst, *, follow_symlinks=True):
292292
if _samefile(src, dst):
293293
raise SameFileError("{!r} and {!r} are the same file".format(src, dst))
294294

295+
copy_symlink = not follow_symlinks and _islink(src)
295296
file_size = 0
296297
for i, fn in enumerate([src, dst]):
298+
if copy_symlink and i == 0:
299+
continue
297300
try:
298301
st = _stat(fn)
299302
except OSError:
@@ -315,7 +318,7 @@ def copyfile(src, dst, *, follow_symlinks=True):
315318
if _WINDOWS and i == 0:
316319
file_size = st.st_size
317320

318-
if not follow_symlinks and _islink(src):
321+
if copy_symlink:
319322
os.symlink(os.readlink(src), dst)
320323
else:
321324
with open(src, 'rb') as fsrc:

Lib/test/test_shutil.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,6 +1583,19 @@ def test_copyfile_character_device(self):
15831583
self.assertRaisesRegex(shutil.SpecialFileError, 'is a character device',
15841584
shutil.copyfile, src_file, '/dev/null')
15851585

1586+
@os_helper.skip_unless_symlink
1587+
@unittest.skipUnless(os.path.exists('/dev/null'), 'requires /dev/null')
1588+
def test_copyfile_symlink_to_character_device(self):
1589+
tmp_dir = self.mkdtemp()
1590+
src = os.path.join(tmp_dir, 'src')
1591+
dst = os.path.join(tmp_dir, 'dst')
1592+
os.symlink('/dev/null', src)
1593+
1594+
shutil.copyfile(src, dst, follow_symlinks=False)
1595+
1596+
self.assertTrue(os.path.islink(dst))
1597+
self.assertEqual(os.readlink(dst), '/dev/null')
1598+
15861599
def test_copyfile_block_device(self):
15871600
block_dev = None
15881601
for dev in ['/dev/loop0', '/dev/sda', '/dev/vda', '/dev/disk0']:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fix :func:`shutil.copyfile` to copy a symbolic link to a special file when
2+
``follow_symlinks=False`` instead of raising
3+
:exc:`~shutil.SpecialFileError`.

0 commit comments

Comments
 (0)