diff options
| author | Werner Koch <wk@gnupg.org> | 2004-12-07 12:21:40 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2004-12-07 12:21:40 +0100 |
| commit | b50a587d8df43b01b5c3b99950aab8fc050b3fe1 (patch) | |
| tree | 35a5234bec86388bd5036f3661062c20fd0c73d8 /common | |
| parent | * exechelp.h, exechelp.c: New. Based on code from ../sm/import.c. (diff) | |
| download | gnupg2-b50a587d8df43b01b5c3b99950aab8fc050b3fe1.tar.xz gnupg2-b50a587d8df43b01b5c3b99950aab8fc050b3fe1.zip | |
* asshelp.c (send_pinentry_environment) [W32]: Do not use ttyname.
* w32-pth.c, w32-pth.h: New.
* Makefile.am (gpgsm_LDADD): Put libassuan before jnlib because
under W32 we need the w32 pth code from jnlib.
* misc.c (setup_pinentry_env) [W32]: Disabled.
Diffstat (limited to 'common')
| -rw-r--r-- | common/ChangeLog | 4 | ||||
| -rw-r--r-- | common/asshelp.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index 8c311f4dc..afdded6d9 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,7 @@ +2004-12-07 Werner Koch <wk@g10code.com> + + * asshelp.c (send_pinentry_environment) [W32]: Do not use ttyname. + 2004-12-06 Werner Koch <wk@g10code.com> * exechelp.h, exechelp.c: New. Based on code from ../sm/import.c. diff --git a/common/asshelp.c b/common/asshelp.c index 23feca507..751412e6c 100644 --- a/common/asshelp.c +++ b/common/asshelp.c @@ -66,8 +66,13 @@ send_pinentry_environment (assuan_context_t ctx, if (!opt_ttyname) { dft_ttyname = getenv ("GPG_TTY"); +#ifdef HAVE_DOSISH_SYSTEM + if (!dft_ttyname || !*dft_ttyname ) + dft_ttyname = "/dev/tty"; /* Use a fake. */ +#else if ((!dft_ttyname || !*dft_ttyname) && ttyname (0)) dft_ttyname = ttyname (0); +#endif } if (opt_ttyname || dft_ttyname) { |