 @@ -1,14 +1,14 @@
-/*	$NetBSD: ptyfs.h,v 1.8 2009/03/15 16:43:55 christos Exp $	*/
+/*	$NetBSD: ptyfs.h,v 1.9 2012/09/18 21:33:55 christos Exp $	*/
 /*
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -114,31 +114,26 @@ struct ptyfsmount {
 #define VFSTOPTY(mp)	((struct ptyfsmount *)(mp)->mnt_data)
 #endif /* _KERNEL */
 struct ptyfs_args {
 	int version;
 	gid_t gid;
 	mode_t mode;
 	int flags;
 };
 #define PTYFS_ARGSVERSION	2
 #define PTYFSMNT_CHROOT		0x01
 #define PTYFSMNT_BITS "\177\20" \
     "b\00chroot\0"
 /*
  * Kernel stuff follows
  */
 #ifdef _KERNEL
 #define UIO_MX 32
 #define PTYFS_FILENO(pty, type) \
     ((type == PTYFSroot) ? 2 : \
      ((((pty) + 1) * 2 + (((type) == PTYFSpts) ? 1 : 2))))
 #define PTYFS_MAKEDEV(ptyfs) \
     pty_makedev((ptyfs)->ptyfs_type == PTYFSpts ? 't' : 'p', (ptyfs)->ptyfs_pty)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ptyfs_vfsops.c,v 1.42 2010/01/08 11:35:09 pooka Exp $	*/
+/*	$NetBSD: ptyfs_vfsops.c,v 1.43 2012/09/18 21:33:55 christos Exp $	*/
 /*
  * Copyright (c) 1992, 1993, 1995
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software donated to Berkeley by
  * Jan-Simon Pendry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -28,27 +28,27 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 /*
  * Pseudo-tty Filesystem
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.42 2010/01/08 11:35:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.43 2012/09/18 21:33:55 christos Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/stat.h>
 #include <sys/dirent.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 @@ -94,28 +94,27 @@ struct ptm_pty ptm_ptyfspty = {
 static const char *
 ptyfs__getpath(struct lwp *l, const struct mount *mp)
+{
 #define MAXBUF (sizeof(mp->mnt_stat.f_mntonname) + 32)
 	struct cwdinfo *cwdi = l->l_proc->p_cwdi;
 	char *buf;
 	const char *rv;
 	size_t len;
 	char *bp;
 	int error;
 	struct ptyfsmount *pmnt = mp->mnt_data;
 	rv = mp->mnt_stat.f_mntonname;
-	if (cwdi->cwdi_rdir == NULL ||
+	if (cwdi->cwdi_rdir == NULL)
 	    (pmnt->pmnt_flags & PTYFSMNT_CHROOT) == 0)
 		return rv;
 	buf = malloc(MAXBUF, M_TEMP, M_WAITOK);
 	bp = buf + MAXBUF;
 	*--bp = '\0';
 	error = getcwd_common(cwdi->cwdi_rdir, rootvnode, &bp,
 	    buf, MAXBUF / 2, 0, l);
 	if (error)	/* XXX */
 		goto out;
 	len = strlen(bp);
 	if (len < sizeof(mp->mnt_stat.f_mntonname))	/* XXX */
 		rv += len;