From 835698b72bc509565aad52b0753f1c56c1a8f062 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 20 Nov 2012 19:01:13 +0100 Subject: Do not use a broken ttyname. * configure.ac (HAVE_BROKEN_TTYNAME): New ac_define set for Android systems. * common/util.h (gnupg_ttyname): New macro. Change all callers of ttyname to use this macro instead. (ttyname) [W32]: Rename to _gnupg_ttyname and use also if HAVE_BROKEN_TTYNAME is defined. * common/simple-pwquery.c (agent_send_all_options): Keep on using ttyname unless HAVE_BROKEN_TTYNAME is set. This is because this file may be used standalone. --- sm/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sm/misc.c') diff --git a/sm/misc.c b/sm/misc.c index 4c6293fc2..ec9f97e02 100644 --- a/sm/misc.c +++ b/sm/misc.c @@ -57,7 +57,7 @@ setup_pinentry_env (void) { log_error (_("GPG_TTY has not been set - " "using maybe bogus default\n")); - lc = ttyname (0); + lc = gnupg_ttyname (0); if (!lc) lc = "/dev/tty"; gnupg_setenv ("GPG_TTY", lc, 1); -- cgit v1.2.3