@@ -1,22 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
- *
- * Copyright (c) International Business Machines Corp., 2002
- * ported from SPIE, section2/iosuite/dup3.c, by Airong Zhang
- * Copyright (c) 2013 Cyril Hrubis <chrubis@suse.cz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (c) International Business Machines Corp., 2002
+ * ported from SPIE, section2/iosuite/dup3.c, by Airong Zhang
+ * Copyright (c) 2013 Cyril Hrubis <chrubis@suse.cz>
*/
/*
@@ -27,116 +13,52 @@
HOW: Creat a file with each access mode; dup each file descriptor;
stat each file descriptor and compare mode of each pair
*/
+/*\
+ * [Description]
+ *
+ * Verify that the file descriptor created by dup(2) syscall has the same
+ * access mode as the old one.
+ */
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "test.h"
-
-char *TCID = "dup07";
-int TST_TOTAL = 3;
+#include "tst_test.h"
static const char *testfile = "dup07";
-static void setup(void);
-static void cleanup(void);
+static struct tcase {
+ char *mode_desc;
+ int mode;
+} tcases[] = {
+ {"read only", 0444},
+ {"write only", 0222},
+ {"read/write", 0666},
+};
-int main(int ac, char **av)
+static void run(unsigned int n)
{
- struct stat retbuf;
- struct stat dupbuf;
- int rdoret, wroret, rdwret;
- int duprdo, dupwro, duprdwr;
-
- int lc;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- if ((rdoret = creat(testfile, 0444)) == -1) {
- tst_resm(TFAIL, "Unable to creat file '%s'", testfile);
+ int oldfd, dupfd;
+ struct stat oldbuf, dupbuf;
+ struct tcase *tc = &tcases[n];
+
+ oldfd = SAFE_CREAT(testfile, tc->mode);
+ dupfd = TST_EXP_FD_SILENT(dup(oldfd), "dup() %s file", tc->mode_desc);
+ if (TST_PASS) {
+ SAFE_FSTAT(oldfd, &oldbuf);
+ SAFE_FSTAT(dupfd, &dupbuf);
+
+ if (oldbuf.st_mode != dupbuf.st_mode) {
+ tst_res(TFAIL, "%s and dup do not match", tc->mode_desc);
} else {
- if ((duprdo = dup(rdoret)) == -1) {
- tst_resm(TFAIL, "Unable to dup '%s'", testfile);
- } else {
- fstat(rdoret, &retbuf);
- fstat(duprdo, &dupbuf);
- if (retbuf.st_mode != dupbuf.st_mode) {
- tst_resm(TFAIL,
- "rdonly and dup do not match");
- } else {
- tst_resm(TPASS,
- "Passed in read mode.");
- }
- close(duprdo);
- }
- close(rdoret);
+ tst_res(TPASS, "Passed in %s mode.", tc->mode_desc);
}
-
- unlink(testfile);
-
- if ((wroret = creat(testfile, 0222)) == -1) {
- tst_resm(TFAIL, "Unable to creat file '%s'", testfile);
- } else {
- if ((dupwro = dup(wroret)) == -1) {
- tst_resm(TFAIL, "Unable to dup '%s'", testfile);
- } else {
- fstat(wroret, &retbuf);
- fstat(dupwro, &dupbuf);
- if (retbuf.st_mode != dupbuf.st_mode) {
- tst_resm(TFAIL,
- "wronly and dup do not match");
- } else {
- tst_resm(TPASS,
- "Passed in write mode.");
- }
- close(dupwro);
- }
- close(wroret);
-
- }
-
- unlink(testfile);
-
- if ((rdwret = creat(testfile, 0666)) == -1) {
- tst_resm(TFAIL, "Unable to creat file '%s'", testfile);
- } else {
- if ((duprdwr = dup(rdwret)) == -1) {
- tst_resm(TFAIL, "Unable to dup '%s'", testfile);
- } else {
- fstat(rdwret, &retbuf);
- fstat(duprdwr, &dupbuf);
- if (retbuf.st_mode != dupbuf.st_mode) {
- tst_resm(TFAIL,
- "rdwr and dup do not match");
- } else {
- tst_resm(TPASS,
- "Passed in read/write mode.");
- }
- close(duprdwr);
- }
- close(rdwret);
- }
-
- unlink(testfile);
+ SAFE_CLOSE(dupfd);
}
+ SAFE_CLOSE(oldfd);
- cleanup();
- tst_exit();
-}
-
-static void setup(void)
-{
- tst_tmpdir();
+ SAFE_UNLINK(testfile);
}
-static void cleanup(void)
-{
- tst_rmdir();
-}
+static struct tst_test test = {
+ .needs_tmpdir = 1,
+ .test = run,
+ .tcnt = ARRAY_SIZE(tcases),
+};
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com> --- testcases/kernel/syscalls/dup/dup07.c | 160 +++++++------------------- 1 file changed, 41 insertions(+), 119 deletions(-)