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

Made scdaemon more robust on Windows.

Browse source
This commit is contained in:
Werner Koch 2008-10-15 13:23:10 +00:00
parent d0ca953014
commit b519a52cea
10 changed files with 55 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
agent/call-scd.c
View file

@ -343,6 +343,9 @@ start_scd (ctrl_t ctrl)
if (opt.verbose)
log_debug ("first connection to SCdaemon established\n");
if (DBG_ASSUAN)
assuan_set_log_stream (ctx, log_get_stream ());
/* Get the name of the additional socket opened by scdaemon. */
{
membuf_t data;
@ -412,9 +415,10 @@ agent_scd_check_aliveness (void)
{
pth_event_t evt;
pid_t pid;
int rc;
#ifdef HAVE_W32_SYSTEM
DWORD dummyec;
DWORD rc;
#else
int rc;
#endif
if (!primary_scd_ctx)
@ -443,8 +447,11 @@ agent_scd_check_aliveness (void)
{
pid = assuan_get_pid (primary_scd_ctx);
#ifdef HAVE_W32_SYSTEM
/* If we have a PID we disconnect if either GetExitProcessCode
fails or if ir returns the exit code of the scdaemon. 259 is
the error code for STILL_ALIVE. */
if (pid != (pid_t)(void*)(-1) && pid
&& !GetExitCodeProcess ((HANDLE)pid, &dummyec))
&& (!GetExitCodeProcess ((HANDLE)pid, &rc) || rc != 259))
#else
if (pid != (pid_t)(-1) && pid
&& ((rc=waitpid (pid, NULL, WNOHANG))==-1 || (rc == pid)) )