mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 22:10:13 +00:00
5c112f1b62
Various glibc testcases use tmpnam in ways subject to race conditions (generate a temporary file name, then later open that file without O_EXCL). This patch fixes those tests to use mkstemp - generally a minimal local fix to use mkstemp instead of tmpnam, rather than a larger fix to use other testsuite infrastructure for temporary files. The unchanged use of tmpnam in posix/wordexp-test.c would fail safe in the event of a race (it's generating a name for use with mkdir rather than for a file to be opened for writing). Tested for x86_64. * grp/tst_fgetgrent.c: Include <unistd.h>. (main): Use mkstemp instead of tmpnam. * io/test-utime.c (main): Likewise. * posix/annexc.c (macrofile): Change to modifiable array. (get_null_defines): Use mkstemp instead of tmpnam. Do not remove macrofile here. * posix/bug-getopt1.c: Include <stdlib.h>. (do_test): Use mkstemp instead of tmpnam. * posix/bug-getopt2.c: Include <stdlib.h>. (do_test): Use mkstemp instead of tmpnam. * posix/bug-getopt3.c: Include <stdlib.h>. (do_test): Use mkstemp instead of tmpnam. * posix/bug-getopt4.c: Include <stdlib.h>. (do_test): Use mkstemp instead of tmpnam. * posix/bug-getopt5.c: Include <stdlib.h>. (do_test): Use mkstemp instead of tmpnam. * stdio-common/bug7.c: Include <stdlib.h> and <unistd.h>. (main): Use mkstemp instead of tmpnam. * stdio-common/tst-fdopen.c: Include <stdlib.h>. (main): Use mkstemp instead of tmpnam. * stdio-common/tst-ungetc.c: Include <stdlib.h>. (main): use mkstemp instead of tmpnam. * stdlib/isomac.c (macrofile): Change to modifiable array. (get_null_defines): Use mkstemp instead of tmpnam. Do not remove macrofile here.
71 lines
1.3 KiB
C
71 lines
1.3 KiB
C
/* Test for ungetc bugs. */
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
|
|
#undef assert
|
|
#define assert(x) \
|
|
if (!(x)) \
|
|
{ \
|
|
fputs ("test failed: " #x "\n", stderr); \
|
|
retval = 1; \
|
|
goto the_end; \
|
|
}
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
char name[] = "/tmp/tst-ungetc.XXXXXX";
|
|
FILE *fp = NULL;
|
|
int retval = 0;
|
|
int c;
|
|
char buffer[64];
|
|
|
|
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);
|
|
fclose (fp);
|
|
fp = NULL;
|
|
|
|
fp = fopen (name, "r");
|
|
assert (fp != NULL);
|
|
assert (ungetc ('z', fp) == 'z');
|
|
assert (getc (fp) == 'z');
|
|
assert (getc (fp) == 'b');
|
|
assert (getc (fp) == 'l');
|
|
assert (ungetc ('m', fp) == 'm');
|
|
assert (getc (fp) == 'm');
|
|
assert ((c = getc (fp)) == 'a');
|
|
assert (getc (fp) == EOF);
|
|
assert (ungetc (c, fp) == c);
|
|
assert (feof (fp) == 0);
|
|
assert (getc (fp) == c);
|
|
assert (getc (fp) == EOF);
|
|
fclose (fp);
|
|
fp = NULL;
|
|
|
|
fp = fopen (name, "r");
|
|
assert (fp != NULL);
|
|
assert (getc (fp) == 'b');
|
|
assert (getc (fp) == 'l');
|
|
assert (ungetc ('b', fp) == 'b');
|
|
assert (fread (buffer, 1, 64, fp) == 2);
|
|
assert (buffer[0] == 'b');
|
|
assert (buffer[1] == 'a');
|
|
|
|
the_end:
|
|
if (fp != NULL)
|
|
fclose (fp);
|
|
unlink (name);
|
|
|
|
return retval;
|
|
}
|