summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Love <fx@gcc.gnu.org>1998-09-30 02:59:33 +0000
committerDave Love <fx@gcc.gnu.org>1998-09-30 02:59:33 +0000
commit18ad46b1a55a3b224e38b5b25f2d406768c0ed29 (patch)
treebc3c77b2842f4df5746d9b34396beef17105da41
parent6382c3cdfd77e914db6fb675720cff6a5624e0ba (diff)
downloadgcc-18ad46b1a55a3b224e38b5b25f2d406768c0ed29.tar.gz
open.c: Back out part of last Netlib update affecting scratch files which clashed with...
1998-09-28 Dave Love <d.love@dl.ac.uk> * libI77/open.c: Back out part of last Netlib update affecting scratch files which clashed with the g77 variations and broke implicit endfile on rewind. From-SVN: r22661
-rw-r--r--libf2c/ChangeLog11
-rw-r--r--libf2c/libI77/open.c14
2 files changed, 8 insertions, 17 deletions
diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index b3093beb618..0b3dcbde7ab 100644
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,12 +1,17 @@
+1998-09-28 Dave Love <d.love@dl.ac.uk>
+
+ * libI77/open.c: Back out part of last Netlib update affecting
+ scratch files which clashed with the g77 variations and broke
+ implicit endfile on rewind.
+
1998-09-21 Dave Love <d.love@dl.ac.uk>
* libI77/Version.c: Update.
Sat Sep 5 23:06:56 1998 Craig Burley <burley@gnu.org>
- * libI77/sfe.c (e_wdfe): Restore resetting of f__init
- before returning, to avoid spurious recursive-I/O
- diagnostic.
+ * libI77/sfe.c (e_wdfe): Set f__init to avoid spurious recursive
+ i/o error from formatted direct i/o.
Tue Sep 1 10:06:06 1998 Craig Burley <burley@gnu.org>
diff --git a/libf2c/libI77/open.c b/libf2c/libI77/open.c
index 29b7662b106..ad039f6d895 100644
--- a/libf2c/libI77/open.c
+++ b/libf2c/libI77/open.c
@@ -205,7 +205,6 @@ integer f_open(olist *a)
case 's':
case 'S':
b->uscrtch=1;
-#ifdef NON_ANSI_STDIO
#ifdef HAVE_TEMPNAM /* Allow use of TMPDIR preferentially. */
s = tempnam (0, buf);
if (strlen (s) >= sizeof (buf))
@@ -221,17 +220,6 @@ integer f_open(olist *a)
#endif
#endif /* ! defined (HAVE_TEMPNAM) */
goto replace;
-#else
- if (!(b->ufd = tmpfile()))
- opnerr(a->oerr,errno,"open");
- b->ufnm = 0;
-#ifndef NON_UNIX_STDIO
- b->uinode = b->udev = -1;
-#endif
- b->useek = 1;
- return 0;
-#endif
-
case 'n':
case 'N':
#ifdef NON_POSIX_STDIO
@@ -246,9 +234,7 @@ integer f_open(olist *a)
/* no break */
case 'r': /* Fortran 90 replace option */
case 'R':
-#ifdef NON_ANSI_STDIO
replace:
-#endif
if (tf = fopen(buf,f__w_mode[0]))
fclose(tf);
}