X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/c3fbfbb72f03a786bc702b49d6f712f8e5344dba..81552f0f5904ea22ac22667d377d623a641b663c:/usr/src/sys/ufs/lfs/lfs_vnops.c

diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index 0141aaea02..e91077154a 100644
--- a/usr/src/sys/ufs/lfs/lfs_vnops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vnops.c
@@ -1,4 +1,4 @@
-/*	lfs_vnops.c	4.44	82/12/19	*/
+/*	lfs_vnops.c	4.58	83/05/28	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -12,11 +12,14 @@
 #include "../h/buf.h"
 #include "../h/proc.h"
 #include "../h/quota.h"
-#include "../h/descrip.h"
 #include "../h/uio.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/nami.h"
+#include "../h/mount.h"
+
+extern	struct fileops inodeops;
+struct	file *getinode();
 
 /*
  * Change current working directory (``.'').
@@ -72,76 +75,74 @@ bad:
  */
 open()
 {
-	register struct inode *ip;
-	register struct a {
+	struct a {
 		char	*fname;
-		int	flags;
 		int	mode;
-	} *uap;
-	int checkpermissions = 1, flags;
+		int	crtmode;
+	} *uap = (struct a *) u.u_ap;
 
-	uap = (struct a *)u.u_ap;
-	flags = uap->flags + 1;
-	if ((flags&FTRUNCATE) && (flags&FWRITE) == 0) {
-		u.u_error = EINVAL;
-		return;
-	}
-	if (flags&FCREATE) {
-		ip = namei(uchar, CREATE, 1);
-		if (ip == NULL) {
-			if (u.u_error)
-				return;
-			ip = maknode(uap->mode&07777&(~ISVTX));
-			checkpermissions = 0;
-			flags &= ~FTRUNCATE;
-		}
-	} else
-		ip = namei(uchar, LOOKUP, 1);
-	if (ip == NULL)
-		return;
-	open1(ip, flags, checkpermissions);
+	copen(uap->mode-FOPEN, uap->crtmode);
 }
 
-#ifndef NOCOMPAT
 /*
  * Creat system call.
  */
-ocreat()
+creat()
 {
-	register struct inode *ip;
-	register struct a {
+	struct a {
 		char	*fname;
 		int	fmode;
-	} *uap;
+	} *uap = (struct a *)u.u_ap;
 
-	uap = (struct a *)u.u_ap;
-	ip = namei(uchar, CREATE, 1);
-	if (ip == NULL) {
-		if (u.u_error)
-			return;
-		ip = maknode(uap->fmode&07777&(~ISVTX));
-		if (ip == NULL)
-			return;
-		open1(ip, FWRITE, 0);
-	} else
-		open1(ip, FWRITE|FTRUNCATE, 1);
+	copen(FWRITE|FCREAT|FTRUNC, uap->fmode);
 }
-#endif
 
 /*
  * Common code for open and creat.
- * Check permissions (if we haven't done so already),
- * allocate an open file structure, and call
- * the device open routine, if any.
+ * Check permissions, allocate an open file structure,
+ * and call the device open routine if any.
  */
-open1(ip, mode, checkpermissions)
-	register struct inode *ip;
-	register mode;
+copen(mode, arg)
+	register int mode;
+	int arg;
 {
+	register struct inode *ip;
 	register struct file *fp;
-	int i, flags;
+	int i;
 
-	if (checkpermissions) {
+#ifdef notdef
+	if ((mode&(FREAD|FWRITE)) == 0) {
+		u.u_error = EINVAL;
+		return;
+	}
+#endif
+	if (mode&FCREAT) {
+		ip = namei(uchar, CREATE, 1);
+		if (ip == NULL) {
+			if (u.u_error)
+				return;
+			ip = maknode(arg&07777&(~ISVTX));
+			if (ip == NULL)
+				return;
+			mode &= ~FTRUNC;
+		} else {
+			if (mode&FEXCL) {
+				u.u_error = EEXIST;
+				iput(ip);
+				return;
+			}
+			mode &= ~FCREAT;
+		}
+	} else {
+		ip = namei(uchar, LOOKUP, 1);
+		if (ip == NULL)
+			return;
+	}
+	if ((ip->i_mode & IFMT) == IFSOCK) {
+		u.u_error = EOPNOTSUPP;
+		goto bad;
+	}
+	if ((mode&FCREAT) == 0) {
 		if (mode&FREAD)
 			if (access(ip, IREAD))
 				goto bad;
@@ -154,36 +155,31 @@ open1(ip, mode, checkpermissions)
 			}
 		}
 	}
