From 158be5bf0095957cbc7d81a3fdf170cc7d3c71a6 Mon Sep 17 00:00:00 2001 From: pjd Date: Sun, 21 Mar 2004 13:38:37 +0000 Subject: When symbolic link is pointed onto a mount point, it can't be moved to a different file system. Patch in PR was incorrect. PR: bin/64430 Submitted by: Samuel Tardieu MFC after: 3 days --- bin/mv/mv.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'bin/mv') diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 009ce51..7044a81 100644 --- a/bin/mv/mv.c +++ b/bin/mv/mv.c @@ -210,14 +210,25 @@ do_move(char *from, char *to) struct statfs sfs; char path[PATH_MAX]; - /* Can't mv(1) a mount point. */ - if (realpath(from, path) == NULL) { - warnx("cannot resolve %s: %s", from, path); + /* + * If the source is a symbolic link and is on another + * filesystem, it can be recreated at the destination. + */ + if (lstat(from, &sb) == -1) { + warn("%s", from); return (1); } - if (!statfs(path, &sfs) && !strcmp(path, sfs.f_mntonname)) { - warnx("cannot rename a mount point"); - return (1); + if (!S_ISLNK(sb.st_mode)) { + /* Can't mv(1) a mount point. */ + if (realpath(from, path) == NULL) { + warnx("cannot resolve %s: %s", from, path); + return (1); + } + if (!statfs(path, &sfs) && + !strcmp(path, sfs.f_mntonname)) { + warnx("cannot rename a mount point"); + return (1); + } } } else { warn("rename %s to %s", from, to); -- cgit v1.1