security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

Change dirmngr timer under W32CE.

Browse Source 
Fix trustdb open problem under W32CE.
This commit is contained in:
Werner Koch 2010-12-09 11:50:22 +00:00
parent 64a786b2d9
commit 1486dec17b
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dirmngr/ChangeLog
View File

@ -1,3 +1,7 @@
2010-12-07 Werner Koch <wk@g10code.com>
* dirmngr.c (TIMERTICK_INTERVAL) [W32CE]: Change to 60s.
2010-11-23 Werner Koch <wk@g10code.com> 2010-11-23 Werner Koch <wk@g10code.com>
* Makefile.am (dirmngr_LDFLAGS): Add extra_bin_ldflags. * Makefile.am (dirmngr_LDFLAGS): Add extra_bin_ldflags.

12
dirmngr/dirmngr.c
View File

@ -241,11 +241,15 @@ static int active_connections;
/* The timer tick used for housekeeping stuff. For Windows we use a /* The timer tick used for housekeeping stuff. For Windows we use a
longer period as the SetWaitableTimer seems to signal earlier than longer period as the SetWaitableTimer seems to signal earlier than
the 2 seconds. */ the 2 seconds. CHECK_OWN_SOCKET_INTERVAL defines how often we
#ifdef HAVE_W32_SYSTEM check our own socket in standard socket mode. If that value is 0
#define TIMERTICK_INTERVAL (4) we don't check at all. All values are in seconds. */
#if defined(HAVE_W32CE_SYSTEM)
# define TIMERTICK_INTERVAL (60)
#elif defined(HAVE_W32_SYSTEM)
# define TIMERTICK_INTERVAL (4)
#else #else
#define TIMERTICK_INTERVAL (2) /* Seconds. */ # define TIMERTICK_INTERVAL (2)
#endif #endif
/* This union is used to avoid compiler warnings in case a pointer is /* This union is used to avoid compiler warnings in case a pointer is

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2010-12-09 Werner Koch <wk@g10code.com>
* tdbio.c (tdbio_set_dbname) [W32CE]: Take care of missing errno.
(strerror) [W32CE]: Dummy replacement.
(open_db) [W32CE]: Fall back to read-only on any error.
2010-12-02 Werner Koch <wk@g10code.com> 2010-12-02 Werner Koch <wk@g10code.com>
* misc.c (openpgp_cipher_algo_name): Use gnupg_cipher_algo_name. * misc.c (openpgp_cipher_algo_name): Use gnupg_cipher_algo_name.

17
g10/tdbio.c
View File

@ -48,6 +48,13 @@
#define MY_O_BINARY 0 #define MY_O_BINARY 0
#endif #endif
/* We use ERRNO despite that the cegcc provided open/read/write
functions don't set ERRNO - at least show that ERRNO does not make
sense. */
#ifdef HAVE_W32CE_SYSTEM
#undef strerror
#define strerror(a) ("[errno not available]")
#endif
/**************** /****************
* Yes, this is a very simple implementation. We should really * Yes, this is a very simple implementation. We should really
@ -494,6 +501,13 @@ tdbio_set_dbname( const char *new_dbname, int create )
fname = xstrdup (new_dbname); fname = xstrdup (new_dbname);
if( access( fname, R_OK ) ) { if( access( fname, R_OK ) ) {
#ifdef HAVE_W32CE_SYSTEM
/* We know how the cegcc implementation of access works ;-). */
if (GetLastError () == ERROR_FILE_NOT_FOUND)
gpg_err_set_errno (ENOENT);
else
gpg_err_set_errno (EIO);
#endif /*HAVE_W32CE_SYSTEM*/
if( errno != ENOENT ) { if( errno != ENOENT ) {
log_error( _("can't access `%s': %s\n"), fname, strerror(errno) ); log_error( _("can't access `%s': %s\n"), fname, strerror(errno) );
xfree(fname); xfree(fname);
@ -605,6 +619,9 @@ open_db()
if (db_fd == -1 && (errno == EACCES if (db_fd == -1 && (errno == EACCES
#ifdef EROFS #ifdef EROFS
|| errno == EROFS || errno == EROFS
#endif
#ifdef HAVE_W32CE_SYSTEM
|| 1 /* cegcc's open does not set ERRNO. */
#endif #endif
) )
) { ) {