-
-	/*
-	 * Check locking on inode.  Release "inode lock"
-	 * while doing so in case we block inside flocki.
-	 */
-	flags = 0;
-	if (mode&(FSHLOCK|FEXLOCK)) {
-		iunlock(ip);
-		flags = flocki(ip, 0, mode);
-		ilock(ip);
-		if (u.u_error)
-			goto bad;
-	}
-	if (mode&FTRUNCATE)
+	fp = falloc();
+	if (fp == NULL)
+		goto bad;
+	if (mode&FTRUNC)
 		itrunc(ip, (u_long)0);
 	iunlock(ip);
-	if ((fp = falloc()) == NULL)
-		goto out;
-	fp->f_flag = mode & FMODES;
-	fp->f_type = DTYPE_FILE;
+	fp->f_flag = mode&FMASK;
+	fp->f_type = DTYPE_INODE;
+	fp->f_ops = &inodeops;
+	fp->f_data = (caddr_t)ip;
 	i = u.u_r.r_val1;
-	fp->f_inode = ip;
-	u.u_error = openi(ip, mode);
-	if (u.u_error == 0) {
-		u.u_pofile[i] = flags;
+#ifdef notdef
+	if (setjmp(&u.u_qsave)) {
+		if (u.u_error == 0)
+			u.u_error = EINTR;
+		u.u_ofile[i] = NULL;
+		closef(fp);
 		return;
 	}
+#endif
+	u.u_error = openi(ip, mode);
+	if (u.u_error == 0)
+		return;
 	u.u_ofile[i] = NULL;
 	fp->f_count--;
-out:
 	irele(ip);
 	return;
 bad:
@@ -203,25 +199,30 @@ mknod()
 	} *uap;
 
 	uap = (struct a *)u.u_ap;
-	if (suser()) {
-		ip = namei(uchar, CREATE, 0);
-		if (ip != NULL) {
-			u.u_error = EEXIST;
-			goto out;
-		}
+	if (!suser())
+		return;
+	ip = namei(uchar, CREATE, 0);
+	if (ip != NULL) {
+		u.u_error = EEXIST;
+		goto out;
 	}
 	if (u.u_error)
 		return;
 	ip = maknode(uap->fmode);
 	if (ip == NULL)
 		return;
-	if (uap->dev) {
-		/*
-		 * Want to be able to use this to make badblock
-		 * inodes, so don't truncate the dev number.
-		 */
-		ip->i_rdev = uap->dev;
-		ip->i_flag |= IACC|IUPD|ICHG;
+	switch (ip->i_mode & IFMT) {
+
+	case IFCHR:
+	case IFBLK:
+		if (uap->dev) {
+			/*
+			 * Want to be able to use this to make badblock
+			 * inodes, so don't truncate the dev number.
+			 */
+			ip->i_rdev = uap->dev;
+			ip->i_flag |= IACC|IUPD|ICHG;
+		}
 	}
 
 out:
@@ -265,7 +266,7 @@ link()
 		u.u_error = EXDEV;
 		goto out;
 	}
-	direnter(ip);
+	u.u_error = direnter(ip);
 out:
 	if (u.u_error) {
 		ip->i_nlink--;
@@ -367,17 +368,13 @@ lseek()
 	} *uap;
 
 	uap = (struct a *)u.u_ap;
-	fp = getf(uap->fd);
+	fp = getinode(uap->fd);
 	if (fp == NULL)
 		return;
-	if (fp->f_type == DTYPE_SOCKET) {
-		u.u_error = ESPIPE;
-		return;
-	}
-	if (uap->sbase == FSEEK_RELATIVE)
+	if (uap->sbase == L_INCR)
 		uap->off += fp->f_offset;
-	else if (uap->sbase == FSEEK_EOF)
-		uap->off += fp->f_inode->i_size;
+	else if (uap->sbase == L_XTND)
+		uap->off += ((struct inode *)fp->f_data)->i_size;
 	fp->f_offset = uap->off;
 	u.u_r.r_off = uap->off;
 }
@@ -401,11 +398,11 @@ saccess()
 	u.u_gid = u.u_rgid;
 	ip = namei(uchar, LOOKUP, 1);
 	if (ip != NULL) {
-		if ((uap->fmode&FACCESS_READ) && access(ip, IREAD))
+		if ((uap->fmode&R_OK) && access(ip, IREAD))
 			goto done;
-		if ((uap->fmode&FACCESS_WRITE) && access(ip, IWRITE))
+		if ((uap->fmode&W_OK) && access(ip, IWRITE))
 			goto done;
-		if ((uap->fmode&FACCESS_EXECUTE) && access(ip, IEXEC))
+		if ((uap->fmode&X_OK) && access(ip, IEXEC))
 			goto done;
 done:
 		iput(ip);
@@ -414,99 +411,41 @@ done:
 	u.u_gid = svgid;
 }
 
