procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Let rename-file rename dirs across filesystems

Browse source 
Problem diagnosed by Andreas Schwab (Bug#28792#65).
This fixes a bug that I introduced in
2017-09-10T22:39:24@eggert@cs.ucla.edu
"Fix race with rename-file etc. with dir NEWNAME".
* src/fileio.c (Frename_file): Copy a source directory across
file system boundaries even if its name does not end in slash.
This commit is contained in:
Paul Eggert 2017-10-12 13:08:53 -07:00
parent 413978727c
commit 2f4bd2fbda
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/fileio.c
View file

@ -2260,7 +2260,7 @@ This is what happens in interactive use with M-x. */)
(Lisp_Object file, Lisp_Object newname, Lisp_Object ok_if_already_exists) (Lisp_Object file, Lisp_Object newname, Lisp_Object ok_if_already_exists)
{ {
Lisp_Object handler; Lisp_Object handler;
Lisp_Object encoded_file, encoded_newname, symlink_target; Lisp_Object encoded_file, encoded_newname;
file = Fexpand_file_name (file, Qnil); file = Fexpand_file_name (file, Qnil);
@ -2334,12 +2334,22 @@ This is what happens in interactive use with M-x. */)
if (rename_errno != EXDEV) if (rename_errno != EXDEV)
report_file_errno ("Renaming", list2 (file, newname), rename_errno); report_file_errno ("Renaming", list2 (file, newname), rename_errno);
struct stat file_st;
bool dirp = !NILP (Fdirectory_name_p (file)); bool dirp = !NILP (Fdirectory_name_p (file));
if (!dirp)
{
if (lstat (SSDATA (encoded_file), &file_st) != 0)
report_file_error ("Renaming", list2 (file, newname));
dirp = S_ISDIR (file_st.st_mode) != 0;
}
if (dirp) if (dirp)
call4 (Qcopy_directory, file, newname, Qt, Qnil); call4 (Qcopy_directory, file, newname, Qt, Qnil);
else else
{ {
symlink_target = Ffile_symlink_p (file); Lisp_Object symlink_target
= (S_ISLNK (file_st.st_mode)
? emacs_readlinkat (AT_FDCWD, SSDATA (encoded_file))
: Qnil);
if (!NILP (symlink_target)) if (!NILP (symlink_target))
Fmake_symbolic_link (symlink_target, newname, ok_if_already_exists); Fmake_symbolic_link (symlink_target, newname, ok_if_already_exists);
else else