From c13b76ca6a495cda6e51934a7788f48ca6f3bb0e Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 9 Jan 2003 12:59:25 +0000
Subject: Updated from latest NewPG project

---
 agent/simple-pwquery.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'agent/simple-pwquery.c')

diff --git a/agent/simple-pwquery.c b/agent/simple-pwquery.c
index 5bb08afec..afdc4e2a4 100644
--- a/agent/simple-pwquery.c
+++ b/agent/simple-pwquery.c
@@ -177,9 +177,10 @@ agent_send_all_options (int fd)
         return rc;
     }
 
-  if (ttyname (1))
-    dft_ttyname = ttyname (1);
-  if (dft_ttyname)
+  dft_ttyname = getenv ("GPG_TTY");
+  if ((!dft_ttyname || !*dft_ttyname) && ttyname (0))
+    dft_ttyname = ttyname (0);
+  if (dft_ttyname && *dft_ttyname)
     {
       if ((rc=agent_send_option (fd, "ttyname", dft_ttyname)))
         return rc;
-- 
cgit v1.2.3