-/*
- * the fstat system call.
- */
-fstat()
-{
-	register struct file *fp;
-	register struct a {
-		int	fd;
-		struct stat *sb;
-	} *uap;
-
-	uap = (struct a *)u.u_ap;
-	fp = getf(uap->fd);
-	if (fp == NULL)
-		return;
-	if (fp->f_type == DTYPE_SOCKET)
-		u.u_error = sostat(fp->f_socket, uap->sb);
-	else
-		stat1(fp->f_inode, uap->sb);
-}
-
 /*
  * Stat system call.  This version follows links.
  */
 stat()
 {
-	register struct inode *ip;
-	register struct a {
-		char	*fname;
-		struct stat *sb;
-	} *uap;
 
-	uap = (struct a *)u.u_ap;
-	ip = namei(uchar, LOOKUP, 1);
-	if (ip == NULL)
-		return;
-	stat1(ip, uap->sb);
-	iput(ip);
+	stat1(1);
 }
 
 /*
  * Lstat system call.  This version does not follow links.
  */
 lstat()
+{
+
+	stat1(0);
+}
+
+stat1(follow)
+	int follow;
 {
 	register struct inode *ip;
 	register struct a {
 		char	*fname;
-		struct stat *sb;
+		struct stat *ub;
 	} *uap;
+	struct stat sb;
 
 	uap = (struct a *)u.u_ap;
-	ip = namei(uchar, LOOKUP, 0);
+	ip = namei(uchar, LOOKUP, follow);
 	if (ip == NULL)
 		return;
-	stat1(ip, uap->sb);
+	(void) statinode(ip, &sb);
 	iput(ip);
-}
-
-/*
- * The basic routine for fstat and stat:
- * get the inode and pass appropriate parts back.
- */
-stat1(ip, ub)
-	register struct inode *ip;
-	struct stat *ub;
-{
-	struct stat ds;
-
-	IUPDAT(ip, &time, &time, 0);
-	/*
-	 * Copy from inode table
-	 */
-	ds.st_dev = ip->i_dev;
-	ds.st_ino = ip->i_number;
-	ds.st_mode = ip->i_mode;
-	ds.st_nlink = ip->i_nlink;
-	ds.st_uid = ip->i_uid;
-	ds.st_gid = ip->i_gid;
-	ds.st_rdev = (dev_t)ip->i_rdev;
-	ds.st_size = ip->i_size;
-	ds.st_atime = ip->i_atime;
-	ds.st_mtime = ip->i_mtime;
-	ds.st_ctime = ip->i_ctime;
-	/* this doesn't belong here */
-	if ((ip->i_mode&IFMT) == IFBLK)
-		ds.st_blksize = BLKDEV_IOSIZE;
-	else if ((ip->i_mode&IFMT) == IFCHR)
-		ds.st_blksize = MAXBSIZE;
-	else
-		ds.st_blksize = ip->i_fs->fs_bsize;
-	if (copyout((caddr_t)&ds, (caddr_t)ub, sizeof(ds)) < 0)
-		u.u_error = EFAULT;
+	u.u_error = copyout((caddr_t)&sb, (caddr_t)uap->ub, sizeof (sb));
 }
 
 /*
@@ -566,14 +505,10 @@ fchmod()
 	register struct file *fp;
 
 	uap = (struct a *)u.u_ap;
-	fp = getf(uap->fd);
+	fp = getinode(uap->fd);
 	if (fp == NULL)
 		return;
-	if (fp->f_type == DTYPE_SOCKET) {
-		u.u_error = EINVAL;
-		return;
-	}
-	ip = fp->f_inode;
+	ip = (struct inode *)fp->f_data;
 	if (u.u_uid != ip->i_uid && !suser())
 		return;
 	ilock(ip);
@@ -589,22 +524,12 @@ chmod1(ip, mode)
 	register struct inode *ip;
 	register int mode;
 {
-	register int *gp;
 
 	ip->i_mode &= ~07777;
 	if (u.u_uid) {
 		mode &= ~ISVTX;
-		for (gp = u.u_groups; gp < &u.u_groups[NGROUPS]; gp++)
-			if (*gp == ip->i_gid)
-				goto ok;
-		mode &= ~ISGID;
-ok:
-		;
-#ifdef MUSH
-		if (u.u_quota->q_syflags & QF_UMASK && u.u_uid != 0 &&
-		    (ip->i_mode & IFMT) != IFCHR)
-			mode &= ~u.u_cmask;
-#endif
+		if (!groupmember(ip->i_gid))
+			mode &= ~ISGID;
 	}
 	ip->i_mode |= mode&07777;
 	ip->i_flag |= ICHG;
@@ -627,7 +552,7 @@ chown()
 	uap = (struct a *)u.u_ap;
 	if (!suser() || (ip = owner(0)) == NULL)
 		return;
-	chown1(ip, uap->uid, uap->gid);
+	u.u_error = chown1(ip, uap->uid, uap->gid);
 	iput(ip);
 }
 
@@ -645,18 +570,14 @@ fchown()
 	register struct file *fp;
 
 	uap = (struct a *)u.u_ap;
-	fp = getf(uap->fd);
+	fp = getinode(uap->fd);
 	if (fp == NULL)
 		return;
-	if (fp->f_type == DTYPE_SOCKET) {
-		u.u_error = EINVAL;
-		return;
-	}
-	ip = fp->f_inode;
+	ip = (struct inode *)fp->f_data;
 	if (!suser())
 		return;
 	ilock(ip);
-	chown1(ip, uap->uid, uap->gid);
+	u.u_error = chown1(ip, uap->uid, uap->gid);
 	iunlock(ip);
 }
 
@@ -670,53 +591,37 @@ chown1(ip, uid, gid)
 {
 #ifdef QUOTA
 	register long change;
+#endif
 
-	/*
-	 * This doesn't allow for holes in files (which hopefully don't
-	 * happen often in files that we chown), and is not accurate anyway
-	 * (eg: it totally ignores 3 level indir blk files - but hopefully
-	 * noone who can make a file that big will have a quota)
-	 */
-	if (ip->i_uid == uid)
+	if (uid == -1)
+		uid = ip->i_uid;
+	if (gid == -1)
+		gid = ip->i_gid;
+#ifdef QUOTA
+	if (ip->i_uid != uid)		/* this just speeds things a little */
 		change = 0;
