security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Fix preference setting in new keys

Browse source
This commit is contained in:
Werner Koch 2010-04-26 11:53:14 +00:00
parent 8e5010a958
commit 31bbe71ad6
7 changed files with 56 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/ChangeLog
View file

@ -1,3 +1,10 @@
2010-04-26 Werner Koch <wk@g10code.com>
* utf8conv.c (load_libiconv) [W32CE]: No libiconv warning
* init.c (init_common_subsystems) [W32CE]: Register the sleep
function before es_init.
2010-04-20 Werner Koch <wk@g10code.com>
* estream.c (es_deinit): New.

19
common/init.c
View file

@ -73,13 +73,21 @@ init_common_subsystems (int *argcp, char ***argvp)
# ifdef HAVE_PTH
pth_init ();
# else
{
WSADATA wsadat;
WSAStartup (0x202, &wsadat);
}
{
WSADATA wsadat;
WSAStartup (0x202, &wsadat);
}
# endif /*!HAVE_PTH*/
#endif
#ifdef HAVE_W32CE_SYSTEM
/* Register the sleep exit function before the estream init so that
the sleep will be called after the estream registered atexit
function which flushes the left open estream streams and in
particular es_stdout. */
atexit (sleep_on_exit);
#endif
/* Initialize the Estream library. */
es_init ();
@ -87,7 +95,6 @@ init_common_subsystems (int *argcp, char ***argvp)
/* Special hack for Windows CE: We extract some options from arg
to setup the standard handles. */
#ifdef HAVE_W32CE_SYSTEM
atexit (sleep_on_exit);
parse_std_file_handles (argcp, argvp);
#else
(void)argcp;

5
common/utf8conv.c
View file

@ -62,6 +62,10 @@ static int (* __stdcall iconv_close) (iconv_t cd);
static int
load_libiconv (void)
{
#ifdef HAVE_W32CE_SYSTEM
return -1; /* FIXME No libiconv yet - Need to investigate whether it
is at all required. */
#else
static int done;
if (!done)
@ -94,6 +98,7 @@ load_libiconv (void)
}
}
return iconv_open? 0: -1;
#endif
}
#endif /*HAVE_W32_SYSTEM*/