diff options
| author | David Shaw <[email protected]> | 2003-08-29 00:14:42 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-08-29 00:14:42 +0000 |
| commit | 17e67cd29b94821892464537873a88bb6959c937 (patch) | |
| tree | 3ef1b99467f10988fbf6cf1ec6fb77c32d607bff /g10/exec.c | |
| parent | * idea-stub.c, random.c; s/__MINGW32__/_WIN32/ to help building on native (diff) | |
| download | gnupg-17e67cd29b94821892464537873a88bb6959c937.tar.gz gnupg-17e67cd29b94821892464537873a88bb6959c937.zip | |
* passphrase.c (agent_send_all_options): Make use of $GPG_TTY.
* g10.c (main): Disable use-agent if passphrase-fd is given later.
Suggested by Kurt Garloff.
* exec.c, g10.c, gpgv.c, passphrase.c, photoid.c: s/__MINGW32__/_WIN32/ to
help building on native Windows compilers. Requested by Brian Gladman.
From Werner on stable branch.
Diffstat (limited to '')
| -rw-r--r-- | g10/exec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/exec.c b/g10/exec.c index 0278438f6..85c3ab494 100644 --- a/g10/exec.c +++ b/g10/exec.c @@ -1,5 +1,5 @@ /* exec.c - generic call-a-program code - * Copyright (C) 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -59,7 +59,7 @@ int set_exec_path(const char *path,int method) { return G10ERR_GENERAL; } char *mkdtemp(char *template); #endif -#if defined (__MINGW32__) +#if defined (_WIN32) /* This is a nicer system() for windows that waits for programs to return before returning control to the caller. I hate helpful computers. */ @@ -139,7 +139,7 @@ static int make_tempdir(struct exec_info *info) if(tmp==NULL) { -#if defined (__MINGW32__) +#if defined (_WIN32) tmp=m_alloc(256); if(GetTempPath(256,tmp)==0) strcpy(tmp,"c:\\windows\\temp"); @@ -176,7 +176,7 @@ static int make_tempdir(struct exec_info *info) sprintf(info->tempdir,"%s" DIRSEP_S "gpg-XXXXXX",tmp); -#if defined (__MINGW32__) +#if defined (_WIN32) m_free(tmp); #endif @@ -502,7 +502,7 @@ int exec_read(struct exec_info *info) if(DBG_EXTPROG) log_debug("system() command is %s\n",info->command); -#if defined (__MINGW32__) +#if defined (_WIN32) info->progreturn=win_system(info->command); #else info->progreturn=system(info->command); |