From c008a15cb65bbedf01bef360a9a9d6b5f3093dbb Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Sat, 11 Dec 2004 15:48:00 +0000 Subject: [PATCH] 2004-12-11 Marcus Brinkmann * configure.ac: Replace ttyname_r if it doesn't exist (and warn in that case). gpgme/ 2004-12-11 Marcus Brinkmann * util.h [HAVE_CONFIG_H && HAVE_TTYNAME_R] (ttyname_r): Define prototype. * ttyname_r.c: New file. --- trunk/ChangeLog | 5 +++++ trunk/configure.ac | 9 +++++++++ trunk/gpgme/ChangeLog | 6 ++++++ trunk/gpgme/ttyname_r.c | 43 +++++++++++++++++++++++++++++++++++++++++ trunk/gpgme/util.h | 4 ++++ 5 files changed, 67 insertions(+) create mode 100644 trunk/gpgme/ttyname_r.c diff --git a/trunk/ChangeLog b/trunk/ChangeLog index 3b14f76..2e70aa4 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -1,3 +1,8 @@ +2004-12-11 Marcus Brinkmann + + * configure.ac: Replace ttyname_r if it doesn't exist (and warn in + that case). + 2004-12-07 Marcus Brinkmann * README: Refer to COPYING.LESSER and "each file" instead of diff --git a/trunk/configure.ac b/trunk/configure.ac index 3fed5e5..a1e9bf7 100644 --- a/trunk/configure.ac +++ b/trunk/configure.ac @@ -171,6 +171,15 @@ if test "$ac_cv_func_vasprintf" != yes; then GNUPG_CHECK_VA_COPY fi +# Try to find a thread-safe version of ttyname(). +AC_REPLACE_FUNCS(ttyname_r) +if test "$ac_cv_func_ttyname_r" != yes; then + AC_MSG_WARN([ +*** +*** ttyname() is not thread-safe and ttyname_r() does not exist +***]) +fi + # Try to find a thread-safe version of getenv(). have_thread_safe_getenv=no jm_GLIBC21 diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 7c3d66f..5cb0b9d 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,3 +1,9 @@ +2004-12-11 Marcus Brinkmann + + * util.h [HAVE_CONFIG_H && HAVE_TTYNAME_R] (ttyname_r): Define + prototype. + * ttyname_r.c: New file. + 2004-12-07 Marcus Brinkmann * putc_unlocked.c, funopen.c: I just claim copyright on these diff --git a/trunk/gpgme/ttyname_r.c b/trunk/gpgme/ttyname_r.c new file mode 100644 index 0000000..2a29306 --- /dev/null +++ b/trunk/gpgme/ttyname_r.c @@ -0,0 +1,43 @@ +/* ttyname_r.c - A ttyname_r() replacement. + Copyright (C) 2003, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + GPGME is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ + +#if HAVE_CONFIG_H +#include +#endif +#include +#include +#include +#include + + +#warning ttyname is not thread-safe, and ttyname_r is missing + +int ttyname_r(int fd, char *buf, size_t buflen) +{ + char *tty; + + tty = ttyname (fd); + if (!tty) + return errno; + + strncpy (buf, tty, buflen); + buf[buflen - 1] = '\0'; + return (strlen (tty) >= buflen) ? ERANGE : 0; +} diff --git a/trunk/gpgme/util.h b/trunk/gpgme/util.h index 0a6f684..0434208 100644 --- a/trunk/gpgme/util.h +++ b/trunk/gpgme/util.h @@ -44,6 +44,10 @@ char *stpcpy (char *a, const char *b); int vasprintf (char **result, const char *format, va_list args); int asprintf (char **result, const char *format, ...); #endif + +#ifndef HAVE_TTYNAME_R +int ttyname_r (int fd, char *buf, size_t buflen); +#endif #endif -- 2.26.2