Mercurial > emacs
changeset 55368:3d05bc7b23b9
fileio.c (Frename_file): Put symlink handling inside #ifdef S_IFLNK.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 04 May 2004 19:23:31 +0000 |
| parents | be1730952e61 |
| children | 936d4c6b2def |
| files | src/ChangeLog src/fileio.c |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue May 04 16:15:16 2004 +0000 +++ b/src/ChangeLog Tue May 04 19:23:31 2004 +0000 @@ -2,6 +2,7 @@ * fileio.c (barf_or_query_if_file_exists): Use lstat. (Frename_file): Handle renaming of symlinks across file systems. + (Frename_file): Put symlink handling inside #ifdef S_IFLNK. 2004-05-04 Kim F. Storm <storm@cua.dk>
--- a/src/fileio.c Tue May 04 16:15:16 2004 +0000 +++ b/src/fileio.c Tue May 04 19:23:31 2004 +0000 @@ -2725,15 +2725,17 @@ { if (errno == EXDEV) { +#ifdef S_IFLNK symlink_target = Ffile_symlink_p (file); - if (NILP (symlink_target)) + if (! NILP (symlink_target)) + Fmake_symbolic_link (symlink_target, newname, + NILP (ok_if_already_exists) ? Qnil : Qt, Qt); + else +#endif Fcopy_file (file, newname, /* We have already prompted if it was an integer, so don't have copy-file prompt again. */ NILP (ok_if_already_exists) ? Qnil : Qt, Qt); - else - Fmake_symbolic_link (symlink_target, newname, - NILP (ok_if_already_exists) ? Qnil : Qt, Qt); Fdelete_file (file); } else