- } *uap;
- register struct inode *ip, *xp, *dp;
- int oldparent, parentdifferent, doingdirectory;
- int error = 0;
-
- uap = (struct a *)u.u_ap;
- ip = namei(uchar, DELETE | LOCKPARENT, 0);
- if (ip == NULL)
- return;
- dp = u.u_pdir;
- oldparent = 0, doingdirectory = 0;
- if ((ip->i_mode&IFMT) == IFDIR) {
- register struct direct *d;
-
- d = &u.u_dent;
- /*
- * Avoid ".", "..", and aliases of "." for obvious reasons.
- */
- if ((d->d_namlen == 1 && d->d_name[0] == '.') ||
- (d->d_namlen == 2 && bcmp(d->d_name, "..", 2) == 0) ||
- (dp == ip)) {
- iput(dp);
- if (dp == ip)
- irele(ip);
- else
- iput(ip);
- u.u_error = EINVAL;
- return;
- }
- oldparent = dp->i_number;
- doingdirectory++;
- }
- iput(dp);
-
- /*
- * 1) Bump link count while we're moving stuff
- * around. If we crash somewhere before
- * completing our work, the link count
- * may be wrong, but correctable.
- */
- ip->i_nlink++;
- ip->i_flag |= ICHG;
- iupdat(ip, &time, &time, 1);
- iunlock(ip);
-
- /*
- * When the target exists, both the directory
- * and target inodes are returned locked.
- */
- u.u_dirp = (caddr_t)uap->to;
- xp = namei(uchar, CREATE | LOCKPARENT, 0);
- if (u.u_error) {
- error = u.u_error;
- goto out;
- }
- dp = u.u_pdir;
- /*
- * If ".." must be changed (ie the directory gets a new
- * parent) then the source directory must not be in the
- * directory heirarchy above the target, as this would
- * orphan everything below the source directory. Also
- * the user must have write permission in the source so
- * as to be able to change "..". We must repeat the call
- * to namei, as the parent directory is unlocked by the
- * call to checkpath().
- */
- parentdifferent = oldparent != dp->i_number;
- if (doingdirectory && parentdifferent) {
- if (access(ip, IWRITE))
- goto bad;
- do {
- dp = u.u_pdir;
- if (xp != NULL)
- iput(xp);
- u.u_error = checkpath(ip, dp);
- if (u.u_error)
- goto out;
- u.u_dirp = (caddr_t)uap->to;
- xp = namei(uchar, CREATE | LOCKPARENT, 0);
- if (u.u_error) {
- error = u.u_error;
- goto out;
- }
- } while (dp != u.u_pdir);
- }
- /*
- * 2) If target doesn't exist, link the target
- * to the source and unlink the source.
- * Otherwise, rewrite the target directory
- * entry to reference the source inode and
- * expunge the original entry's existence.
- */
- if (xp == NULL) {
- if (dp->i_dev != ip->i_dev) {
- error = EXDEV;
- goto bad;
- }
- /*
- * Account for ".." in directory.
- * When source and destination have the
- * same parent we don't fool with the
- * link count -- this isn't required
- * because we do a similar check below.
- */
- if (doingdirectory && parentdifferent) {
- dp->i_nlink++;
- dp->i_flag |= ICHG;
- iupdat(dp, &time, &time, 1);
- }
- error = direnter(ip);
- if (error)
+ } *uap = (struct a *)scp->sc_ap;
+ register struct vnode *tvp, *fvp, *tdvp;
+ register struct nameidata *ndp = &scp->sc_nd;
+ struct nameidata tond;
+ int error;
+
+ ndp->ni_nameiop = DELETE | WANTPARENT;
+ ndp->ni_segflg = UIO_USERSPACE;
+ ndp->ni_dirp = uap->from;
+ if (error = namei(ndp))
+ RETURN (error);
+ fvp = ndp->ni_vp;
+ nddup(ndp, &tond);
+ tond.ni_nameiop = RENAME | LOCKPARENT | LOCKLEAF | NOCACHE;
+ tond.ni_segflg = UIO_USERSPACE;
+ tond.ni_dirp = uap->to;
+ error = namei(&tond);
+ tdvp = tond.ni_dvp;
+ tvp = tond.ni_vp;
+ if (tvp != NULL) {
+ if (fvp->v_type == VDIR && tvp->v_type != VDIR) {
+ error = ENOTDIR;