diff options
| author | Francois-Xavier Coudert <coudert@clipper.ens.fr> | 2005-09-02 22:24:49 +0200 |
|---|---|---|
| committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2005-09-02 20:24:49 +0000 |
| commit | 8845001b6c4505809a171c3f37790efd1335e7f7 (patch) | |
| tree | 61e8eb1482c52d0c9d9c31ada709617af410ff4e | |
| parent | b107d7437b09d209d217b102c40ca45f81bc844b (diff) | |
| download | gcc-8845001b6c4505809a171c3f37790efd1335e7f7.zip gcc-8845001b6c4505809a171c3f37790efd1335e7f7.tar.gz gcc-8845001b6c4505809a171c3f37790efd1335e7f7.tar.bz2 | |
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
| -rw-r--r-- | libgfortran/ChangeLog | 8 | ||||
| -rw-r--r-- | libgfortran/config.h.in | 3 | ||||
| -rwxr-xr-x | libgfortran/configure | 3 | ||||
| -rw-r--r-- | libgfortran/configure.ac | 2 | ||||
| -rw-r--r-- | libgfortran/io/unix.c | 4 |
5 files changed, 18 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 1dd69cb..a2dba91 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 c84938e..bc110c9 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 293fe0d..6b6df14 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 41dc7e6..8968d45 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 a0ed7b6..69101ef 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 } |