-	else {
-		register struct fs *fs = ip->i_fs;
-
-		if (ip->i_size > (change = NDADDR * fs->fs_bsize)) {
-			register off_t size;
-
-			size = blkroundup(fs, ip->i_size) - change;
-			change += size;
-			change += fs->fs_bsize;
-			/* this assumes NIADDR <= 2 */
-			if (size > NINDIR(fs) * fs->fs_bsize)
-				change += fs->fs_bsize;
-		} else
-			change = fragroundup(fs, ip->i_size);
-		change /= DEV_BSIZE;
-	}
-	(void)chkdq(ip, -change, 1);
-	(void)chkiq(ip->i_dev, ip, ip->i_uid, 1);
+	else
+		change = ip->i_blocks;
+	(void) chkdq(ip, -change, 1);
+	(void) chkiq(ip->i_dev, ip, ip->i_uid, 1);
 	dqrele(ip->i_dquot);
 #endif
-	/*
-	 * keep uid/gid's in sane range -- no err,
-	 * so chown(file, uid, -1) will do something useful
-	 */
-	if (uid >= 0 && uid <= 32767)	/* should have a constant */
-		ip->i_uid = uid;
-	if (gid >= 0 && gid <= 32767)	/* same here */
-		ip->i_gid = gid;
+	ip->i_uid = uid;
+	ip->i_gid = gid;
 	ip->i_flag |= ICHG;
 	if (u.u_ruid != 0)
 		ip->i_mode &= ~(ISUID|ISGID);
 #ifdef QUOTA
 	ip->i_dquot = inoquota(ip);
-	(void)chkdq(ip, change, 1);
-	(void)chkiq(ip->i_dev, (struct inode *)NULL, uid, 1);
+	(void) chkdq(ip, change, 1);
+	(void) chkiq(ip->i_dev, (struct inode *)NULL, uid, 1);
+	return (u.u_error);		/* should == 0 ALWAYS !! */
+#else
+	return (0);
 #endif
 }
 
