diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | io/tst-fcntl.c | 18 |
2 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 66a0cce49f..015f564ae2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2015-10-21 Joseph Myers <joseph@codesourcery.com> + * io/tst-fcntl.c (fd): New static variable. + (do_prepare): Open temporary file here.... + (do_test): ...not here. + * io/ftwtest-sh: Also trap on exit to remove temporary files. 2015-10-21 H.J. Lu <hongjiu.lu@intel.com> diff --git a/io/tst-fcntl.c b/io/tst-fcntl.c index dfdb42eea4..8814b17ad3 100644 --- a/io/tst-fcntl.c +++ b/io/tst-fcntl.c @@ -38,6 +38,9 @@ extern int do_test (int argc, char *argv[]); /* Name of the temporary files. */ static char *name; +/* File descriptor to temporary file. */ +static int fd; + void do_prepare (int argc, char *argv[]) { @@ -47,6 +50,13 @@ do_prepare (int argc, char *argv[]) name = malloc (name_len + sizeof ("/fcntlXXXXXX")); mempcpy (mempcpy (name, test_dir, name_len), "/fcntlXXXXXX", sizeof ("/fcntlXXXXXX")); + /* Create the temporary file. */ + fd = mkstemp (name); + if (fd == -1) + { + printf ("cannot open temporary file: %m\n"); + exit (1); + } add_temp_file (name); } @@ -54,20 +64,12 @@ do_prepare (int argc, char *argv[]) int do_test (int argc, char *argv[]) { - int fd; int fd2; int fd3; struct stat64 st; int val; int result = 0; - /* Create the temporary file. */ - fd = mkstemp (name); - if (fd == -1) - { - printf ("cannot open temporary file: %m\n"); - return 1; - } if (fstat64 (fd, &st) != 0) { printf ("cannot stat test file: %m\n"); |