diff options
| author | Ben Kibbey <[email protected]> | 2016-09-03 23:06:36 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-09-19 06:35:20 +0000 |
| commit | 9d62bacac7826cb73bb18fac7268f3d2df662d7b (patch) | |
| tree | 5c69757096fd18d7867701e4add33a872fa184eb /src/engine-gpg.c | |
| parent | qt: Add test for setting tofu policy (diff) | |
| download | gpgme-9d62bacac7826cb73bb18fac7268f3d2df662d7b.tar.gz gpgme-9d62bacac7826cb73bb18fac7268f3d2df662d7b.zip | |
core: Check for GPG_TTY as well as DISPLAY.
* src/engine-assuan.c (llass_new): Update --ttyname from GPG_TTY.
* src/engine-g13.c (g13_new): Ditto.
* src/engine-gpg.c (gpg_new): Ditto.
* src/engine-uiserver.c (uiserver_new): Ditto.
* src/engine-gpgsm.c (gpgsm_new): Ditto.
--
Useful when no DISPLAY is set and there is no attached terminal to the
current process.
Signed-off-by: Ben Kibbey <[email protected]>
Diffstat (limited to 'src/engine-gpg.c')
| -rw-r--r-- | src/engine-gpg.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/engine-gpg.c b/src/engine-gpg.c index 025657a9..8bb348f9 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -454,6 +454,7 @@ gpg_new (void **engine, const char *file_name, const char *home_dir, char *dft_display = NULL; char dft_ttyname[64]; char *dft_ttytype = NULL; + char *env_tty = NULL; gpg = calloc (1, sizeof *gpg); if (!gpg) @@ -560,11 +561,20 @@ gpg_new (void **engine, const char *file_name, const char *home_dir, goto leave; } - if (isatty (1)) + rc = _gpgme_getenv ("GPG_TTY", &env_tty); + if (isatty (1) || env_tty || rc) { - int err; + int err = 0; - err = ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)); + if (rc) + goto leave; + else if (env_tty) + { + snprintf (dft_ttyname, sizeof (dft_ttyname), "%s", env_tty); + free (env_tty); + } + else + err = 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. */ |