+#ifndef NOCOMPAT
 /*
  * Set IUPD and IACC times on file.
  * Can't set ICHG.
@@ -726,17 +631,15 @@ outime()
 	register struct a {
 		char	*fname;
 		time_t	*tptr;
-	} *uap;
+	} *uap = (struct a *)u.u_ap;
 	register struct inode *ip;
 	time_t tv[2];
 	struct timeval tv0, tv1;
 
-	uap = (struct a *)u.u_ap;
 	if ((ip = owner(1)) == NULL)
 		return;
-	if (copyin((caddr_t)uap->tptr, (caddr_t)tv, sizeof(tv))) {
-		u.u_error = EFAULT;
-	} else {
+	u.u_error = copyin((caddr_t)uap->tptr, (caddr_t)tv, sizeof (tv));
+	if (u.u_error == 0) {
 		ip->i_flag |= IACC|IUPD|ICHG;
 		tv0.tv_sec = tv[0]; tv0.tv_usec = 0;
 		tv1.tv_sec = tv[1]; tv1.tv_usec = 0;
@@ -744,6 +647,26 @@ outime()
 	}
 	iput(ip);
 }
+#endif
+
+utimes()
+{
+	register struct a {
+		char	*fname;
+		struct	timeval *tptr;
+	} *uap = (struct a *)u.u_ap;
+	register struct inode *ip;
+	struct timeval tv[2];
+
+	if ((ip = owner(1)) == NULL)
+		return;
+	u.u_error = copyin((caddr_t)uap->tptr, (caddr_t)tv, sizeof (tv));
+	if (u.u_error == 0) {
+		ip->i_flag |= IACC|IUPD|ICHG;
+		iupdat(ip, &tv[0], &tv[1], 0);
+	}
+	iput(ip);
+}
 
 /*
  * Flush any pending I/O.
@@ -759,29 +682,24 @@ sync()
  */
 flock()
 {
-	struct a {
+	register struct a {
 		int	fd;
 		int	how;
-	} *uap;
+	} *uap = (struct a *)u.u_ap;
 	register struct file *fp;
 	register int cmd, flags;
 
-	uap = (struct a *)u.u_ap;
-	fp = getf(uap->fd);
+	fp = getinode(uap->fd);
 	if (fp == NULL)
 		return;
-	if (fp->f_type == DTYPE_SOCKET) {		/* XXX */
-		u.u_error = EINVAL;
-		return;
-	}
 	cmd = uap->how;
 	flags = u.u_pofile[uap->fd] & (UF_SHLOCK|UF_EXLOCK);
-	if (cmd&FUNLOCK) {
+	if (cmd&LOCK_UN) {
 		if (flags == 0) {
 			u.u_error = EINVAL;
 			return;
 		}
-		funlocki(fp->f_inode, flags);
+		funlocki((struct inode *)fp->f_data, flags);
 		u.u_pofile[uap->fd] &= ~(UF_SHLOCK|UF_EXLOCK);
 		return;
 	}
@@ -789,10 +707,11 @@ flock()
 	 * No reason to write lock a file we've already
 	 * write locked, similarly with a read lock.
 	 */
-	if ((flags&UF_EXLOCK) && (cmd&FEXLOCK) ||
-	    (flags&UF_SHLOCK) && (cmd&FSHLOCK))
+	if ((flags&UF_EXLOCK) && (cmd&LOCK_EX) ||
+	    (flags&UF_SHLOCK) && (cmd&LOCK_SH))
 		return;
-	u.u_pofile[uap->fd] = flocki(fp->f_inode, u.u_pofile[uap->fd], cmd);
+	u.u_pofile[uap->fd] =
+	    flocki((struct inode *)fp->f_data, u.u_pofile[uap->fd], cmd);
 }
 
 /*
@@ -832,18 +751,14 @@ ftruncate()
 	struct inode *ip;
 	struct file *fp;
 
-	fp = getf(uap->fd);
+	fp = getinode(uap->fd);
 	if (fp == NULL)
 		return;
-	if (fp->f_type == DTYPE_SOCKET) {
-		u.u_error = EINVAL;
-		return;
-	}
 	if ((fp->f_flag&FWRITE) == 0) {
 		u.u_error = EINVAL;
 		return;
 	}
-	ip = fp->f_inode;
+	ip = (struct inode *)fp->f_data;
 	ilock(ip);
 	itrunc(ip, uap->length);
 	iunlock(ip);
@@ -860,14 +775,10 @@ fsync()
 	struct inode *ip;
 	struct file *fp;
 
-	fp = getf(uap->fd);
+	fp = getinode(uap->fd);
 	if (fp == NULL)
 		return;
-	if (fp->f_type == DTYPE_SOCKET) {
-		u.u_error = EINVAL;
-		return;
-	}
-	ip = fp->f_inode;
+	ip = (struct inode *)fp->f_data;
 	ilock(ip);
 	syncip(ip);
 	iunlock(ip);
@@ -907,9 +818,10 @@ rename()
 	} *uap;
 	register struct inode *ip, *xp, *dp;
 	int oldparent, parentdifferent, doingdirectory;
+	int error = 0;
 
 	uap = (struct a *)u.u_ap;
-	ip = namei(uchar, LOOKUP | LOCKPARENT, 0);
+	ip = namei(uchar, DELETE | LOCKPARENT, 0);
 	if (ip == NULL)
 		return;
 	dp = u.u_pdir;
@@ -919,20 +831,23 @@ rename()
 
 		d = &u.u_dent;
 		/*
-		 * Avoid "." and ".." for obvious reasons.
+		 * Avoid ".", "..", and aliases of "." for obvious reasons.
 		 */
-		if (d->d_name[0] == '.') {
-			if (d->d_namlen == 1 ||
-			    (d->d_namlen == 2 && d->d_name[1] == '.')) {
-				u.u_error = EINVAL;
+		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);
-				return;
-			}
+			u.u_error = EINVAL;
+			return;
 		}
 		oldparent = dp->i_number;
 		doingdirectory++;
 	}
