aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog3
-rw-r--r--g10/gpgv.c2
-rw-r--r--g10/keyserver.c1
3 files changed, 4 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 0e5e9204c..1d3e69579 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -32,7 +32,8 @@
2001-12-19 Werner Koch <[email protected]>
- * g10.c, passphrase.c [CYGWIN32]: Allow this as an alias for MINGW32.
+ * g10.c, passphrase.c, gpgv.c [CYGWIN32]: Allow this as an alias
+ for MINGW32.
2001-12-18 David Shaw <[email protected]>
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 3044d9e4b..8720e51d9 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -151,7 +151,7 @@ main( int argc, char **argv )
opt.always_trust = 1;
opt.batch = 1;
- #ifdef __MINGW32__
+ #if defined (__MINGW32__) || defined (__CYGWIN32__)
opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" );
#else
opt.homedir = getenv("GNUPGHOME");
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 89f2c68ad..7e5f28731 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -295,6 +295,7 @@ keyserver_spawn(int action,STRLIST list,u32 (*kidlist)[2],int count)
filename=m_alloc(strlen("gpgkeys_")+strlen(opt.keyserver_scheme)+1);
+
strcpy(filename,"gpgkeys_");
strcat(filename,opt.keyserver_scheme);