From f2c0a16db0853c1d0a9e298c141552dba95acb7c Mon Sep 17 00:00:00 2001
From: fxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 2 Sep 2005 20:24:49 +0000
Subject: [PATCH] * io/unix.c (stream_ttyname): Protect use of ttyname
by HAVE_TTYNAME macro. * configure.ac: Add check for ttyname. *
config.h.in: Regenerate. * configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@103794 138bc75d-0d04-0410-961f-82ee72b054a4
---
libgfortran/ChangeLog | 8 ++++++++
libgfortran/config.h.in | 3 +++
libgfortran/configure | 3 ++-
libgfortran/configure.ac | 2 +-
libgfortran/io/unix.c | 4 ++++
5 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 1dd69cb28445..a2dba91b4db4 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-02 Francois-Xavier Coudert <coudert@clipper.ens.fr>
+
+ * io/unix.c (stream_ttyname): Protect use of ttyname by
+ HAVE_TTYNAME macro.
+ * configure.ac: Add check for ttyname.
+ * config.h.in: Regenerate.
+ * configure: Regenerate.
+
2005-09-02 Andreas Jaeger <aj@suse.de>
* libgfortran.h: Add prototype for init_compile_options.
diff --git a/libgfortran/config.h.in b/libgfortran/config.h.in
index c84938e08094..bc110c9fffaf 100644
--- a/libgfortran/config.h.in
+++ b/libgfortran/config.h.in
@@ -288,6 +288,9 @@
/* libm includes truncf */
#undef HAVE_TRUNCF
+/* Define to 1 if you have the `ttyname' function. */
+#undef HAVE_TTYNAME
+
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
diff --git a/libgfortran/configure b/libgfortran/configure
index 293fe0d53ef7..6b6df14c4f90 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -7409,7 +7409,8 @@ done
-for ac_func in sleep time
+
+for ac_func in sleep time ttyname
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
index 41dc7e67b544..8968d45bf3a4 100644
--- a/libgfortran/configure.ac
+++ b/libgfortran/configure.ac
@@ -171,7 +171,7 @@ AC_CHECK_LIB([m],[csin],[need_math="no"],[need_math="yes"])
# Check for library functions.
AC_CHECK_FUNCS(getrusage times mkstemp strtof strtold snprintf ftruncate chsize)
AC_CHECK_FUNCS(chdir strerror getlogin gethostname kill link symlink perror)
-AC_CHECK_FUNCS(sleep time)
+AC_CHECK_FUNCS(sleep time ttyname)
# Check libc for getgid, getpid, getuid
AC_CHECK_LIB([c],[getgid],[AC_DEFINE([HAVE_GETGID],[1],[libc includes getgid])])
diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c
index a0ed7b645105..69101efff043 100644
--- a/libgfortran/io/unix.c
+++ b/libgfortran/io/unix.c
@@ -1548,7 +1548,11 @@ stream_isatty (stream *s)
char *
stream_ttyname (stream *s)
{
+#ifdef HAVE_TTYNAME
return ttyname (((unix_stream *) s)->fd);
+#else
+ return NULL;
+#endif
}
--
GitLab