From: Jan Djärv Date: Tue, 4 May 2004 19:23:31 +0000 (+0000) Subject: fileio.c (Frename_file): Put symlink handling inside #ifdef S_IFLNK. X-Git-Tag: ttn-vms-21-2-B4~6413 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=440c7d00c4a9a53a53e915055e899ea4c41438b5;p=emacs.git fileio.c (Frename_file): Put symlink handling inside #ifdef S_IFLNK. --- diff --git a/src/ChangeLog b/src/ChangeLog index 9ff41a4ccc0..035aa78c24f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 diff --git a/src/fileio.c b/src/fileio.c index 04068e25f89..7d20697b875 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2725,15 +2725,17 @@ This is what happens in interactive use with M-x. */) { 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