 @@ -1,14 +1,14 @@
-.\"	$NetBSD: mknod.2,v 1.29 2017/11/20 17:03:31 uwe Exp $
+.\"	$NetBSD: mknod.2,v 1.30 2019/06/20 03:31:54 kamil Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" 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.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -19,45 +19,66 @@
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" 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.
 .\"
 .\"     @(#)mknod.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd July 29, 2013
+.Dd June 20, 2019
 .Dt MKNOD 2
 .Os
 .Sh NAME
 .Nm mknod ,
 .Nm mknodat
 .Nd make a special file node
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
 .In sys/stat.h
 .Ft int
 .Fn mknod "const char *path" "mode_t mode" "dev_t dev"
 .In sys/stat.h
 .In fcntl.h
 .Ft int
 .Fn mknodat "int fd" "const char *path" "mode_t mode" "dev_t dev"
 .Sh DESCRIPTION
-The device special file
+.Nm
 with
 .Dv S_IFIFO
 specified in
 .Fa mode
 and 0 in
 .Fa dev
 makes a fifo file.
 This call is respectively a portable alias for
 .Xr mkfifo 2
 and
 .Xr mkfifoat 2 .
 .Pp
 .Nm
 with
 .Dv S_IFCHR
 or
 .Dv S_IFBLK
 in
 .Fa mode
 makes a device special file.
 The file
 .Fa path
 is created with the major and minor
 device numbers specified by
 .Fa dev .
 The access permissions of
 .Fa path
 are extracted from
 .Fa mode ,
 modified by the
 .Xr umask 2
 of the parent process.
 .Pp
 .Fn mknodat
 @@ -77,27 +98,27 @@ Search permission is required on this di
 .\" was opened with the
 .\" .Dv O_SEARCH
 .\" flag.
 .\"    - or -
 .\" This file descriptor must have been opened with the
 .\" .Dv O_SEARCH
 .\" flag.
 .Fa fd
 can be set to
 .Dv AT_FDCWD
 in order to specify the current directory.
 .Pp
 .Fn mknod
-requires super-user privileges.
+requires super-user privileges for creating device special files.
 .Sh RETURN VALUES
 .Rv -std mknod mknodat
 .Sh ERRORS
 .Fn mknod
 and
 .Fn mknodat
 will fail and the file will be not created if:
 .Bl -tag -width Er
 .It Bq Er EACCES
 Search permission is denied for a component of the path prefix.
 .It Bq Er EDQUOT
 The directory in which the entry for the new node
 is being placed cannot be extended because the
 @@ -128,26 +149,28 @@ characters, or an entire path name excee
 characters.
 .It Bq Er ENOENT
 A component of the path prefix does not exist.
 .It Bq Er ENOSPC
 The directory in which the entry for the new node is being placed
 cannot be extended because there is no space left on the file
 system containing the directory; or
 there are no free inodes on the file system on which the
 node is being created.
 .It Bq Er ENOTDIR
 A component of the path prefix is not a directory.
 .It Bq Er EPERM
 The process's effective user ID is not super-user.
 .It Bq Er EOPNOTSUPP
 The kernel has not been configured to support fifo's.
 .It Bq Er EROFS
 The named file resides on a read-only file system.
 .El
 .Pp
 In addition,
 .Fn mknodat
 will fail if:
 .Bl -tag -width Er
 .It Bq Er EBADF
 .Fa path
 does not specify an absolute path and
 .Fa fd
 is neither
 @@ -168,13 +191,20 @@ is a file descriptor associated with a n
 .Sh STANDARDS
 The
 .Fn mknod
 function conforms to
 .St -p1003.1-90 .
 .Fn mknodat
 conforms to
 .St -p1003.1-2008 .
 .Sh HISTORY
