d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from OpenBSD:

Browse Source 
> Error out if someone tries to mv a mount point.  Old behavior was to
> move all files contained in the mounted filesystem to the dest. dir
> which could be quite nasty.  Personally, I think rename(2) should
> return EPERM or EINVAL instead of EXDEV.

Obtained from: OpenBSD mv.c rev 1.6 by Todd Miller <millert@openbsd.org>
This commit is contained in:
Eivind Eklund 1997-12-10 17:52:49 +00:00
parent fede2ad755
commit a33d9e6606
1 changed files with 16 additions and 2 deletions

18
bin/mv/mv.c

@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mv.c,v 1.15 1997/10/04 13:02:06 wosch Exp $
* $Id: mv.c,v 1.16 1997/10/26 10:33:02 helbig Exp $
*/
#ifndef lint
@ -50,6 +50,7 @@ static char const sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94";
#include <sys/time.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/mount.h>
#include <err.h>
#include <errno.h>
@ -184,7 +185,20 @@ do_move(from, to)
if (!rename(from, to))
return (0);
if (errno != EXDEV) {
if (errno == EXDEV) {
struct statfs sfs;
char path[MAXPATHLEN];
/* 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);
return (1);
}