diff options
Diffstat (limited to '')
| -rw-r--r-- | dirmngr/cdblib.c | 9 | ||||
| -rw-r--r-- | dirmngr/dirmngr-client.c | 4 | ||||
| -rw-r--r-- | dirmngr/dirmngr.c | 23 | ||||
| -rw-r--r-- | dirmngr/ldap-wrapper-ce.c | 4 | ||||
| -rw-r--r-- | g10/tdbio.c | 2 |
5 files changed, 27 insertions, 15 deletions
diff --git a/dirmngr/cdblib.c b/dirmngr/cdblib.c index 9ab4d3c24..9636b6ce5 100644 --- a/dirmngr/cdblib.c +++ b/dirmngr/cdblib.c @@ -115,9 +115,10 @@ cdb_init(struct cdb *cdbp, int fd) { struct stat st; unsigned char *mem; - unsigned fsize; #ifdef _WIN32 HANDLE hFile, hMapping; +#else + unsigned int fsize; #endif /* get file size */ @@ -128,7 +129,6 @@ cdb_init(struct cdb *cdbp, int fd) gpg_err_set_errno (EPROTO); return -1; } - fsize = (unsigned)(st.st_size & 0xffffffffu); /* memory-map file */ #ifdef _WIN32 # ifdef __MINGW32CE__ @@ -145,11 +145,12 @@ cdb_init(struct cdb *cdbp, int fd) if (!mem) return -1; cdbp->cdb_mapping = hMapping; -#else +#else /*!_WIN32*/ + fsize = (unsigned int)(st.st_size & 0xffffffffu); mem = (unsigned char*)mmap(NULL, fsize, PROT_READ, MAP_SHARED, fd, 0); if (mem == MAP_FAILED) return -1; -#endif /* _WIN32 */ +#endif /*!_WIN32*/ cdbp->cdb_fd = fd; cdbp->cdb_fsize = st.st_size; diff --git a/dirmngr/dirmngr-client.c b/dirmngr/dirmngr-client.c index 76f4710c3..da9744359 100644 --- a/dirmngr/dirmngr-client.c +++ b/dirmngr/dirmngr-client.c @@ -459,7 +459,7 @@ start_dirmngr (int only_daemon) { const char *pgmname; const char *argv[3]; - int no_close_list[3]; + assuan_fd_t no_close_list[3]; int i; if (only_daemon) @@ -486,7 +486,7 @@ start_dirmngr (int only_daemon) if (log_get_fd () != -1) no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ()); no_close_list[i++] = assuan_fd_from_posix_fd (es_fileno (es_stderr)); - no_close_list[i] = -1; + no_close_list[i] = ASSUAN_INVALID_FD; /* Connect to the agent and perform initial handshaking. */ rc = assuan_pipe_connect (ctx, opt.dirmngr_program, argv, diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 9f3e2ee5c..0cbdc7ba0 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -510,6 +510,10 @@ DWORD WINAPI w32_service_control (DWORD control, DWORD event_type, LPVOID event_data, LPVOID context) { + (void)event_type; + (void)event_data; + (void)context; + /* event_type and event_data are not used here. */ switch (control) { @@ -1016,6 +1020,9 @@ main (int argc, char **argv) existing scripts which might use this to detect a successful start of the dirmngr. */ #ifdef HAVE_W32_SYSTEM + (void)csh_style; + (void)nodetach; + pid = getpid (); es_printf ("set %s=%s;%lu;1\n", DIRMNGR_INFO_NAME, socket_name, (ulong) pid); @@ -1275,6 +1282,12 @@ main (int argc, char **argv) #ifdef USE_W32_SERVICE +static void WINAPI +call_real_main (DWORD argc, LPSTR *argv) +{ + real_main (argc, argv); +} + int main (int argc, char *argv[]) { @@ -1295,8 +1308,7 @@ main (int argc, char *argv[]) { SERVICE_TABLE_ENTRY DispatchTable [] = { - /* Ignore warning. */ - { "DirMngr", &real_main }, + { "DirMngr", &call_real_main }, { NULL, NULL } }; @@ -1609,12 +1621,12 @@ dirmngr_sighup_action (void) /* The signal handler. */ +#ifndef HAVE_W32_SYSTEM static void handle_signal (int signo) { switch (signo) { -#ifndef HAVE_W32_SYSTEM case SIGHUP: dirmngr_sighup_action (); break; @@ -1649,11 +1661,12 @@ handle_signal (int signo) cleanup (); dirmngr_exit (0); break; -#endif + default: log_info (_("signal %d received - no action defined\n"), signo); } } +#endif /*!HAVE_W32_SYSTEM*/ /* This is the worker for the ticker. It is called every few seconds @@ -1739,7 +1752,9 @@ static void handle_connections (assuan_fd_t listen_fd) { npth_attr_t tattr; +#ifndef HAVE_W32_SYSTEM int signo; +#endif struct sockaddr_un paddr; socklen_t plen = sizeof( paddr ); gnupg_fd_t fd; diff --git a/dirmngr/ldap-wrapper-ce.c b/dirmngr/ldap-wrapper-ce.c index 9af70af87..ce63ea682 100644 --- a/dirmngr/ldap-wrapper-ce.c +++ b/dirmngr/ldap-wrapper-ce.c @@ -279,8 +279,6 @@ outstream_reader_cb (void *cb_value, char *buffer, size_t count, size_t *r_nread) { struct outstream_cookie_s *cookie = cb_value; - char *dst; - const char *src; size_t nread = 0; int was_full = 0; @@ -288,7 +286,6 @@ outstream_reader_cb (void *cb_value, char *buffer, size_t count, return gpg_error (GPG_ERR_NOT_SUPPORTED); /* Rewind is not supported. */ *r_nread = 0; - dst = buffer; while (BUFFER_EMPTY(cookie)) { @@ -302,7 +299,6 @@ outstream_reader_cb (void *cb_value, char *buffer, size_t count, if (BUFFER_FULL(cookie)) was_full = 1; - src = cookie->buffer + cookie->buffer_pos; nread = buffer_get_data (cookie, buffer, count); if (was_full) diff --git a/g10/tdbio.c b/g10/tdbio.c index db7a67c05..2b9d4ff55 100644 --- a/g10/tdbio.c +++ b/g10/tdbio.c @@ -38,7 +38,7 @@ #include "trustdb.h" #include "tdbio.h" -#if defined(HAVE_DOSISH_SYSTEM) +#if defined(HAVE_DOSISH_SYSTEM) && !defined(ftruncate) #define ftruncate chsize #endif |