diff options
Diffstat (limited to 'src/engine-uiserver.c')
| -rw-r--r-- | src/engine-uiserver.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/engine-uiserver.c b/src/engine-uiserver.c index d855c742..63e77de6 100644 --- a/src/engine-uiserver.c +++ b/src/engine-uiserver.c @@ -248,6 +248,7 @@ uiserver_new (void **engine, const char *file_name, const char *home_dir, engine_uiserver_t uiserver; char *dft_display = NULL; char dft_ttyname[64]; + char *env_tty = NULL; char *dft_ttytype = NULL; char *optstr; @@ -330,11 +331,20 @@ uiserver_new (void **engine, const char *file_name, const char *home_dir, goto leave; } - if (isatty (1)) + err = _gpgme_getenv ("GPG_TTY", &env_tty); + if (isatty (1) || env_tty || err) { - int rc; + int rc = 0; - rc = ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)); + if (err) + goto leave; + else if (env_tty) + { + snprintf (dft_ttyname, sizeof (dft_ttyname), "%s", env_tty); + free (env_tty); + } + else + rc = ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)); /* Even though isatty() returns 1, ttyname_r() may fail in many ways, e.g., when /dev/pts is not accessible under chroot. */ |