diff options
| author | Werner Koch <[email protected]> | 2012-11-20 18:01:13 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2012-11-20 18:03:49 +0000 |
| commit | 835698b72bc509565aad52b0753f1c56c1a8f062 (patch) | |
| tree | dd5352b45d74cb3ef4b3091dcc16824ce57e4991 /agent | |
| parent | Fix non-portable use of chmod in autogen.sh. (diff) | |
| download | gnupg-835698b72bc509565aad52b0753f1c56c1a8f062.tar.gz gnupg-835698b72bc509565aad52b0753f1c56c1a8f062.zip | |
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.
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/gpg-agent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index b117849c5..32da578f0 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -662,7 +662,7 @@ main (int argc, char **argv ) } if (!err) { - s = ttyname (0); + s = gnupg_ttyname (0); if (s) err = session_env_setenv (opt.startup_env, "GPG_TTY", s); } @@ -984,7 +984,7 @@ main (int argc, char **argv ) } /* Make sure that we have a default ttyname. */ - if (!default_ttyname && ttyname (1)) + if (!default_ttyname && gnupg_ttyname (1)) default_ttyname = xstrdup (ttyname (1)); if (!default_ttytype && getenv ("TERM")) default_ttytype = xstrdup (getenv ("TERM")); |