security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Do not use a broken ttyname.

Browse source 
* 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.
This commit is contained in:
Werner Koch 2012-11-20 19:01:13 +01:00
parent e7bc5012c5
commit 835698b72b
6 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
agent/gpg-agent.c
View file

@ -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"));