security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

common/exechelp: Provide a way to wait for multiple processes. 

* common/exechelp-posix.c (gnupg_wait_process): Generalize to
'gnupg_wait_processes'.
* common/exechelp-w32.c (gnupg_wait_process): Likewise.
* common/exechelp-w32ce.c (gnupg_wait_process): New function stub.
* common/exechelp.h (gnupg_wait_process): New prototype.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-01-14 18:20:14 +01:00
parent 9f4a8d4ea1
commit 5ba4f6047b
4 changed files with 144 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
common/exechelp-posix.c
View File

@ -522,60 +522,94 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[],
} }
/* See exechelp.h for the description. */ /* See exechelp.h for a description. */
gpg_error_t gpg_error_t
gnupg_wait_process (const char *pgmname, pid_t pid, int hang, int *r_exitcode) gnupg_wait_process (const char *pgmname, pid_t pid, int hang, int *r_exitcode)
{ {
gpg_err_code_t ec; return gnupg_wait_processes (&pgmname, &pid, 1, hang, r_exitcode);
int i, status; }
if (r_exitcode) /* See exechelp.h for a description. */
*r_exitcode = -1; gpg_error_t
gnupg_wait_processes (const char **pgmnames, pid_t *pids, size_t count,
int hang, int *r_exitcodes)
{
gpg_err_code_t ec = 0;
size_t i, left;
if (pid == (pid_t)(-1)) for (i = 0; i < count; i++)
return gpg_error (GPG_ERR_INV_VALUE); {
if (r_exitcodes)
r_exitcodes[i] = -1;
if (pids[i] == (pid_t)(-1))
return gpg_error (GPG_ERR_INV_VALUE);
}
left = count;
while (left > 0)
{
pid_t pid;
int status;
#ifdef USE_NPTH #ifdef USE_NPTH
i = npth_waitpid (pid, &status, hang? 0:WNOHANG); pid = npth_waitpid (-1, &status, hang ? 0 : WNOHANG);
#else #else
while ((i=waitpid (pid, &status, hang? 0:WNOHANG)) == (pid_t)(-1) while ((pid = waitpid (-1, &status, hang ? 0 : WNOHANG)) == (pid_t)(-1)
&& errno == EINTR); && errno == EINTR);
#endif #endif
if (i == (pid_t)(-1)) if (pid == (pid_t)(-1))
{ {
ec = gpg_err_code_from_errno (errno); ec = gpg_err_code_from_errno (errno);
log_error (_("waiting for process %d to terminate failed: %s\n"), log_error (_("waiting for processes to terminate failed: %s\n"),
(int)pid, strerror (errno)); strerror (errno));
} break;
else if (!i) }
{ else if (!pid)
ec = GPG_ERR_TIMEOUT; /* Still running. */ {
} ec = GPG_ERR_TIMEOUT; /* Still running. */
else if (WIFEXITED (status) && WEXITSTATUS (status) == 127) break;
{ }
log_error (_("error running '%s': probably not installed\n"), pgmname);
ec = GPG_ERR_CONFIGURATION;
}
else if (WIFEXITED (status) && WEXITSTATUS (status))
{
if (!r_exitcode)
log_error (_("error running '%s': exit status %d\n"), pgmname,
WEXITSTATUS (status));
else else
*r_exitcode = WEXITSTATUS (status); {
ec = GPG_ERR_GENERAL; for (i = 0; i < count; i++)
} if (pid == pids[i])
else if (!WIFEXITED (status)) break;
{
log_error (_("error running '%s': terminated\n"), pgmname); if (i == count)
ec = GPG_ERR_GENERAL; /* No match, ignore this pid. */
} continue;
else
{ /* Process PIDS[i] died. */
if (r_exitcode) left -= 1;
*r_exitcode = 0;
ec = 0; if (WIFEXITED (status) && WEXITSTATUS (status) == 127)
{
log_error (_("error running '%s': probably not installed\n"),
pgmnames[i]);
ec = GPG_ERR_CONFIGURATION;
}
else if (WIFEXITED (status) && WEXITSTATUS (status))
{
if (!r_exitcodes)
log_error (_("error running '%s': exit status %d\n"),
pgmnames[i], WEXITSTATUS (status));
else
r_exitcodes[i] = WEXITSTATUS (status);
ec = GPG_ERR_GENERAL;
}
else if (!WIFEXITED (status))
{
log_error (_("error running '%s': terminated\n"), pgmnames[i]);
ec = GPG_ERR_GENERAL;
}
else
{
if (r_exitcodes)
r_exitcodes[i] = 0;
}
}
} }
return gpg_err_make (GPG_ERR_SOURCE_DEFAULT, ec); return gpg_err_make (GPG_ERR_SOURCE_DEFAULT, ec);

86
common/exechelp-w32.c
View File

@ -682,64 +682,86 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[],
gpg_error_t gpg_error_t
gnupg_wait_process (const char *pgmname, pid_t pid, int hang, int *r_exitcode) gnupg_wait_process (const char *pgmname, pid_t pid, int hang, int *r_exitcode)
{ {
gpg_err_code_t ec; return gnupg_wait_processes (&pgmname, &pid, 1, hang, r_exitcode);
HANDLE proc = fd_to_handle (pid); }
/* See exechelp.h for a description. */
gpg_error_t
gnupg_wait_processes (const char **pgmnames, pid_t *pids, size_t count,
int hang, int *r_exitcodes)
{
gpg_err_code_t ec = 0;
size_t i;
HANDLE *procs;
int code; int code;
DWORD exc;
if (r_exitcode) procs = xtrycalloc (count, sizeof *procs);
*r_exitcode = -1; if (procs == NULL)
return gpg_error_from_syserror ();
if (pid == (pid_t)(-1)) for (i = 0; i < count; i++)
return gpg_error (GPG_ERR_INV_VALUE); {
if (r_exitcodes)
r_exitcodes[i] = -1;
if (pids[i] == (pid_t)(-1))
return gpg_error (GPG_ERR_INV_VALUE);
procs[i] = fd_to_handle (pids[i]);
}
/* FIXME: We should do a pth_waitpid here. However this has not yet /* FIXME: We should do a pth_waitpid here. However this has not yet
been implemented. A special W32 pth system call would even be been implemented. A special W32 pth system call would even be
better. */ better. */
code = WaitForSingleObject (proc, hang? INFINITE : 0); code = WaitForMultipleObjects (count, procs, TRUE, hang? INFINITE : 0);
switch (code) switch (code)
{ {
case WAIT_TIMEOUT: case WAIT_TIMEOUT:
ec = GPG_ERR_TIMEOUT; ec = GPG_ERR_TIMEOUT;
break; goto leave;
case WAIT_FAILED: case WAIT_FAILED:
log_error (_("waiting for process %d to terminate failed: %s\n"), log_error (_("waiting for processes to terminate failed: %s\n"),
(int)pid, w32_strerror (-1)); w32_strerror (-1));
ec = GPG_ERR_GENERAL; ec = GPG_ERR_GENERAL;
break; goto leave;
case WAIT_OBJECT_0: case WAIT_OBJECT_0:
if (!GetExitCodeProcess (proc, &exc)) for (i = 0; i < count; i++)
{ {
log_error (_("error getting exit code of process %d: %s\n"), DWORD exc;
(int)pid, w32_strerror (-1) );
ec = GPG_ERR_GENERAL; if (! GetExitCodeProcess (procs[i], &exc))
} {
else if (exc) log_error (_("error getting exit code of process %d: %s\n"),
{ (int) pids[i], w32_strerror (-1) );
if (!r_exitcode) ec = GPG_ERR_GENERAL;
log_error (_("error running '%s': exit status %d\n"), }
pgmname, (int)exc); else if (exc)
{
if (!r_exitcodes)
log_error (_("error running '%s': exit status %d\n"),
pgmnames[i], (int)exc);
else
r_exitcodes[i] = (int)exc;
ec = GPG_ERR_GENERAL;
}
else else
*r_exitcode = (int)exc; {
ec = GPG_ERR_GENERAL; if (r_exitcodes)
} r_exitcodes[i] = 0;
else }
{
if (r_exitcode)
*r_exitcode = 0;
ec = 0;
} }
break; break;
default: default:
log_error ("WaitForSingleObject returned unexpected " log_error ("WaitForMultipleObjects returned unexpected "
"code %d for pid %d\n", code, (int)pid ); "code %d\n", code);
ec = GPG_ERR_GENERAL; ec = GPG_ERR_GENERAL;
break; break;
} }
leave:
return gpg_err_make (GPG_ERR_SOURCE_DEFAULT, ec); return gpg_err_make (GPG_ERR_SOURCE_DEFAULT, ec);
} }

9
common/exechelp-w32ce.c
View File

@ -796,6 +796,15 @@ gnupg_wait_process (const char *pgmname, pid_t pid, int hang, int *exitcode)
} }
/* See exechelp.h for a description. */
gpg_error_t
gnupg_wait_processes (const char **pgmnames, pid_t *pids, size_t count,
int hang, int *r_exitcodes)
{
return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
}
void void
gnupg_release_process (pid_t pid) gnupg_release_process (pid_t pid)
{ {

4
common/exechelp.h
View File

@ -161,6 +161,10 @@ gpg_error_t gnupg_spawn_process_fd (const char *pgmname,
gpg_error_t gnupg_wait_process (const char *pgmname, pid_t pid, int hang, gpg_error_t gnupg_wait_process (const char *pgmname, pid_t pid, int hang,
int *r_exitcode); int *r_exitcode);
/* Like gnupg_wait_process, but for COUNT processes. */
gpg_error_t gnupg_wait_processes (const char **pgmnames, pid_t *pids,
size_t count, int hang, int *r_exitcodes);
/* Kill a process; that is send an appropriate signal to the process. /* Kill a process; that is send an appropriate signal to the process.
gnupg_wait_process must be called to actually remove the process gnupg_wait_process must be called to actually remove the process