mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* configure.ac: Add PATHSEP_C and PATHSEP_S. For W32 let all
directories default to c:/gnupg. Require libassuan 0.6.9. * gpg-agent.c (main) [W32]: Now that Mutexes work we can remove the pth_init kludge. (main): Add new options --[no-]use-standard-socket. (check_for_running_agent): Check whether it is running on the standard socket. * sysutils.h [W32]: Define sleep. * util.h: Add prototype for mkdtemp. * call-agent.c (start_agent): Before starting a pipe server start to connect to a server on the standard socket. Use PATHSEP * call-dirmngr.c (start_dirmngr): Use PATHSEP. * import.c: Include unistd.h for dup and close.
This commit is contained in:
parent
f105ceb39c
commit
581f5ddb17
18 changed files with 272 additions and 116 deletions
|
@ -44,6 +44,8 @@
|
|||
#include "minip12.h"
|
||||
#include "simple-pwquery.h"
|
||||
#include "i18n.h"
|
||||
#include "sysutils.h"
|
||||
|
||||
|
||||
enum cmd_and_opt_values
|
||||
{ aNull = 0,
|
||||
|
@ -1065,12 +1067,12 @@ main (int argc, char **argv )
|
|||
gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
|
||||
|
||||
|
||||
#ifdef HAVE_W32_SYSTEM
|
||||
opt_homedir = read_w32_registry_string ( NULL,
|
||||
"Software\\GNU\\GnuPG", "HomeDir" );
|
||||
#else /*!HAVE_W32_SYSTEM*/
|
||||
opt_homedir = getenv ("GNUPGHOME");
|
||||
#endif /*!HAVE_W32_SYSTEM*/
|
||||
#ifdef HAVE_W32_SYSTEM
|
||||
if (!opt_homedir || !*opt_homedir)
|
||||
opt_homedir = read_w32_registry_string (NULL,
|
||||
"Software\\GNU\\GnuPG", "HomeDir");
|
||||
#endif /*HAVE_W32_SYSTEM*/
|
||||
if (!opt_homedir || !*opt_homedir)
|
||||
opt_homedir = GNUPG_DEFAULT_HOMEDIR;
|
||||
|
||||
|
@ -1162,7 +1164,9 @@ get_passphrase (int promptno)
|
|||
char *pw;
|
||||
int err;
|
||||
const char *desc;
|
||||
#ifdef HAVE_LANGINFO_CODESET
|
||||
char *orig_codeset = NULL;
|
||||
#endif
|
||||
int error_msgno;
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue