diff options
| author | Werner Koch <[email protected]> | 2004-10-26 07:50:47 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-10-26 07:50:47 +0000 |
| commit | 3060984dd1edbad22083e36181bcacd0ef90c662 (patch) | |
| tree | b0417d6703935d83fc1cb7dbeb7d4f861f09e34e /g10/passphrase.c | |
| parent | * options.h, g10.c (main), mainproc.c (check_sig_and_print): Rename (diff) | |
| download | gnupg-3060984dd1edbad22083e36181bcacd0ef90c662.tar.gz gnupg-3060984dd1edbad22083e36181bcacd0ef90c662.zip | |
(agent_send_all_options): Try to deduce the ttyname
from stdin.
Diffstat (limited to 'g10/passphrase.c')
| -rw-r--r-- | g10/passphrase.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index 71be74fe8..f87017f10 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -377,9 +377,13 @@ agent_send_all_options (int fd) if (!opt.ttyname) { + const char *tmp; + dft_ttyname = getenv ("GPG_TTY"); - if ((!dft_ttyname || !*dft_ttyname) && tty_get_ttyname ()) - dft_ttyname = tty_get_ttyname (); + if ((!dft_ttyname || !*dft_ttyname) && (tmp=ttyname (0))) + dft_ttyname = tmp; + if ((!dft_ttyname || !*dft_ttyname) && (tmp=tty_get_ttyname ())) + dft_ttyname = tmp; } if (opt.ttyname || dft_ttyname) { |