security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

* g10.c, passphrase.c [CYGWIN32]: Allow this as an alias for MINGW32.

Browse Source
This commit is contained in:
Werner Koch 2001-12-19 18:04:31 +00:00
parent 7f5062db6c
commit 3a60b758ad
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/ChangeLog
View File

@ -1,3 +1,7 @@
2001-12-19 Werner Koch <wk@gnupg.org>
* g10.c, passphrase.c [CYGWIN32]: Allow this as an alias for MINGW32.
2001-12-18 David Shaw <dshaw@jabberwocky.com> 2001-12-18 David Shaw <dshaw@jabberwocky.com>
* g10.c (idea_cipher_warn): Add a flag to show the warning always * g10.c (idea_cipher_warn): Add a flag to show the warning always

6
g10/g10.c
View File

@ -741,11 +741,11 @@ main( int argc, char **argv )
opt.marginals_needed = 3; opt.marginals_needed = 3;
opt.max_cert_depth = 5; opt.max_cert_depth = 5;
opt.pgp2_workarounds = 1; opt.pgp2_workarounds = 1;
#ifdef __MINGW32__ #if defined (__MINGW32__) || defined (__CYGWIN32__)
opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" ); opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" );
#else #else
opt.homedir = getenv("GNUPGHOME"); opt.homedir = getenv("GNUPGHOME");
#endif #endif
if( !opt.homedir || !*opt.homedir ) { if( !opt.homedir || !*opt.homedir ) {
opt.homedir = GNUPG_HOMEDIR; opt.homedir = GNUPG_HOMEDIR;
} }

12
g10/passphrase.c
View File

@ -29,7 +29,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#endif #endif
#ifdef __MINGW32__ #if defined (__MINGW32__) || defined (__CYGWIN32__)
# include <windows.h> # include <windows.h>
#endif #endif
#include <errno.h> #include <errno.h>
@ -85,7 +85,7 @@ static char *fd_passwd = NULL;
static char *next_pw = NULL; static char *next_pw = NULL;
static char *last_pw = NULL; static char *last_pw = NULL;
#ifdef __MINGW32__ #if defined (__MINGW32__) || defined (__CYGWIN32__)
static int read_fd = 0; static int read_fd = 0;
static int write_fd = 0; static int write_fd = 0;
#endif #endif
@ -164,7 +164,7 @@ read_passphrase_from_fd( int fd )
static int static int
writen ( int fd, const void *buf, size_t nbytes ) writen ( int fd, const void *buf, size_t nbytes )
{ {
#ifdef __MINGW32__ #if defined (__MINGW32__) || defined (__CYGWIN32__)
DWORD nwritten, nleft = nbytes; DWORD nwritten, nleft = nbytes;
while (nleft > 0) { while (nleft > 0) {
@ -207,7 +207,7 @@ writen ( int fd, const void *buf, size_t nbytes )
static int static int
readn ( int fd, void *buf, size_t buflen, size_t *ret_nread ) readn ( int fd, void *buf, size_t buflen, size_t *ret_nread )
{ {
#ifdef __MINGW32__ #if defined (__MINGW32__) || defined (__CYGWIN32__)
DWORD nread, nleft = buflen; DWORD nread, nleft = buflen;
while (nleft > 0) { while (nleft > 0) {
@ -266,7 +266,7 @@ readn ( int fd, void *buf, size_t buflen, size_t *ret_nread )
static int static int
agent_open (void) agent_open (void)
{ {
#ifdef __MINGW32__ #if defined (__MINGW32__) || defined (__CYGWIN32__)
int fd; int fd;
char *infostr, *p; char *infostr, *p;
HANDLE h; HANDLE h;
@ -363,7 +363,7 @@ agent_open (void)
static void static void
agent_close ( int fd ) agent_close ( int fd )
{ {
#ifdef __MINGW32__ #if defined (__MINGW32__) || defined (__CYGWIN32__)
HANDLE h = OpenEvent(EVENT_ALL_ACCESS, FALSE, "gpg_agent"); HANDLE h = OpenEvent(EVENT_ALL_ACCESS, FALSE, "gpg_agent");
ResetEvent(h); ResetEvent(h);
#else #else