+A
 .Fn mknod
 function call appeared in
 .At v6 .
 .Pp
 The alias mode for
 .Xr mkfifo 2
 and
 .Xr mkfifoat 2
 first appeared in
 .Nx 9 .

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_netbsd.c,v 1.227 2019/06/18 22:34:25 kamil Exp $	*/
+/*	$NetBSD: netbsd32_netbsd.c,v 1.228 2019/06/20 03:31:54 kamil Exp $	*/
 /*
  * Copyright (c) 1998, 2001, 2008, 2018 Matthew R. Green
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.227 2019/06/18 22:34:25 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.228 2019/06/20 03:31:54 kamil Exp $");
 /*
  * below are all the standard NetBSD system calls, in the 32bit
  * environment, with the necessary conversions to 64bit before calling
  * the real syscall.  anything that needs special attention is handled
  * elsewhere - this file should only contain structure assignment and
  * calls to the original function.
  */
 /*
  * below are all the standard NetBSD system calls, in the 32bit
  * environment, with the necessary conversions to 64bit before calling
  * the real syscall.  anything that needs special attention is handled
 @@ -287,28 +287,28 @@ netbsd32_fchdir(struct lwp *l, const str
 	return sys_fchdir(l, &ua, retval);
+}
 int
 netbsd32___mknod50(struct lwp *l, const struct netbsd32___mknod50_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(mode_t) mode;
 		syscallarg(netbsd32_dev_t) dev;
 	} */
-	return do_sys_mknod(l, SCARG_P32(uap, path), SCARG(uap, mode),
+	return do_posix_mknodat(l, AT_FDCWD, SCARG_P32(uap, path),
-	    SCARG(uap, dev), UIO_USERSPACE);
+	    SCARG(uap, mode), SCARG(uap, dev));
+}
 int
 netbsd32_chmod(struct lwp *l, const struct netbsd32_chmod_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(mode_t) mode;
 	} */
 	struct sys_chmod_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TO64_UAP(mode);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_syscalls.c,v 1.530 2019/06/19 14:16:06 kamil Exp $	*/
+/*	$NetBSD: vfs_syscalls.c,v 1.531 2019/06/20 03:31:54 kamil Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -60,27 +60,27 @@
  * 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.
+ *
  *	@(#)vfs_syscalls.c	8.42 (Berkeley) 7/31/95
  */
 /*
  * Virtual File System System Calls
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.530 2019/06/19 14:16:06 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.531 2019/06/20 03:31:54 kamil Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_fileassoc.h"
 #include "veriexec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/fcntl.h>
 @@ -2141,57 +2141,71 @@ sys___fhstatvfs140(struct lwp *l, const
 		syscallarg(int)	flags;
 	} */
 	struct statvfs *sb = STATVFSBUF_GET();
 	int error;
 	error = do_fhstatvfs(l, SCARG(uap, fhp), SCARG(uap, fh_size), sb,
 	    SCARG(uap, flags));
 	if (error == 0)
 		error = copyout(sb, SCARG(uap, buf), sizeof(*sb));
 	STATVFSBUF_PUT(sb);
 	return error;
+}
 int
 do_posix_mknodat(struct lwp *l, int fdat, const char *pathname, mode_t mode,
     dev_t dev)
+{
 	if ((mode & S_IFIFO) && dev == 0)
 		return do_sys_mkfifoat(l, fdat, pathname, mode);
 	else if (mode & (S_IFCHR | S_IFBLK))
 		return do_sys_mknodat(l, fdat, pathname, mode, dev,
 		    UIO_USERSPACE);
 	else
 		return EINVAL;
+}
 /*
  * Create a special file.
  */
 /* ARGSUSED */
 int
 sys___mknod50(struct lwp *l, const struct sys___mknod50_args *uap,
     register_t *retval)
