Commit 8845001b by Francois-Xavier Coudert Committed by François-Xavier Coudert

unix.c (stream_ttyname): Protect use of ttyname by HAVE_TTYNAME macro.

	* 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.

From-SVN: r103794
parent b107d743
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> 2005-09-02 Andreas Jaeger <aj@suse.de>
* libgfortran.h: Add prototype for init_compile_options. * libgfortran.h: Add prototype for init_compile_options.
......
...@@ -288,6 +288,9 @@ ...@@ -288,6 +288,9 @@
/* libm includes truncf */ /* libm includes truncf */
#undef HAVE_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. */ /* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
......
...@@ -7409,7 +7409,8 @@ done ...@@ -7409,7 +7409,8 @@ done
for ac_func in sleep time
for ac_func in sleep time ttyname
do do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5 echo "$as_me:$LINENO: checking for $ac_func" >&5
......
...@@ -171,7 +171,7 @@ AC_CHECK_LIB([m],[csin],[need_math="no"],[need_math="yes"]) ...@@ -171,7 +171,7 @@ AC_CHECK_LIB([m],[csin],[need_math="no"],[need_math="yes"])
# Check for library functions. # Check for library functions.
AC_CHECK_FUNCS(getrusage times mkstemp strtof strtold snprintf ftruncate chsize) 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(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 # Check libc for getgid, getpid, getuid
AC_CHECK_LIB([c],[getgid],[AC_DEFINE([HAVE_GETGID],[1],[libc includes getgid])]) AC_CHECK_LIB([c],[getgid],[AC_DEFINE([HAVE_GETGID],[1],[libc includes getgid])])
......
...@@ -1548,7 +1548,11 @@ stream_isatty (stream *s) ...@@ -1548,7 +1548,11 @@ stream_isatty (stream *s)
char * char *
stream_ttyname (stream *s) stream_ttyname (stream *s)
{ {
#ifdef HAVE_TTYNAME
return ttyname (((unix_stream *) s)->fd); return ttyname (((unix_stream *) s)->fd);
#else
return NULL;
#endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment