diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index c66c0aaeed396c58bf9813c107573e4b3f45cb38..3e890556c43b3829b93a2e0179b03f95e320c3fb 100644
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 28 15:32:15 1998 Craig Burley <burley@gnu.org>
+
+ * libI77/open.c (f_open): Use sizeof(buf) instead of
+ 256, for the usual reasons.
+
Tue Dec 23 22:56:01 1997 Craig Burley <burley@gnu.org>
* libF77/signal_.c (G77_signal_0): Return type is
@@ -9,6 +14,17 @@ Wed Oct 29 01:01:04 1997 Mumit Khan <khan@brahma.xraylith.wisc.edu>
* configure.in: Set CC to CC_FOR_TARGET when cross-compiling.
+Fri Oct 24 11:15:22 1997 Mumit Khan <khan@brahma.xraylith.wisc.edu>
+
+ * libI77/close.c (f_exit): Reset f__init so that f_clos does not
+ (incorrectly) think there is an I/O recursion when program is
+ interrupted.
+
+Wed Oct 15 10:06:29 1997 Richard Henderson <rth@cygnus.com>
+
+ * libI77/fio.h: Include <string.h> if STDC_HEADERS.
+ * libU77/chmod_.c: Likewise.
+
Tue Sep 30 00:41:39 1997 Craig Burley <burley@gnu.ai.mit.edu>
Do a better job of printing the offending FORMAT string
@@ -532,6 +548,12 @@ Thu Oct 31 22:27:45 1996 Craig Burley <burley@gnu.ai.mit.edu>
* libI77/Version.c: Use <stdio.h>, not "stdio.h".
* libF77/Version.c: Likewise.
+1997-10-03 Dave Love <d.love@dl.ac.uk>
+
+ * configure.in: Check for tempnam (best because it obeys TMPDIR).
+ * libI77/open.c: Use it.
+ * libI77/err.c: New message # 132.
+
Wed Aug 28 13:25:29 1996 Dave Love <d.love@dl.ac.uk>
* libI77/rsne.c (x_rsne): Use size_t instead of int.
diff --git a/libf2c/configure b/libf2c/configure
index 0748196a32e2de67b4bc4599a39ac01c20d36642..e35980d11c16edb63d3aa719f640721e5e90f874 100755
--- a/libf2c/configure
+++ b/libf2c/configure
@@ -1567,24 +1567,80 @@ fi
+for ac_func in tempnam
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:1574: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1579 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:1602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+
# posix will guarantee the right behaviour for sprintf, else we can't be
# sure; HEADER_STDC wouldn't be the right check in sunos4, for instance.
# However, on my sunos4/gcc setup unistd.h leads us wrongly to believe
# we're posix-conformant, so always do the test.
echo $ac_n "checking for ansi/posix sprintf result""... $ac_c" 1>&6
-echo "configure:1576: checking for ansi/posix sprintf result" >&5
+echo "configure:1632: checking for ansi/posix sprintf result" >&5
if test "$cross_compiling" = yes; then
g77_cv_sys_sprintf_ansi=no
else
cat > conftest.$ac_ext <<EOF
-#line 1581 "configure"
+#line 1637 "configure"
#include "confdefs.h"
#include <stdio.h>
/* does sprintf return the number of chars transferred? */
main () {char foo[2]; (sprintf(foo, "1") == 1) ? exit(0) : exit(1);}
EOF
-if { (eval echo configure:1588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
g77_cv_sys_sprintf_ansi=yes
else
@@ -1618,9 +1674,9 @@ fi
# define NON_ANSI_RW_MODES on unix (can't hurt)
echo $ac_n "checking NON_ANSI_RW_MODES""... $ac_c" 1>&6
-echo "configure:1622: checking NON_ANSI_RW_MODES" >&5
+echo "configure:1678: checking NON_ANSI_RW_MODES" >&5
cat > conftest.$ac_ext <<EOF
-#line 1624 "configure"
+#line 1680 "configure"
#include "confdefs.h"
#ifdef unix
yes
@@ -1661,14 +1717,14 @@ fi
# (via com.h). proj.h and com.h are in $srcdir/.., config.h which they need
# is in ../.. and the config files are in $srcdir/../../config.
echo $ac_n "checking f2c integer type""... $ac_c" 1>&6
-echo "configure:1665: checking f2c integer type" >&5
+echo "configure:1721: checking f2c integer type" >&5
late_ac_cpp=$ac_cpp
ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../gcc/config"
if eval "test \"`echo '$''{'g77_cv_sys_f2cinteger'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1672 "configure"
+#line 1728 "configure"
#include "confdefs.h"
#include "proj.h"
#define FFECOM_DETERMINE_TYPES 1
@@ -1691,7 +1747,7 @@ rm -f conftest*
if test "$g77_cv_sys_f2cinteger" = ""; then
cat > conftest.$ac_ext <<EOF
-#line 1695 "configure"
+#line 1751 "configure"
#include "confdefs.h"
#include "proj.h"
#define FFECOM_DETERMINE_TYPES 1
@@ -1726,14 +1782,14 @@ ac_cpp=$late_ac_cpp
echo $ac_n "checking f2c long int type""... $ac_c" 1>&6
-echo "configure:1730: checking f2c long int type" >&5
+echo "configure:1786: checking f2c long int type" >&5
late_ac_cpp=$ac_cpp
ac_cpp="$late_ac_cpp -I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../gcc/config"
if eval "test \"`echo '$''{'g77_cv_sys_f2clongint'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1737 "configure"
+#line 1793 "configure"
#include "confdefs.h"
#include "proj.h"
#define FFECOM_DETERMINE_TYPES 1
@@ -1756,7 +1812,7 @@ rm -f conftest*
if test "$g77_cv_sys_f2clongint" = ""; then
cat > conftest.$ac_ext <<EOF
-#line 1760 "configure"
+#line 1816 "configure"
#include "confdefs.h"
#include "proj.h"
#define FFECOM_DETERMINE_TYPES 1
diff --git a/libf2c/configure.in b/libf2c/configure.in
index f5b127ec2b31b1806dc2afd52f2e1203467c5c99..232b2d43f4018c38e88cf3a16790f19a458f4235 100644
--- a/libf2c/configure.in
+++ b/libf2c/configure.in
@@ -192,6 +192,8 @@ dnl test $ac_cv_func_symlink = yes && SYMLNK=symlnk_.o
dnl test $ac_cv_func_lstat = yes && SYMLNK="$SYMLNK lstat_.o"
dnl AC_SUBST(SYMLNK)
+AC_CHECK_FUNCS(tempnam)
+
# posix will guarantee the right behaviour for sprintf, else we can't be
# sure; HEADER_STDC wouldn't be the right check in sunos4, for instance.
# However, on my sunos4/gcc setup unistd.h leads us wrongly to believe
diff --git a/libf2c/libF77/Version.c b/libf2c/libF77/Version.c
index 7bb09729c4708e65f6d0b0b8750935176bc6c097..4f7df49982c1ff8fa2ca82439554b57dd27d06c3 100644
--- a/libf2c/libF77/Version.c
+++ b/libf2c/libF77/Version.c
@@ -3,7 +3,7 @@ static char junk[] = "\n@(#)LIBF77 VERSION 19970919\n";
/*
*/
-char __G77_LIBF77_VERSION__[] = "0.5.21";
+char __G77_LIBF77_VERSION__[] = "0.5.22";
/*
2.00 11 June 1980. File version.c added to library.
diff --git a/libf2c/libI77/Version.c b/libf2c/libI77/Version.c
index d80ea39de8d6499742a9eb460d6637f5d5355771..6fdf19e4654a48b4028e19b26e7e9432ee42fb52 100644
--- a/libf2c/libI77/Version.c
+++ b/libf2c/libI77/Version.c
@@ -3,7 +3,7 @@ static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 19970916\n";
/*
*/
-char __G77_LIBI77_VERSION__[] = "0.5.22-19970930";
+char __G77_LIBI77_VERSION__[] = "0.5.22";
/*
2.01 $ format added
diff --git a/libf2c/libI77/err.c b/libf2c/libI77/err.c
index 12eb9eed9d6ecc6978ca87a33edc7297cb8ad42e..cb40630059da50d90e7bd4f34b2cd7a3ceae87d3 100644
--- a/libf2c/libI77/err.c
+++ b/libf2c/libI77/err.c
@@ -80,7 +80,8 @@ char *F_err[] =
"'new' file exists", /* 128 */
"can't append to file", /* 129 */
"non-positive record number", /* 130 */
- "I/O started while already doing I/O" /* 131 */
+ "I/O started while already doing I/O", /* 131 */
+ "Temporary file name (TMPDIR?) too long" /* 132 */
};
#define MAXERR (sizeof(F_err)/sizeof(char *)+100)
diff --git a/libf2c/libI77/open.c b/libf2c/libI77/open.c
index b08302b5b2c69697eca8e9abe7ae66e579f0a070..d7e8491df04a8e47090ee1decdb79fe13d19ee62 100644
--- a/libf2c/libI77/open.c
+++ b/libf2c/libI77/open.c
@@ -143,12 +143,20 @@ integer f_open(olist *a)
case 's':
case 'S':
b->uscrtch=1;
+#ifdef HAVE_TEMPNAM /* Allow use of TMPDIR preferentially. */
+ s = tempnam (0, buf);
+ if (strlen (s) >= sizeof (buf))
+ err (a->oerr, 132, "open");
+ (void) strcpy (buf, s);
+ free (s);
+#else /* ! defined (HAVE_TEMPNAM) */
#ifdef _POSIX_SOURCE
tmpnam(buf);
#else
(void) strcpy(buf,"tmp.FXXXXXX");
(void) mktemp(buf);
#endif
+#endif /* ! defined (HAVE_TEMPNAM) */
goto replace;
case 'n':
case 'N':
diff --git a/libf2c/libU77/Version.c b/libf2c/libU77/Version.c
index 0a278382f51d7d45cba4d8c568b0401d7a3ef789..99c58c9231369d92c24342e7b08d37151668622c 100644
--- a/libf2c/libU77/Version.c
+++ b/libf2c/libU77/Version.c
@@ -1,6 +1,6 @@
static char junk[] = "\n@(#) LIBU77 VERSION 19970919\n";
-char __G77_LIBU77_VERSION__[] = "0.5.22-970919";
+char __G77_LIBU77_VERSION__[] = "0.5.22";
#include <stdio.h>