aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/ChangeLog4
-rw-r--r--common/asshelp.c5
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 <[email protected]>
+
+ * asshelp.c (send_pinentry_environment) [W32]: Do not use ttyname.
+
2004-12-06 Werner Koch <[email protected]>
* 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)
{