-	irele(dp);
+	iput(dp);
 
 	/*
 	 * 1) Bump link count while we're moving stuff
@@ -951,9 +866,40 @@ rename()
 	 */
 	u.u_dirp = (caddr_t)uap->to;
 	xp = namei(uchar, CREATE | LOCKPARENT, 0);
-	if (u.u_error)
+	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. 
@@ -961,10 +907,9 @@ rename()
 	 *    entry to reference the source inode and
 	 *    expunge the original entry's existence.
 	 */
-	parentdifferent = oldparent != dp->i_number;
 	if (xp == NULL) {
 		if (dp->i_dev != ip->i_dev) {
-			u.u_error = EXDEV;
+			error = EXDEV;
 			goto bad;
 		}
 		/*
@@ -979,50 +924,64 @@ rename()
 			dp->i_flag |= ICHG;
 			iupdat(dp, &time, &time, 1);
 		}
-		direnter(ip);
-		if (u.u_error)
+		error = direnter(ip);
+		if (error)
 			goto out;
 	} else {
 		if (xp->i_dev != dp->i_dev || xp->i_dev != ip->i_dev) {
-			u.u_error = EXDEV;
+			error = EXDEV;
 			goto bad;
 		}
 		/*
-		 * Target must be empty if a directory.
+		 * Short circuit rename(foo, foo).
+		 */
+		if (xp->i_number == ip->i_number)
+			goto bad;
+		/*
+		 * Target must be empty if a directory
+		 * and have no links to it.
 		 * Also, insure source and target are
 		 * compatible (both directories, or both
 		 * not directories).
 		 */
 		if ((xp->i_mode&IFMT) == IFDIR) {
-			if (!dirempty(xp)) {
-				u.u_error = ENOTEMPTY;
+			if (!dirempty(xp) || xp->i_nlink > 2) {
+				error = ENOTEMPTY;
 				goto bad;
 			}
 			if (!doingdirectory) {
-				u.u_error = ENOTDIR;
+				error = ENOTDIR;
 				goto bad;
 			}
 		} else if (doingdirectory) {
-			u.u_error = EISDIR;
+			error = EISDIR;
 			goto bad;
 		}
 		dirrewrite(dp, ip);
-		if (u.u_error)
+		if (u.u_error) {
+			error = u.u_error;
 			goto bad1;
+		}
 		/*
-		 * If this is a directory we know it is
-		 * empty and we can squash the inode and
-		 * any space associated with it.  Otherwise,
-		 * we've got a plain file and the link count
-		 * simply needs to be adjusted.
+		 * Adjust the link count of the target to
+		 * reflect the dirrewrite above.  If this is
+		 * a directory it is empty and there are
+		 * no links to it, so we can squash the inode and
+		 * any space associated with it.  We disallowed
+		 * renaming over top of a directory with links to
+		 * it above, as we've no way to determine if
+		 * we've got a link or the directory itself, and
+		 * if we get a link, then ".." will be screwed up.
 		 */
+		xp->i_nlink--;
 		if (doingdirectory) {
-			xp->i_nlink = 0;
+			if (--xp->i_nlink != 0)
+				panic("rename: linked directory");
 			itrunc(xp, (u_long)0);
-		} else
-			xp->i_nlink--;
+		}
 		xp->i_flag |= ICHG;
 		iput(xp);
+		xp = NULL;
 	}
 
 	/*
@@ -1059,6 +1018,8 @@ rename()
 			ip->i_nlink--;
 			ip->i_flag |= ICHG;
 		}
+		if (error == 0)		/* conservative */
+			error = u.u_error;
 	}
 	irele(ip);
 	if (dp)
