Mercurial > hg > octave-lyh > gnulib-hg
changeset 13996:2ff78debd520
ttyname_r: Work around bug on OSF/1 5.1.
* doc/posix-functions/ttyname_r.texi: Mention the OSF/1 bug.
* m4/ttyname_r.m4 (gl_FUNC_TTYNAME_R): Detect the OSF/1 bug. Say "no"
instead of "guessing no" when the OSF/1 bug or the Solaris bug is
present.
* lib/ttyname_r.c (ttyname_r): Update comments.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Wed, 22 Dec 2010 17:09:26 +0100 |
parents | a4fd2708338d |
children | 6fa9f46e6153 |
files | ChangeLog doc/posix-functions/ttyname_r.texi lib/ttyname_r.c m4/ttyname_r.m4 |
diffstat | 4 files changed, 28 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-12-22 Bruno Haible <bruno@clisp.org> + + ttyname_r: Work around bug on OSF/1 5.1. + * doc/posix-functions/ttyname_r.texi: Mention the OSF/1 bug. + * m4/ttyname_r.m4 (gl_FUNC_TTYNAME_R): Detect the OSF/1 bug. Say "no" + instead of "guessing no" when the OSF/1 bug or the Solaris bug is + present. + * lib/ttyname_r.c (ttyname_r): Update comments. + 2010-12-22 Bruno Haible <bruno@clisp.org> round: Implement result sign according to IEEE 754.
--- a/doc/posix-functions/ttyname_r.texi +++ b/doc/posix-functions/ttyname_r.texi @@ -19,6 +19,10 @@ This function has an incompatible declaration on some platforms: MacOS X 10.4, Solaris 11 2010-11 (when @code{_POSIX_PTHREAD_SEMANTICS} is not defined). @item +This function ignores the size argument, thus overwriting memory after the +buffer, on some platforms: +OSF/1 5.1. +@item This function refuses to do anything when the output buffer is less than 128 bytes large, on some platforms: Solaris 11 2010-11.
--- a/lib/ttyname_r.c +++ b/lib/ttyname_r.c @@ -32,8 +32,9 @@ /* When ttyname_r exists, use it. */ #if HAVE_TTYNAME_R /* This code is multithread-safe. */ - /* On Solaris, ttyname_r always fails if buflen < 128. So provide a buffer - that is large enough. */ + /* On Solaris, ttyname_r always fails if buflen < 128. On OSF/1 5.1, + ttyname_r ignores the buffer size and assumes the buffer is large enough. + So provide a buffer that is large enough. */ char largerbuf[512]; # if HAVE_POSIXDECL_TTYNAME_R int err =
--- a/m4/ttyname_r.m4 +++ b/m4/ttyname_r.m4 @@ -1,4 +1,4 @@ -# ttyname_r.m4 serial 6 +# ttyname_r.m4 serial 7 dnl Copyright (C) 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -43,6 +43,8 @@ dnl On Solaris 10, both ttyname_r functions (the one with the non-POSIX dnl declaration and the one with the POSIX declaration) refuse to do dnl anything when the output buffer is less than 128 bytes large. + dnl On OSF/1 5.1, ttyname_r ignores the buffer size and assumes the + dnl buffer is large enough. AC_REQUIRE([AC_CANONICAL_HOST]) AC_CACHE_CHECK([whether ttyname_r works with small buffers], [gl_cv_func_ttyname_r_works], @@ -53,6 +55,8 @@ case "$host_os" in # Guess no on Solaris. solaris*) gl_cv_func_ttyname_r_works="guessing no" ;; + # Guess no on OSF/1. + osf*) gl_cv_func_ttyname_r_works="guessing no" ;; # Guess yes otherwise. *) gl_cv_func_ttyname_r_works="guessing yes" ;; esac @@ -70,13 +74,17 @@ fd = open ("/dev/tty", O_RDONLY); if (fd < 0) - result |= 1; + result |= 16; else if (ttyname_r (fd, buf, sizeof (buf)) != 0) - result |= 2; + result |= 17; + else if (ttyname_r (fd, buf, 1) == 0) + result |= 18; return result; }]])], [gl_cv_func_ttyname_r_works=yes], - [:], + [case $? in + 17 | 18) gl_cv_func_ttyname_r_works=no ;; + esac], [:]) ]) case "$gl_cv_func_ttyname_r_works" in