From ba6949f2bfad828a2a892aeca3c2be8655393d2d Mon Sep 17 00:00:00 2001 From: ngie Date: Sun, 28 May 2017 08:52:12 +0000 Subject: [PATCH] Create a deterministic file in the kyua sandbox, instead of a temporary file outside the kyua sandbox This helps ensure that the file is removed at test exit, and as a side effect, cures a warning about umasks with Coverity. MFC after: 3 days Sponsored by: Dell EMC Isilon --- tests/sys/file/ftruncate_test.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/sys/file/ftruncate_test.c b/tests/sys/file/ftruncate_test.c index 79a2c19e5309..e3fd8bd20cd9 100644 --- a/tests/sys/file/ftruncate_test.c +++ b/tests/sys/file/ftruncate_test.c @@ -60,14 +60,14 @@ int main(void) { int error, fd, fds[2], i, read_only_fd; - char path[PATH_MAX]; + char path[] = "ftruncate_file"; struct stat sb; ssize_t size; off_t len; char ch; /* - * Tests using a writable temporary file: grow and then shrink a file + * Tests using a writable file: grow and then shrink a file * using ftruncate and various lengths. Make sure that a negative * file length is rejected. Make sure that when we grow the file, * bytes now in the range of the file size return 0. @@ -75,10 +75,9 @@ main(void) * Save a read-only reference to the file to use later for read-only * descriptor tests. */ - snprintf(path, PATH_MAX, "/tmp/ftruncate.XXXXXXXXXXXXX"); - fd = mkstemp(path); + fd = open(path, O_RDWR|O_CREAT); if (fd < 0) - err(1, "mkstemp"); + err(1, "open(%s, O_RDWR|O_CREAT", path); read_only_fd = open(path, O_RDONLY); if (read_only_fd < 0) { error = errno;