open.c: Back out part of last Netlib update affecting scratch files which clashed...

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

diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index b3093beb6180da6654d7d21671c134c56bda5497..0b3dcbde7ab0b539a485dc0dc82cfbb712aaf696 100644 (file)
--- 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 29b7662b106adf9b350cb8bd0521b51ec153d7f5..ad039f6d895ac22afed4522cfc687d0a00e3bd47 100644 (file)
--- 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);
        }