 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_vnops.c,v 1.61 2021/09/16 21:29:42 andvar Exp $	*/
+/*	$NetBSD: t_vnops.c,v 1.62 2022/02/01 18:27:24 martin Exp $	*/
 /*-
  * Copyright (c) 2010 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.
 @@ -165,26 +165,65 @@ dir_simple(const atf_tc_t *tc, const cha
 	if (rump_sys_mkdir(pb, 0777) == -1)
 		atf_tc_fail_errno("mkdir");
 	if (rump_sys_stat(pb, &sb) == -1)
 		atf_tc_fail_errno("stat new directory");
 	/* check we can remove then and that it makes them unreachable */
 	if (rump_sys_rmdir(pb) == -1)
 		atf_tc_fail_errno("rmdir");
 	if (rump_sys_stat(pb, &sb) != -1 || errno != ENOENT)
 		atf_tc_fail("ENOENT expected from stat");
+}
 static void
 do_dir_slash(const atf_tc_t *tc, const char *mountpath, const char *addend)
+{
 	char plain[MAXPATHLEN], with_slash[MAXPATHLEN];
 	struct stat sb;
 	USES_DIRS;
 	/* check we can create directories with one or more / appended */
 	snprintf(plain, sizeof(plain), "%s/dir%s", mountpath, addend);
 	snprintf(with_slash, sizeof(with_slash), "%s/dir/", mountpath);
 	if (rump_sys_mkdir(with_slash, 0777) == -1)
 		atf_tc_fail_errno("mkdir");
 	if (rump_sys_stat(plain, &sb) == -1)
 		atf_tc_fail_errno("stat new directory");
 	if (rump_sys_rmdir(plain) == -1)
 		atf_tc_fail_errno("rmdir");
 	if (rump_sys_stat(with_slash, &sb) != -1 || errno != ENOENT)
 		atf_tc_fail("ENOENT expected from stat");
+}
 static void
 dir_slash(const atf_tc_t *tc, const char *mountpath)
+{
 	do_dir_slash(tc, mountpath, "/");
+}
 static void
 dir_2slash(const atf_tc_t *tc, const char *mountpath)
+{
 	do_dir_slash(tc, mountpath, "//");
+}
 static void
 dir_3slash(const atf_tc_t *tc, const char *mountpath)
+{
 	do_dir_slash(tc, mountpath, "///");
+}
 static void
 dir_notempty(const atf_tc_t *tc, const char *mountpath)
+{
 	char pb[MAXPATHLEN], pb2[MAXPATHLEN];
 	int fd, rv;
 	USES_DIRS;
 	/* check we can create directories */
 	snprintf(pb, sizeof(pb), "%s/dir", mountpath);
 	if (rump_sys_mkdir(pb, 0777) == -1)
 		atf_tc_fail_errno("mkdir");
 	snprintf(pb2, sizeof(pb2), "%s/dir/file", mountpath);
 @@ -1016,26 +1055,29 @@ lstat_symlink(const atf_tc_t *tc, const
 	ATF_REQUIRE(res != -1);
 	res = rump_sys_lstat(dst, &st);
 	ATF_REQUIRE(res != -1);
 	ATF_CHECK(S_ISLNK(st.st_mode) != 0);
 	ATF_CHECK(st.st_size == (off_t)strlen(src));
 	FSTEST_EXIT();
+}
 ATF_TC_FSAPPLY(lookup_simple, "simple lookup (./.. on root)");
 ATF_TC_FSAPPLY(lookup_complex, "lookup of non-dot entries");
 ATF_TC_FSAPPLY(dir_simple, "mkdir/rmdir");
 ATF_TC_FSAPPLY(dir_slash, "mkdir with appended slash");
 ATF_TC_FSAPPLY(dir_2slash, "mkdir with two slashes appended");
 ATF_TC_FSAPPLY(dir_3slash, "mkdir with three slashes appended");
 ATF_TC_FSAPPLY(dir_notempty, "non-empty directories cannot be removed");
 ATF_TC_FSAPPLY(dir_rmdirdotdot, "remove .. and try to cd out (PR kern/44657)");
 ATF_TC_FSAPPLY(rename_dir, "exercise various directory renaming ops "
 "(PR kern/44288)");
 ATF_TC_FSAPPLY(rename_dotdot, "rename dir .. (PR kern/43617)");
 ATF_TC_FSAPPLY(rename_reg_nodir, "rename regular files, no subdirectories");
 ATF_TC_FSAPPLY(create_nametoolong, "create file with name too long");
 ATF_TC_FSAPPLY(create_exist, "create with O_EXCL");
 ATF_TC_FSAPPLY(rename_nametoolong, "rename to file with name too long");
 ATF_TC_FSAPPLY(symlink_zerolen, "symlink with target of length 0");
 ATF_TC_FSAPPLY(symlink_long, "symlink with target of length > 0");
 ATF_TC_FSAPPLY(symlink_root, "symlink to root directory");
 ATF_TC_FSAPPLY(attrs, "check setting attributes works");
 @@ -1048,26 +1090,29 @@ ATF_TC_FSAPPLY(lstat_symlink, "lstat(2)
 #undef FSTEST_IMGSIZE
 #define FSTEST_IMGSIZE (1024*1024*64)
 ATF_TC_FSAPPLY(create_many, "create many directory entries");
 ATF_TC_FSAPPLY(create_nonalphanum, "non-alphanumeric filenames");
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_FSAPPLY(lookup_simple);
 	ATF_TP_FSAPPLY(lookup_complex);
 	ATF_TP_FSAPPLY(dir_simple);
 	ATF_TP_FSAPPLY(dir_notempty);
 	ATF_TP_FSAPPLY(dir_rmdirdotdot);
 	ATF_TP_FSAPPLY(dir_slash);
 	ATF_TP_FSAPPLY(dir_2slash);
 	ATF_TP_FSAPPLY(dir_3slash);
 	ATF_TP_FSAPPLY(rename_dir);
 	ATF_TP_FSAPPLY(rename_dotdot);
 	ATF_TP_FSAPPLY(rename_reg_nodir);
 	ATF_TP_FSAPPLY(create_many);
 	ATF_TP_FSAPPLY(create_nonalphanum);
 	ATF_TP_FSAPPLY(create_nametoolong);
 	ATF_TP_FSAPPLY(create_exist);
 	ATF_TP_FSAPPLY(rename_nametoolong);
 	ATF_TP_FSAPPLY(symlink_zerolen);
 	ATF_TP_FSAPPLY(symlink_long);
 	ATF_TP_FSAPPLY(symlink_root);
 	ATF_TP_FSAPPLY(attrs);
 	ATF_TP_FSAPPLY(fcntl_lock);