aboutsummaryrefslogtreecommitdiff
path: root/stdio-common/bug7.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-01-24 02:23:54 +0000
committerUlrich Drepper <drepper@redhat.com>1997-01-24 02:23:54 +0000
commit9d187dd4ad11f857386881db032d7e71ad26f47c (patch)
treedacaae8468e5cf69ffda0ef4b299472f429add8a /stdio-common/bug7.c
parent8d57beeab10d2afd72e2e3bc6b1ad4695b791955 (diff)
downloadglibc-9d187dd4ad11f857386881db032d7e71ad26f47c.zip
glibc-9d187dd4ad11f857386881db032d7e71ad26f47c.tar.gz
glibc-9d187dd4ad11f857386881db032d7e71ad26f47c.tar.bz2
update from main archive 970122cvs/libc-970124
1997-01-23 Paul Eggert <eggert@twinsun.com> * mktime.c (mktime): Invoke __tzset, not __tzset_internal, to set tz, so that tzname is set as POSIX requires. Fri Jan 24 02:49:18 1997 Ulrich Drepper <drepper@cygnus.com> * dirent/dirent.h: Declare readdir_r also when __USE_POSIX. * grp/grp.h: Declare *_r functions also when __USE_POSIX. * pwd/pwd.h: Likewise. * time/time.h: Likewise. * posix/unistd.h: Declare ttyname_r also when __USE_POSIX. * string/string.h: Declare strtok_r also when __USE_POSIX. * stdio-common/bug7.c: Use tmpnam to generate names for test files. * stdio-common/tmpnam.c: Update copyright. * stdio-common/tmpnam_r.c: Likewise. * sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h: Protect against multiple inclusion. Include <termbits.h>. * sysdeps/unix/sysv/linux/sys/kernel_termios.h: Likewise. * sysdeps/unix/sysv/linux/net/if.h: Update according to recent kernel headers. Patch by Philip Blundell <pjb27@cam.ac.uk>. Thu Jan 23 17:42:00 1997 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sparc/clone.S: Correct author attribution. * sysdeps/unix/sysv/linux/net/if_arp (MAX_ADDR_LEN): Add definition. Thu Jan 23 14:20:34 1997 Ulrich Drepper <drepper@cygnus.com> * time/tzfile.c (__tzfile_read): Don't allow arbitrary files to be read when running a setuid program.
Diffstat (limited to 'stdio-common/bug7.c')
-rw-r--r--stdio-common/bug7.c72
1 files changed, 42 insertions, 30 deletions
diff --git a/stdio-common/bug7.c b/stdio-common/bug7.c
index 7b320ae..2b1efe3 100644
--- a/stdio-common/bug7.c
+++ b/stdio-common/bug7.c
@@ -6,50 +6,62 @@ int
main (int argc, char *argv[])
{
int lose = 0;
- char filename[] = "/tmp/foo";
+ char filename[L_tmpnam];
FILE *fp;
- fp = fopen (filename, "w+");
- fprintf (fp, "Hello world!\n");
- fflush (fp);
- fseek (fp, 5L, SEEK_SET);
- if (fseek (fp, -1L, SEEK_CUR) < 0)
+ if (tmpnam (filename) == NULL)
{
- printf ("seek failed\n");
+ printf ("tmpnam failed\n");
lose = 1;
}
- fclose (fp);
- remove (filename);
+ else
+ {
+ fp = fopen (filename, "w+");
+ fprintf (fp, "Hello world!\n");
+ fflush (fp);
+ fseek (fp, 5L, SEEK_SET);
+ if (fseek (fp, -1L, SEEK_CUR) < 0)
+ {
+ printf ("seek failed\n");
+ lose = 1;
+ }
+ fclose (fp);
+ remove (filename);
+ }
{
FILE *file1;
FILE *file2;
- char filename1[] = "/tmp/foo";
- char filename2[] = "/tmp/bar";
+ char filename1[L_tmpnam];
+ char filename2[L_tmpnam];
int ch;
- file1 = fopen (filename1, "w");
- fclose (file1);
-
- file2 = fopen (filename2, "w");
- fputc ('x', file2);
- fclose (file2);
-
- file1 = fopen (filename1, "r");
- file2 = freopen (filename2, "r", file1);
- if ((ch = fgetc (file2)) != 'x')
+ if (tmpnam (filename1) == NULL || tmpnam (filename2) == NULL)
{
- printf ("wrong character in reopened file, value = %d\n", ch);
+ printf ("tmpnam failed\n");
lose = 1;
}
-#if 0
- /* Hey, how did this ever worked? `file1' is already closed!!!
- -- drepper@gnu */
- fclose (file1);
-#endif
- fclose (file2);
- remove (filename1);
- remove (filename2);
+ else
+ {
+
+ file1 = fopen (filename1, "w");
+ fclose (file1);
+
+ file2 = fopen (filename2, "w");
+ fputc ('x', file2);
+ fclose (file2);
+
+ file1 = fopen (filename1, "r");
+ file2 = freopen (filename2, "r", file1);
+ if ((ch = fgetc (file2)) != 'x')
+ {
+ printf ("wrong character in reopened file, value = %d\n", ch);
+ lose = 1;
+ }
+ fclose (file2);
+ remove (filename1);
+ remove (filename2);
+ }
}
puts (lose ? "Test FAILED!" : "Test succeeded.");