+{
 	/* {
 		syscallarg(const char *) path;
 		syscallarg(mode_t) mode;
 		syscallarg(dev_t) dev;
 	} */
-	return do_sys_mknodat(l, AT_FDCWD, SCARG(uap, path),
+	return do_posix_mknodat(l, AT_FDCWD, SCARG(uap, path),
-	    SCARG(uap, mode), SCARG(uap, dev), UIO_USERSPACE);
+	    SCARG(uap, mode), SCARG(uap, dev));
+}
 int
 sys_mknodat(struct lwp *l, const struct sys_mknodat_args *uap,
     register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(const char *) path;
 		syscallarg(mode_t) mode;
 		syscallarg(int) pad;
 		syscallarg(dev_t) dev;
 	} */
-	return do_sys_mknodat(l, SCARG(uap, fd), SCARG(uap, path),
+	return do_posix_mknodat(l, SCARG(uap, fd), SCARG(uap, path),
-	    SCARG(uap, mode), SCARG(uap, dev), UIO_USERSPACE);
+	    SCARG(uap, mode), SCARG(uap, dev));
+}
 int
 do_sys_mknod(struct lwp *l, const char *pathname, mode_t mode, dev_t dev,
     enum uio_seg seg)
+{
 	return do_sys_mknodat(l, AT_FDCWD, pathname, mode, dev, seg);
+}
 int
 do_sys_mknodat(struct lwp *l, int fdat, const char *pathname, mode_t mode,
     dev_t dev, enum uio_seg seg)
+{

 @@ -1,14 +1,14 @@
-/*     $NetBSD: vfs_syscalls.h,v 1.24 2019/06/18 22:34:26 kamil Exp $        */
+/*     $NetBSD: vfs_syscalls.h,v 1.25 2019/06/20 03:31:54 kamil Exp $        */
 /*
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -60,26 +60,27 @@ int do_sys_utimensat(struct lwp *, int,
     const struct timespec *, enum uio_seg);
 struct pathbuf;
 int do_open(struct lwp *, struct vnode *, struct pathbuf *, int, int, int *);
 int	vfs_copyinfh_alloc(const void *, size_t, fhandle_t **);
 void	vfs_copyinfh_free(fhandle_t *);
 int dofhopen(struct lwp *, const void *, size_t, int, register_t *);
 int	do_sys_linkat(struct lwp *, int, const char *, int, const char *, int, register_t *);
 int	do_sys_unlink(const char *, enum uio_seg);
 int	do_sys_rename(const char *, const char *, enum uio_seg, int);
 int	do_posix_mknodat(struct lwp *, int, const char *, mode_t, dev_t);
 int	do_sys_mknod(struct lwp *, const char *, mode_t, dev_t, enum uio_seg);
 int	do_sys_mknodat(struct lwp *, int, const char *, mode_t, dev_t, enum uio_seg);
 int	do_sys_chmodat(struct lwp *, int, const char *, int, int);
 int	do_sys_chownat(struct lwp *, int, const char *, uid_t, gid_t, int);
 int	do_sys_accessat(struct lwp *, int, const char *, int ,int);
 int	do_sys_mkdir(const char *, mode_t, enum uio_seg);
 int	do_sys_symlink(const char *, const char *, enum uio_seg);
 int	do_sys_quotactl(const char *, const struct quotactl_args *);
 void	do_sys_sync(struct lwp *);
 int	chdir_lookup(const char *, int, struct vnode **, struct lwp *);
 void	change_root(struct cwdinfo *, struct vnode *, struct lwp *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_mkfifoat.c,v 1.4 2017/01/14 20:55:26 christos Exp $ */
+/*	$NetBSD: t_mkfifoat.c,v 1.5 2019/06/20 03:31:53 kamil Exp $ */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Emmanuel Dreyfus.
+ *
  * 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.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS 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.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mkfifoat.c,v 1.4 2017/01/14 20:55:26 christos Exp $");
+__RCSID("$NetBSD: t_mkfifoat.c,v 1.5 2019/06/20 03:31:53 kamil Exp $");
 #include <atf-c.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <paths.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #define DIR "dir"
 @@ -98,23 +98,50 @@ ATF_TC_HEAD(mkfifoat_fderr, tc)
 	atf_tc_set_md_var(tc, "descr", "See that mkfifoat fails with fd as -1");
+}
 ATF_TC_BODY(mkfifoat_fderr, tc)
