diff --git a/ChangeLog b/ChangeLog index b489ce06ad..a678087880 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +2018-07-18 Joseph Myers + + * grp/tst_fgetgrent.c: Include . + (main): Use mkstemp instead of tmpnam. + * io/test-utime.c (main): Likewise. + * posix/annexc.c (macrofile): Change to modifiable array. + (main): Remove macrofile here. + (get_null_defines): Use mkstemp instead of tmpnam. Do not remove + macrofile here. + (check_header): Do not remove macrofile here. + * posix/bug-getopt1.c: Include . + (do_test): Use mkstemp instead of tmpnam. + * posix/bug-getopt2.c: Include . + (do_test): Use mkstemp instead of tmpnam. + * posix/bug-getopt3.c: Include . + (do_test): Use mkstemp instead of tmpnam. + * posix/bug-getopt4.c: Include . + (do_test): Use mkstemp instead of tmpnam. + * posix/bug-getopt5.c: Include . + (do_test): Use mkstemp instead of tmpnam. + * stdio-common/bug7.c: Include and . + (main): Use mkstemp instead of tmpnam. + * stdio-common/tst-fdopen.c: Include . + (main): Use mkstemp instead of tmpnam. + * stdio-common/tst-ungetc.c: Include . + (main): use mkstemp instead of tmpnam. + * stdlib/isomac.c (macrofile): Change to modifiable array. + (main): Remove macrofile here. + (get_null_defines): Use mkstemp instead of tmpnam. Do not remove + macrofile here. + (check_header): Do not remove macrofile here. + 2018-07-18 H.J. Lu * manual/tunables.texi: Document glibc.tune.x86_ibt and diff --git a/grp/tst_fgetgrent.c b/grp/tst_fgetgrent.c index 501ad99727..d612445fed 100644 --- a/grp/tst_fgetgrent.c +++ b/grp/tst_fgetgrent.c @@ -21,6 +21,7 @@ #include #include #include +#include static int errors; @@ -99,7 +100,14 @@ test_fgetgrent (const char *filename) int main (int argc, char *argv[]) { - char *file = tmpnam (NULL); + char file[] = "/tmp/tst_fgetgrent.XXXXXX"; + int fd = mkstemp (file); + if (fd == -1) + { + printf ("mkstemp failed: %m\n"); + return 1; + } + close (fd); int i = 0; if (argc > 1) diff --git a/io/test-utime.c b/io/test-utime.c index 2ad09957db..0ab778e374 100644 --- a/io/test-utime.c +++ b/io/test-utime.c @@ -27,23 +27,17 @@ int main (int argc, char *argv[]) { - char file[L_tmpnam]; + char file[] = "/tmp/test-utime.XXXXXX"; struct utimbuf ut; struct stat st; struct stat stnow; time_t now1, now2; int fd; - if (tmpnam (file) == 0) - { - perror ("tmpnam"); - return 1; - } - - fd = creat (file, 0666); + fd = mkstemp (file); if (fd < 0) { - perror ("creat"); + perror ("mkstemp"); return 1; } close (fd); diff --git a/posix/annexc.c b/posix/annexc.c index fe3a600ed7..66768dbe2a 100644 --- a/posix/annexc.c +++ b/posix/annexc.c @@ -26,7 +26,7 @@ #define HEADER_MAX 256 -static const char *macrofile; +static char macrofile[] = "/tmp/annexc.XXXXXX"; /* . */ static const char *const aio_syms[] = @@ -657,6 +657,8 @@ main (int argc, char *argv[]) for (h = 0; h < NUMBER_OF_HEADERS; ++h) result |= check_header (&headers[h], ignore_list); + remove (macrofile); + /* The test suite should return errors but for now this is not practical. Give a warning and ask the user to correct the bugs. */ return result; @@ -712,7 +714,13 @@ get_null_defines (void) FILE *input; int first = 1; - macrofile = tmpnam (NULL); + int fd = mkstemp (macrofile); + if (fd == -1) + { + printf ("mkstemp failed: %m\n"); + exit (1); + } + close (fd); command = malloc (sizeof fmt + sizeof "/dev/null" + 2 * strlen (CC) + strlen (INC) + strlen (macrofile)); @@ -784,7 +792,6 @@ get_null_defines (void) } result[result_len] = NULL; fclose (input); - remove (macrofile); return (const char **) result; } @@ -879,7 +886,6 @@ check_header (const struct header *header, const char **except) result |= 1; } fclose (input); - remove (macrofile); for (i = 0; i < header->nsyms; ++i) if (found[i] == 0) diff --git a/posix/bug-getopt1.c b/posix/bug-getopt1.c index a47dc7e229..a5a37116d2 100644 --- a/posix/bug-getopt1.c +++ b/posix/bug-getopt1.c @@ -1,6 +1,7 @@ /* BZ 11039 */ #include #include +#include static int one_test (const char *fmt, int argc, char *argv[], int expected[argc - 1]) @@ -39,12 +40,14 @@ one_test (const char *fmt, int argc, char *argv[], int expected[argc - 1]) static int do_test (void) { - char *fname = tmpnam (NULL); - if (fname == NULL) + char fname[] = "/tmp/bug-getopt1.XXXXXX"; + int fd = mkstemp (fname); + if (fd == -1) { - puts ("cannot generate name for temporary file"); + printf ("mkstemp failed: %m\n"); return 1; } + close (fd); if (freopen (fname, "w+", stderr) == NULL) { diff --git a/posix/bug-getopt2.c b/posix/bug-getopt2.c index 93c3035ccd..8f92f0c6ee 100644 --- a/posix/bug-getopt2.c +++ b/posix/bug-getopt2.c @@ -1,6 +1,7 @@ /* BZ 11039 */ #include #include +#include static int one_test (const char *fmt, int argc, char *argv[], int expected[argc - 1]) @@ -37,12 +38,14 @@ one_test (const char *fmt, int argc, char *argv[], int expected[argc - 1]) static int do_test (void) { - char *fname = tmpnam (NULL); - if (fname == NULL) + char fname[] = "/tmp/bug-getopt2.XXXXXX"; + int fd = mkstemp (fname); + if (fd == -1) { - puts ("cannot generate name for temporary file"); + printf ("mkstemp failed: %m\n"); return 1; } + close (fd); if (freopen (fname, "w+", stderr) == NULL) { diff --git a/posix/bug-getopt3.c b/posix/bug-getopt3.c index c3a8cb225b..45a8d3ec3d 100644 --- a/posix/bug-getopt3.c +++ b/posix/bug-getopt3.c @@ -2,6 +2,7 @@ #include #include #include +#include static const struct option opts[] = { @@ -48,12 +49,14 @@ one_test (const char *fmt, int argc, char *argv[], int n, int expected[n], static int do_test (void) { - char *fname = tmpnam (NULL); - if (fname == NULL) + char fname[] = "/tmp/bug-getopt3.XXXXXX"; + int fd = mkstemp (fname); + if (fd == -1) { - puts ("cannot generate name for temporary file"); + printf ("mkstemp failed: %m\n"); return 1; } + close (fd); if (freopen (fname, "w+", stderr) == NULL) { diff --git a/posix/bug-getopt4.c b/posix/bug-getopt4.c index 0956ca57fb..c5e3c1497a 100644 --- a/posix/bug-getopt4.c +++ b/posix/bug-getopt4.c @@ -2,6 +2,7 @@ #include #include #include +#include static const struct option opts[] = { @@ -52,12 +53,14 @@ one_test (const char *fmt, int argc, char *argv[], int n, int expected[n]) static int do_test (void) { - char *fname = tmpnam (NULL); - if (fname == NULL) + char fname[] = "/tmp/bug-getopt4.XXXXXX"; + int fd = mkstemp (fname); + if (fd == -1) { - puts ("cannot generate name for temporary file"); + printf ("mkstemp failed: %m\n"); return 1; } + close (fd); if (freopen (fname, "w+", stderr) == NULL) { diff --git a/posix/bug-getopt5.c b/posix/bug-getopt5.c index ed2639d35b..4f67d9b2ec 100644 --- a/posix/bug-getopt5.c +++ b/posix/bug-getopt5.c @@ -2,6 +2,7 @@ #include #include #include +#include static const struct option opts[] = { @@ -47,12 +48,14 @@ one_test (const char *fmt, int argc, char *argv[], int n, int expected[n]) static int do_test (void) { - char *fname = tmpnam (NULL); - if (fname == NULL) + char fname[] = "/tmp/bug-getopt5.XXXXXX"; + int fd = mkstemp (fname); + if (fd == -1) { - puts ("cannot generate name for temporary file"); + printf ("mkstemp failed: %m\n"); return 1; } + close (fd); if (freopen (fname, "w+", stderr) == NULL) { diff --git a/stdio-common/bug7.c b/stdio-common/bug7.c index 2b1efe3bc6..c9c2ef5139 100644 --- a/stdio-common/bug7.c +++ b/stdio-common/bug7.c @@ -1,21 +1,25 @@ /* Regression test for fseek and freopen bugs. */ #include +#include +#include int main (int argc, char *argv[]) { int lose = 0; - char filename[L_tmpnam]; + char filename[] = "/tmp/bug7.XXXXXX"; FILE *fp; - if (tmpnam (filename) == NULL) + int fd = mkstemp (filename); + if (fd == -1) { - printf ("tmpnam failed\n"); + printf ("mkstemp failed\n"); lose = 1; } else { + close (fd); fp = fopen (filename, "w+"); fprintf (fp, "Hello world!\n"); fflush (fp); @@ -32,17 +36,21 @@ main (int argc, char *argv[]) { FILE *file1; FILE *file2; - char filename1[L_tmpnam]; - char filename2[L_tmpnam]; + char filename1[] = "/tmp/bug7.XXXXXX"; + char filename2[] = "/tmp/bug7.XXXXXX"; int ch; - if (tmpnam (filename1) == NULL || tmpnam (filename2) == NULL) + int fd1 = mkstemp (filename1); + int fd2 = mkstemp (filename2); + if (fd1 == -1 || fd2 == -1) { - printf ("tmpnam failed\n"); + printf ("mkstemp failed\n"); lose = 1; } else { + close (fd1); + close (fd2); file1 = fopen (filename1, "w"); fclose (file1); diff --git a/stdio-common/tst-fdopen.c b/stdio-common/tst-fdopen.c index e70a0cd6a5..136fff5858 100644 --- a/stdio-common/tst-fdopen.c +++ b/stdio-common/tst-fdopen.c @@ -1,6 +1,7 @@ /* Test for fdopen bugs. */ #include +#include #include #include @@ -18,12 +19,18 @@ char buffer[256]; int main (int argc, char *argv[]) { - char *name; + char name[] = "/tmp/tst-fdopen.XXXXXX"; FILE *fp = NULL; int retval = 0; int fd; - name = tmpnam (NULL); + fd = mkstemp (name); + if (fd == -1) + { + printf ("mkstemp failed: %m\n"); + return 1; + } + close (fd); fp = fopen (name, "w"); assert (fp != NULL) fputs ("foobar and baz", fp); diff --git a/stdio-common/tst-ungetc.c b/stdio-common/tst-ungetc.c index 44cf6a6bf6..1344b2b591 100644 --- a/stdio-common/tst-ungetc.c +++ b/stdio-common/tst-ungetc.c @@ -1,6 +1,7 @@ /* Test for ungetc bugs. */ #include +#include #include #undef assert @@ -15,13 +16,19 @@ int main (int argc, char *argv[]) { - char *name; + char name[] = "/tmp/tst-ungetc.XXXXXX"; FILE *fp = NULL; int retval = 0; int c; char buffer[64]; - name = tmpnam (NULL); + int fd = mkstemp (name); + if (fd == -1) + { + printf ("mkstemp failed: %m\n"); + return 1; + } + close (fd); fp = fopen (name, "w"); assert (fp != NULL) fputs ("bla", fp); diff --git a/stdlib/isomac.c b/stdlib/isomac.c index 8abf93185b..0873eaa505 100644 --- a/stdlib/isomac.c +++ b/stdlib/isomac.c @@ -77,7 +77,7 @@ #define HEADER_MAX 256 -static const char *macrofile; +static char macrofile[] = "/tmp/isomac.XXXXXX"; /* ISO C header names including Amendment 1 (without ".h" suffix). */ static char *header[] = @@ -219,6 +219,8 @@ main (int argc, char *argv[]) result |= check_header (file_name, ignore_list); } + remove (macrofile); + /* The test suite should return errors but for now this is not practical. Give a warning and ask the user to correct the bugs. */ return result; @@ -249,7 +251,13 @@ get_null_defines (void) FILE *input; int first = 1; - macrofile = tmpnam (NULL); + int fd = mkstemp (macrofile); + if (fd == -1) + { + printf ("mkstemp failed: %m\n"); + exit (1); + } + close (fd); command = malloc (sizeof fmt + sizeof "/dev/null" + 2 * strlen (CC) + strlen (INC) + strlen (macrofile)); @@ -330,7 +338,6 @@ get_null_defines (void) } result[result_len] = NULL; fclose (input); - remove (macrofile); return (const char **) result; } @@ -439,7 +446,6 @@ check_header (const char *file_name, const char **except) } } fclose (input); - remove (macrofile); return result; }