From 7b6dad7dcd048e65b4191b38e370d1f8a2424ab1 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Sat, 11 Dec 2004 15:50:12 +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. --- ChangeLog | 5 +++++ configure.ac | 9 +++++++++ gpgme/ChangeLog | 6 ++++++ gpgme/util.h | 4 ++++ 4 files changed, 24 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3b14f76c..2e70aa46 100644 --- a/ChangeLog +++ b/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/configure.ac b/configure.ac index 3fed5e50..a1e9bf76 100644 --- a/configure.ac +++ b/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/gpgme/ChangeLog b/gpgme/ChangeLog index be8782f6..a5aa3a35 100644 --- a/gpgme/ChangeLog +++ b/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/gpgme/util.h b/gpgme/util.h index 0a6f684a..0434208d 100644 --- a/gpgme/util.h +++ b/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