@@ -1072,7 +1033,7 @@ rename()
 	 *    and a lot shorter than when it was done
 	 *    in a user process.
 	 */
-	if (doingdirectory && parentdifferent && u.u_error == 0) {
+	if (doingdirectory && parentdifferent && error == 0) {
 		struct dirtemplate dirbuf;
 
 		u.u_dirp = uap->to;
@@ -1086,9 +1047,9 @@ rename()
 			printf("rename: .. not a directory\n");
 			goto stuck;
 		}
-		u.u_error = rdwri(UIO_READ, ip, (caddr_t)&dirbuf,
+		error = rdwri(UIO_READ, ip, (caddr_t)&dirbuf,
 			sizeof (struct dirtemplate), (off_t)0, 1, (int *)0);
-		if (u.u_error == 0) {
+		if (error == 0) {
 			dirbuf.dotdot_ino = dp->i_number;
 			(void) rdwri(UIO_WRITE, ip, (caddr_t)&dirbuf,
 			  sizeof (struct dirtemplate), (off_t)0, 1, (int *)0);
@@ -1097,16 +1058,20 @@ stuck:
 		irele(dp);
 		iput(ip);
 	}
-	return;
+	goto done;
+
 bad:
-	iput(u.u_pdir);
+	iput(dp);
 bad1:
 	if (xp)
-		irele(xp);
+		iput(xp);
 out:
 	ip->i_nlink--;
 	ip->i_flag |= ICHG;
 	irele(ip);
+done:
+	if (error)
+		u.u_error = error;
 }
 
 /*
@@ -1139,6 +1104,8 @@ maknode(mode)
 	ip->i_nlink = 1;
 	ip->i_uid = u.u_uid;
 	ip->i_gid = u.u_pdir->i_gid;
+	if (ip->i_mode & ISGID && !groupmember(ip->i_gid))
+		ip->i_mode &= ~ISGID;
 #ifdef QUOTA
 	ip->i_dquot = inoquota(ip);
 #endif
@@ -1147,11 +1114,11 @@ maknode(mode)
 	 * Make sure inode goes to disk before directory entry.
 	 */
 	iupdat(ip, &time, &time, 1);
-	direnter(ip);
+	u.u_error = direnter(ip);
 	if (u.u_error) {
 		/*
-		 * write error occurred trying to update directory
-		 * so must deallocate the inode
+		 * Write error occurred trying to update directory
+		 * so must deallocate the inode.
 		 */
 		ip->i_nlink = 0;
 		ip->i_flag |= ICHG;
@@ -1160,3 +1127,220 @@ maknode(mode)
 	}
 	return (ip);
 }
+
+/*
+ * A virgin directory (no blushing please).
+ */
+struct dirtemplate mastertemplate = {
+	0, 12, 1, ".",
+	0, DIRBLKSIZ - 12, 2, ".."
+};
+
+/*
+ * Mkdir system call
+ */
+mkdir()
+{
+	struct a {
+		char	*name;
+		int	dmode;
+	} *uap;
+	register struct inode *ip, *dp;
+	struct dirtemplate dirtemplate;
+
+	uap = (struct a *)u.u_ap;
+	ip = namei(uchar, CREATE, 0);
+	if (u.u_error)
+		return;
+	if (ip != NULL) {
+		iput(ip);
+		u.u_error = EEXIST;
+		return;
+	}
+	dp = u.u_pdir;
+	uap->dmode &= 0777;
+	uap->dmode |= IFDIR;
+	/*
+	 * Must simulate part of maknode here
+	 * in order to acquire the inode, but
+	 * not have it entered in the parent
+	 * directory.  The entry is made later
+	 * after writing "." and ".." entries out.
+	 */
+	ip = ialloc(dp, dirpref(dp->i_fs), uap->dmode);
+	if (ip == NULL) {
+		iput(dp);
+		return;
+	}
+#ifdef QUOTA
+	if (ip->i_dquot != NODQUOT)
+		panic("mkdir: dquot");
+#endif
+	ip->i_flag |= IACC|IUPD|ICHG;
+	ip->i_mode = uap->dmode & ~u.u_cmask;
+	ip->i_nlink = 2;
+	ip->i_uid = u.u_uid;
+	ip->i_gid = dp->i_gid;
+#ifdef QUOTA
+	ip->i_dquot = inoquota(ip);
+#endif
+	iupdat(ip, &time, &time, 1);
+
+	/*
+	 * Bump link count in parent directory
+	 * to reflect work done below.  Should
+	 * be done before reference is created
+	 * so reparation is possible if we crash.
+	 */
+	dp->i_nlink++;
+	dp->i_flag |= ICHG;
+	iupdat(dp, &time, &time, 1);
+
+	/*
+	 * Initialize directory with "."
+	 * and ".." from static template.
+	 */
+	dirtemplate = mastertemplate;
+	dirtemplate.dot_ino = ip->i_number;
+	dirtemplate.dotdot_ino = dp->i_number;
+	u.u_error = rdwri(UIO_WRITE, ip, (caddr_t)&dirtemplate,
+		sizeof (dirtemplate), (off_t)0, 1, (int *)0);
+	if (u.u_error) {
+		dp->i_nlink--;
+		dp->i_flag |= ICHG;
+		goto bad;
+	}
+	/*
+	 * Directory all set up, now
+	 * install the entry for it in
+	 * the parent directory.
+	 */
+	u.u_error = direnter(ip);
+	dp = NULL;
+	if (u.u_error) {
+		u.u_dirp = uap->name;
+		dp = namei(uchar, LOOKUP, 0);
+		if (dp) {
+			dp->i_nlink--;
+			dp->i_flag |= ICHG;
+		}
+	}
+bad:
+	/*
+	 * No need to do an explicit itrunc here,
+	 * irele will do this for us because we set
+	 * the link count to 0.
+	 */
+	if (u.u_error) {
+		ip->i_nlink = 0;
+		ip->i_flag |= ICHG;
+	}
+	if (dp)
+		iput(dp);
+	iput(ip);
+}
+
+/*
+ * Rmdir system call.
+ */
+rmdir()
+{
+	struct a {
+		char	*name;
+	};
+	register struct inode *ip, *dp;
+
+	ip = namei(uchar, DELETE | LOCKPARENT, 0);
+	if (ip == NULL)
+		return;
+	dp = u.u_pdir;
+	/*
+	 * No rmdir "." please.
+	 */
+	if (dp == ip) {
+		irele(dp);
+		iput(ip);
+		u.u_error = EINVAL;
+		return;
+	}
+	if ((ip->i_mode&IFMT) != IFDIR) {
+		u.u_error = ENOTDIR;
+		goto out;
+	}
+	/*
+	 * Don't remove a mounted on directory.
+	 */
+	if (ip->i_dev != dp->i_dev) {
+		u.u_error = EBUSY;
+		goto out;
+	}
+	/*
+	 * Verify the directory is empty (and valid).
+	 * (Rmdir ".." won't be valid since
+	 *  ".." will contain a reference to
+	 *  the current directory and thus be
+	 *  non-empty.)
+	 */
+	if (ip->i_nlink != 2 || !dirempty(ip)) {
+		u.u_error = ENOTEMPTY;
+		goto out;
+	}
+	/*
+	 * Delete reference to directory before purging
+	 * inode.  If we crash in between, the directory
+	 * will be reattached to lost+found,
+	 */
+	if (dirremove() == 0)
+		goto out;
+	dp->i_nlink--;
+	dp->i_flag |= ICHG;
+	iput(dp);
+	dp = NULL;
+	/*
+	 * Truncate inode.  The only stuff left
+	 * in the directory is "." and "..".  The
+	 * "." reference is inconsequential since
+	 * we're quashing it.  The ".." reference
+	 * has already been adjusted above.  We've
+	 * removed the "." reference and the reference
+	 * in the parent directory, but there may be
+	 * other hard links so decrement by 2 and
+	 * worry about them later.
+	 */
+	ip->i_nlink -= 2;
+	itrunc(ip, (u_long)0);
+out:
+	if (dp)
+		iput(dp);
+	iput(ip);
+}
+
+struct file *
+getinode(fdes)
+	int fdes;
+{
+	register struct file *fp;
+
+	fp = getf(fdes);
+	if (fp == 0)
+		return (0);
+	if (fp->f_type != DTYPE_INODE) {
+		u.u_error = EINVAL;
+		return (0);
+	}
+	return (fp);
+}
+
+/*
+ * mode mask for creation of files
+ */
+umask()
+{
+	register struct a {
+		int	mask;
+	} *uap;
+
+	uap = (struct a *)u.u_ap;
+	u.u_r.r_val1 = u.u_cmask;
+	u.u_cmask = uap->mask & 07777;
+}