+{
 	int fd;
 	mode_t mode = 0600;
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FIFO, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 	ATF_REQUIRE(mkfifoat(-1, FIFO, mode) == -1);
+}
 ATF_TC(mknodat_s_ififo);
 ATF_TC_HEAD(mknodat_s_ififo, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Test mknodat(2) with S_IFIFO");
+}
 ATF_TC_BODY(mknodat_s_ififo, tc)
+{
 	struct stat st;
 	int dfd;
 	mode_t mode = S_IFIFO | 0600;
 	(void)memset(&st, 0, sizeof(struct stat));
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(mknodat(dfd, BASEFIFO, mode, 0) != -1);
 	ATF_REQUIRE(access(FIFO, F_OK) == 0);
 	ATF_REQUIRE(stat(FIFO, &st) == 0);
 	if (S_ISFIFO(st.st_mode) == 0)
 		atf_tc_fail("invalid mode from mknodat(2) with S_IFIFO");
 	(void)close(dfd);
+}
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, mkfifoat_fd);
 	ATF_TP_ADD_TC(tp, mkfifoat_fdcwd);
 	ATF_TP_ADD_TC(tp, mkfifoat_fdcwderr);
 	ATF_TP_ADD_TC(tp, mkfifoat_fderr);
 	ATF_TP_ADD_TC(tp, mknodat_s_ififo);
 	return atf_no_error();
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: t_mkfifo.c,v 1.2 2011/11/02 06:04:48 jruoho Exp $ */
+/* $NetBSD: t_mkfifo.c,v 1.3 2019/06/20 03:31:54 kamil Exp $ */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jukka Ruohonen.
+ *
  * 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.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS 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.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mkfifo.c,v 1.2 2011/11/02 06:04:48 jruoho Exp $");
+__RCSID("$NetBSD: t_mkfifo.c,v 1.3 2019/06/20 03:31:54 kamil Exp $");
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <atf-c.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
 @@ -253,24 +253,53 @@ ATF_TC_BODY(mkfifo_stat, tc)
 	ATF_REQUIRE(stat(path, &st) == 0);
 	if (S_ISFIFO(st.st_mode) == 0)
 		atf_tc_fail("invalid mode from mkfifo(2)");
 	ATF_REQUIRE(unlink(path) == 0);
+}
 ATF_TC_CLEANUP(mkfifo_stat, tc)
+{
 	(void)unlink(path);
+}
 ATF_TC_WITH_CLEANUP(mknod_s_ififo);
 ATF_TC_HEAD(mknod_s_ififo, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Test mknod(2) with S_IFIFO");
+}
 ATF_TC_BODY(mknod_s_ififo, tc)
+{
 	struct stat st;
 	support();
 	(void)memset(&st, 0, sizeof(struct stat));
 	ATF_REQUIRE(mknod(path, S_IFIFO | 0600, 0) == 0);
 	ATF_REQUIRE(stat(path, &st) == 0);
 	if (S_ISFIFO(st.st_mode) == 0)
 		atf_tc_fail("invalid mode from mknod(2) with S_IFIFO");
 	ATF_REQUIRE(unlink(path) == 0);
+}
 ATF_TC_CLEANUP(mknod_s_ififo, tc)
+{
 	(void)unlink(path);
+}
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, mkfifo_block);
 	ATF_TP_ADD_TC(tp, mkfifo_err);
 	ATF_TP_ADD_TC(tp, mkfifo_nonblock);
 	ATF_TP_ADD_TC(tp, mkfifo_perm);
 	ATF_TP_ADD_TC(tp, mkfifo_stat);
 	ATF_TP_ADD_TC(tp, mknod_s_ififo);
 	return atf_no_error();
+}