2010-03-22 15:00:54 +00:00
|
|
|
|
/* exechelp-w32.c - Fork and exec helpers for W32CE.
|
2010-03-08 12:18:19 +00:00
|
|
|
|
* Copyright (C) 2004, 2007, 2008, 2009,
|
|
|
|
|
* 2010 Free Software Foundation, Inc.
|
2004-12-06 18:28:56 +00:00
|
|
|
|
*
|
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
|
*
|
Change license for some files in common to LGPLv3+/GPLv2+.
Having the LGPL on the common GnuPG code helps to share code
between GnuPG and related projects (like GPGME and Libassuan). This
is good for interoperability and to reduces bugs.
* common/asshelp.c, common/asshelp.h, common/asshelp2.c, common/b64dec.c
* common/b64enc.c, common/convert.c, common/dns-cert.c
* common/dns-cert.h common/exechelp-posix.c, common/exechelp-w32.c
* common/exechelp-w32ce.c, common/exechelp.h, common/get-passphrase.c
* common/get-passphrase.h, common/gettime.c, common/gpgrlhelp.c
* common/helpfile.c, common/homedir.c, common/http.c, common/http.h
* common/i18n.c, common/init.c, common/init.h, common/iobuf.c
* common/iobuf.h, common/localename.c, common/membuf.c, common/membuf.h
* common/miscellaneous.c, common/openpgp-oid.c, common/openpgpdefs.h
* common/percent.c, common/pka.c, common/pka.h, common/session-env.c
* common/session-env.h, common/sexp-parse.h, common/sexputil.c
* common/signal.c, common/srv.c, common/srv.h, common/ssh-utils.c
* common/ssh-utils.h, common/sysutils.c, common/sysutils.h
* common/tlv.c, common/tlv.h, common/ttyio.c, common/ttyio.h
* common/userids.c, common/userids.h, common/xasprintf.c: Change
license to LGPLv3+/GPLv2+/
2012-04-20 15:43:06 +02:00
|
|
|
|
* This file is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of either
|
2004-12-06 18:28:56 +00:00
|
|
|
|
*
|
Change license for some files in common to LGPLv3+/GPLv2+.
Having the LGPL on the common GnuPG code helps to share code
between GnuPG and related projects (like GPGME and Libassuan). This
is good for interoperability and to reduces bugs.
* common/asshelp.c, common/asshelp.h, common/asshelp2.c, common/b64dec.c
* common/b64enc.c, common/convert.c, common/dns-cert.c
* common/dns-cert.h common/exechelp-posix.c, common/exechelp-w32.c
* common/exechelp-w32ce.c, common/exechelp.h, common/get-passphrase.c
* common/get-passphrase.h, common/gettime.c, common/gpgrlhelp.c
* common/helpfile.c, common/homedir.c, common/http.c, common/http.h
* common/i18n.c, common/init.c, common/init.h, common/iobuf.c
* common/iobuf.h, common/localename.c, common/membuf.c, common/membuf.h
* common/miscellaneous.c, common/openpgp-oid.c, common/openpgpdefs.h
* common/percent.c, common/pka.c, common/pka.h, common/session-env.c
* common/session-env.h, common/sexp-parse.h, common/sexputil.c
* common/signal.c, common/srv.c, common/srv.h, common/ssh-utils.c
* common/ssh-utils.h, common/sysutils.c, common/sysutils.h
* common/tlv.c, common/tlv.h, common/ttyio.c, common/ttyio.h
* common/userids.c, common/userids.h, common/xasprintf.c: Change
license to LGPLv3+/GPLv2+/
2012-04-20 15:43:06 +02:00
|
|
|
|
* - the GNU Lesser General Public License as published by the Free
|
|
|
|
|
* Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
* your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* or
|
|
|
|
|
*
|
|
|
|
|
* - the GNU General Public License as published by the Free
|
|
|
|
|
* Software Foundation; either version 2 of the License, or (at
|
|
|
|
|
* your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* or both in parallel, as here.
|
|
|
|
|
*
|
|
|
|
|
* This file is distributed in the hope that it will be useful,
|
2004-12-06 18:28:56 +00:00
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2007-07-04 19:49:40 +00:00
|
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2004-12-06 18:28:56 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
2010-03-22 15:00:54 +00:00
|
|
|
|
#if !defined(HAVE_W32_SYSTEM) && !defined (HAVE_W32CE_SYSTEM)
|
|
|
|
|
#error This code is only used on W32CE.
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-12-06 18:28:56 +00:00
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <assert.h>
|
2010-03-10 12:24:58 +00:00
|
|
|
|
#ifdef HAVE_SIGNAL_H
|
|
|
|
|
# include <signal.h>
|
|
|
|
|
#endif
|
2011-02-04 12:57:53 +01:00
|
|
|
|
#include <unistd.h>
|
2006-09-07 15:13:33 +00:00
|
|
|
|
#include <fcntl.h>
|
2006-10-17 14:34:42 +00:00
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#ifdef WITHOUT_NPTH /* Give the Makefile a chance to build without Pth. */
|
|
|
|
|
#undef HAVE_NPTH
|
|
|
|
|
#undef USE_NPTH
|
2006-10-17 14:34:42 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#ifdef USE_NPTH
|
|
|
|
|
#include <npth.h>
|
2004-12-06 18:28:56 +00:00
|
|
|
|
#endif
|
2009-03-19 07:09:31 +00:00
|
|
|
|
|
|
|
|
|
#ifdef HAVE_STAT
|
|
|
|
|
# include <sys/stat.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
#include <assuan.h>
|
2009-03-19 07:09:31 +00:00
|
|
|
|
|
2004-12-06 18:28:56 +00:00
|
|
|
|
#include "util.h"
|
|
|
|
|
#include "i18n.h"
|
2009-04-01 10:51:53 +00:00
|
|
|
|
#include "sysutils.h"
|
2004-12-06 18:28:56 +00:00
|
|
|
|
#include "exechelp.h"
|
|
|
|
|
|
|
|
|
|
|
2007-08-22 10:55:07 +00:00
|
|
|
|
/* It seems Vista doesn't grok X_OK and so fails access() tests.
|
|
|
|
|
Previous versions interpreted X_OK as F_OK anyway, so we'll just
|
|
|
|
|
use F_OK directly. */
|
|
|
|
|
#undef X_OK
|
|
|
|
|
#define X_OK F_OK
|
2010-03-10 12:24:58 +00:00
|
|
|
|
|
2004-12-06 18:28:56 +00:00
|
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
|
/* We assume that a HANDLE can be represented by an int which should
|
|
|
|
|
be true for all i386 systems (HANDLE is defined as void *) and
|
|
|
|
|
these are the only systems for which Windows is available. Further
|
|
|
|
|
we assume that -1 denotes an invalid handle. */
|
2010-03-22 15:00:54 +00:00
|
|
|
|
#define fd_to_handle(a) ((HANDLE)(a))
|
|
|
|
|
#define handle_to_fd(a) ((int)(a))
|
|
|
|
|
#define pid_to_handle(a) ((HANDLE)(a))
|
|
|
|
|
#define handle_to_pid(a) ((int)(a))
|
2004-12-15 14:15:54 +00:00
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#ifdef USE_NPTH
|
2011-02-04 12:57:53 +01:00
|
|
|
|
/* The data passed to the feeder_thread. */
|
2010-03-24 12:15:30 +00:00
|
|
|
|
struct feeder_thread_parms
|
|
|
|
|
{
|
|
|
|
|
estream_t stream;
|
2010-08-23 19:26:05 +00:00
|
|
|
|
volatile int stream_valid;
|
|
|
|
|
HANDLE hd;
|
2010-03-24 12:15:30 +00:00
|
|
|
|
int direction;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2010-08-20 12:18:38 +00:00
|
|
|
|
/* The thread started by start_feede3. */
|
2010-03-24 12:15:30 +00:00
|
|
|
|
static void *
|
|
|
|
|
feeder_thread (void *arg)
|
|
|
|
|
{
|
|
|
|
|
struct feeder_thread_parms *parm = arg;
|
|
|
|
|
char buffer[4096];
|
2010-08-23 19:26:05 +00:00
|
|
|
|
int rc;
|
2010-03-24 12:15:30 +00:00
|
|
|
|
|
|
|
|
|
if (parm->direction)
|
|
|
|
|
{
|
2010-08-23 19:26:05 +00:00
|
|
|
|
size_t nread = 0;
|
2010-03-24 12:15:30 +00:00
|
|
|
|
DWORD nwritten;
|
|
|
|
|
|
2010-08-23 19:26:05 +00:00
|
|
|
|
log_debug ("feeder_thread estream->pipe: stream=%p pipe=%p\n",
|
|
|
|
|
parm->stream, parm->hd);
|
|
|
|
|
while (parm->stream_valid
|
|
|
|
|
&& !es_read (parm->stream, buffer, sizeof buffer, &nread))
|
2010-03-24 12:15:30 +00:00
|
|
|
|
{
|
|
|
|
|
do
|
|
|
|
|
{
|
2010-08-23 19:26:05 +00:00
|
|
|
|
pth_enter ();
|
|
|
|
|
rc = WriteFile (parm->hd, buffer, nread, &nwritten, NULL);
|
|
|
|
|
pth_leave ();
|
|
|
|
|
if (!rc)
|
2010-03-24 12:15:30 +00:00
|
|
|
|
{
|
2010-08-23 19:26:05 +00:00
|
|
|
|
log_debug ("feeder(%p): WriteFile error: rc=%d\n",
|
|
|
|
|
parm->hd, (int)GetLastError ());
|
2010-03-24 12:15:30 +00:00
|
|
|
|
goto leave;
|
|
|
|
|
}
|
|
|
|
|
nread -= nwritten;
|
|
|
|
|
}
|
|
|
|
|
while (nread);
|
|
|
|
|
}
|
2010-08-23 19:26:05 +00:00
|
|
|
|
if (!parm->stream_valid)
|
|
|
|
|
log_debug ("feeder(%p): closed by other thread\n", parm->hd);
|
|
|
|
|
else if (nread)
|
|
|
|
|
log_debug ("feeder(%p): es_read error: %s\n",
|
|
|
|
|
parm->hd, strerror (errno));
|
2010-03-24 12:15:30 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2010-08-23 19:26:05 +00:00
|
|
|
|
DWORD nread = 0;
|
2010-03-24 12:15:30 +00:00
|
|
|
|
size_t nwritten;
|
|
|
|
|
|
2010-08-23 19:26:05 +00:00
|
|
|
|
log_debug ("feeder_thread pipe->estream: stream=%p pipe=%p\n",
|
|
|
|
|
parm->stream, parm->hd);
|
|
|
|
|
while ( (pth_enter (),
|
|
|
|
|
(rc = ReadFile (parm->hd, buffer, sizeof buffer, &nread, NULL)),
|
|
|
|
|
pth_leave (),
|
|
|
|
|
rc) && nread)
|
2010-03-24 12:15:30 +00:00
|
|
|
|
{
|
2010-08-23 19:26:05 +00:00
|
|
|
|
log_debug ("feeder_thread pipe->estream: read %d bytes\n",
|
|
|
|
|
(int)nread);
|
|
|
|
|
do
|
2010-03-24 12:15:30 +00:00
|
|
|
|
{
|
2010-08-23 19:26:05 +00:00
|
|
|
|
if (parm->stream_valid
|
|
|
|
|
&& es_write (parm->stream, buffer, nread, &nwritten))
|
2010-03-24 12:15:30 +00:00
|
|
|
|
{
|
2010-08-23 19:26:05 +00:00
|
|
|
|
log_debug ("feeder(%p): es_write error: %s\n",
|
|
|
|
|
parm->hd, strerror (errno));
|
2010-03-24 12:15:30 +00:00
|
|
|
|
goto leave;
|
|
|
|
|
}
|
2010-08-23 19:26:05 +00:00
|
|
|
|
log_debug ("feeder_thread pipe->estream: es_wrote %d bytes\n",
|
|
|
|
|
(int)nwritten);
|
2010-03-24 12:15:30 +00:00
|
|
|
|
nread -= nwritten;
|
|
|
|
|
}
|
2010-08-23 19:26:05 +00:00
|
|
|
|
while (nread && parm->stream_valid);
|
2010-03-24 12:15:30 +00:00
|
|
|
|
}
|
2010-08-23 19:26:05 +00:00
|
|
|
|
if (!parm->stream_valid)
|
|
|
|
|
log_debug ("feeder(%p): closed by other thread\n", parm->hd);
|
|
|
|
|
else if (nread)
|
|
|
|
|
log_debug ("feeder(%p): ReadFile error: rc=%d\n",
|
|
|
|
|
parm->hd, (int)GetLastError ());
|
2010-03-24 12:15:30 +00:00
|
|
|
|
else
|
2010-08-23 19:26:05 +00:00
|
|
|
|
log_debug ("feeder(%p): eof\n", parm->hd);
|
2010-03-24 12:15:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
leave:
|
2010-08-23 19:26:05 +00:00
|
|
|
|
log_debug ("feeder(%p): waiting for es_fclose\n", parm->hd);
|
|
|
|
|
while (parm->stream_valid)
|
|
|
|
|
pth_yield (NULL);
|
|
|
|
|
log_debug ("feeder(%p): about to close the pipe handle\n", parm->hd);
|
|
|
|
|
CloseHandle (parm->hd);
|
|
|
|
|
log_debug ("feeder(%p): pipe handle closed\n", parm->hd);
|
2010-03-24 12:15:30 +00:00
|
|
|
|
xfree (parm);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#endif /*USE_NPTH*/
|
2010-03-24 12:15:30 +00:00
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#ifdef USE_NPTH
|
2010-08-23 19:26:05 +00:00
|
|
|
|
static void
|
|
|
|
|
feeder_onclose_notification (estream_t stream, void *opaque)
|
|
|
|
|
{
|
|
|
|
|
struct feeder_thread_parms *parm = opaque;
|
|
|
|
|
(void)stream;
|
|
|
|
|
log_debug ("feeder(%p): received onclose note\n", parm->hd);
|
|
|
|
|
parm->stream_valid = 0;
|
|
|
|
|
}
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#endif /*USE_NPTH*/
|
2010-08-23 19:26:05 +00:00
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
/* Fire up a thread to copy data between STREAM and a pipe's
|
|
|
|
|
descriptor FD. With DIRECTION set to true the copy takes place
|
|
|
|
|
from the stream to the pipe, otherwise from the pipe to the
|
|
|
|
|
stream. */
|
|
|
|
|
static gpg_error_t
|
2010-08-23 19:26:05 +00:00
|
|
|
|
start_feeder (estream_t stream, HANDLE hd, int direction)
|
2010-03-24 12:15:30 +00:00
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#ifdef USE_NPTH
|
2010-03-24 12:15:30 +00:00
|
|
|
|
gpg_error_t err;
|
|
|
|
|
struct feeder_thread_parms *parm;
|
|
|
|
|
pth_attr_t tattr;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
parm = xtrymalloc (sizeof *parm);
|
|
|
|
|
if (!parm)
|
|
|
|
|
return gpg_error_from_syserror ();
|
|
|
|
|
parm->stream = stream;
|
2010-08-23 19:26:05 +00:00
|
|
|
|
parm->stream_valid = 1;
|
|
|
|
|
parm->hd = hd;
|
2010-03-24 12:15:30 +00:00
|
|
|
|
parm->direction = direction;
|
2010-08-23 19:26:05 +00:00
|
|
|
|
|
|
|
|
|
if (es_onclose (stream, 1, feeder_onclose_notification, parm))
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
xfree (parm);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
tattr = pth_attr_new ();
|
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_JOINABLE, 0);
|
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_STACK_SIZE, 64*1024);
|
|
|
|
|
pth_attr_set (tattr, PTH_ATTR_NAME, "exec-feeder");
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2010-08-23 19:26:05 +00:00
|
|
|
|
log_debug ("spawning new feeder(%p, %p, %d)\n", stream, hd, direction);
|
2010-03-24 12:15:30 +00:00
|
|
|
|
if(!pth_spawn (tattr, feeder_thread, parm))
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
2010-08-23 19:26:05 +00:00
|
|
|
|
es_onclose (stream, 0, feeder_onclose_notification, parm);
|
2010-03-24 12:15:30 +00:00
|
|
|
|
xfree (parm);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
err = 0;
|
|
|
|
|
pth_attr_destroy (tattr);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
#else
|
|
|
|
|
(void)stream;
|
2010-08-23 19:26:05 +00:00
|
|
|
|
(void)hd;
|
2010-03-24 12:15:30 +00:00
|
|
|
|
(void)direction;
|
|
|
|
|
return gpg_error (GPG_ERR_NOT_IMPLEMENTED); /* No Pth. */
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
|
2009-03-19 07:09:31 +00:00
|
|
|
|
/* Return the maximum number of currently allowed open file
|
|
|
|
|
descriptors. Only useful on POSIX systems but returns a value on
|
|
|
|
|
other systems too. */
|
|
|
|
|
int
|
|
|
|
|
get_max_fds (void)
|
|
|
|
|
{
|
|
|
|
|
int max_fds = -1;
|
|
|
|
|
|
|
|
|
|
#ifdef OPEN_MAX
|
|
|
|
|
if (max_fds == -1)
|
|
|
|
|
max_fds = OPEN_MAX;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (max_fds == -1)
|
|
|
|
|
max_fds = 256; /* Arbitrary limit. */
|
|
|
|
|
|
|
|
|
|
return max_fds;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-08-23 19:26:05 +00:00
|
|
|
|
/* Under Windows this is a dummy function. */
|
2009-03-19 07:09:31 +00:00
|
|
|
|
void
|
|
|
|
|
close_all_fds (int first, int *except)
|
|
|
|
|
{
|
2010-08-23 19:26:05 +00:00
|
|
|
|
(void)first;
|
|
|
|
|
(void)except;
|
2009-03-19 07:09:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Returns an array with all currently open file descriptors. The end
|
|
|
|
|
of the array is marked by -1. The caller needs to release this
|
|
|
|
|
array using the *standard free* and not with xfree. This allow the
|
2010-08-23 19:26:05 +00:00
|
|
|
|
use of this function right at startup even before libgcrypt has
|
2009-03-19 07:09:31 +00:00
|
|
|
|
been initialized. Returns NULL on error and sets ERRNO
|
|
|
|
|
accordingly. */
|
|
|
|
|
int *
|
|
|
|
|
get_all_open_fds (void)
|
|
|
|
|
{
|
|
|
|
|
int *array;
|
|
|
|
|
size_t narray;
|
|
|
|
|
int fd, max_fd, idx;
|
|
|
|
|
#ifndef HAVE_STAT
|
|
|
|
|
array = calloc (1, sizeof *array);
|
|
|
|
|
if (array)
|
|
|
|
|
array[0] = -1;
|
|
|
|
|
#else /*HAVE_STAT*/
|
|
|
|
|
struct stat statbuf;
|
|
|
|
|
|
|
|
|
|
max_fd = get_max_fds ();
|
|
|
|
|
narray = 32; /* If you change this change also t-exechelp.c. */
|
|
|
|
|
array = calloc (narray, sizeof *array);
|
|
|
|
|
if (!array)
|
|
|
|
|
return NULL;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-03-19 07:09:31 +00:00
|
|
|
|
/* Note: The list we return is ordered. */
|
|
|
|
|
for (idx=0, fd=0; fd < max_fd; fd++)
|
|
|
|
|
if (!(fstat (fd, &statbuf) == -1 && errno == EBADF))
|
|
|
|
|
{
|
|
|
|
|
if (idx+1 >= narray)
|
|
|
|
|
{
|
|
|
|
|
int *tmp;
|
|
|
|
|
|
|
|
|
|
narray += (narray < 256)? 32:256;
|
|
|
|
|
tmp = realloc (array, narray * sizeof *array);
|
|
|
|
|
if (!tmp)
|
|
|
|
|
{
|
|
|
|
|
free (array);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
array = tmp;
|
|
|
|
|
}
|
|
|
|
|
array[idx++] = fd;
|
|
|
|
|
}
|
|
|
|
|
array[idx] = -1;
|
|
|
|
|
#endif /*HAVE_STAT*/
|
|
|
|
|
return array;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
|
2007-06-20 11:16:42 +00:00
|
|
|
|
static char *
|
2010-03-24 12:15:30 +00:00
|
|
|
|
copy_quoted (char *p, const char *string)
|
2007-06-20 11:16:42 +00:00
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
|
|
if (!*string) /* Empty string. */
|
|
|
|
|
p = stpcpy (p, "\"\"");
|
2010-03-24 12:15:30 +00:00
|
|
|
|
else if (strpbrk (string, " \t\n\v\f\"")) /* Need quotes. */
|
2007-06-20 11:16:42 +00:00
|
|
|
|
{
|
|
|
|
|
p = stpcpy (p, "\"");
|
2010-03-24 12:15:30 +00:00
|
|
|
|
for (s = string; *s; s++)
|
2007-06-20 11:16:42 +00:00
|
|
|
|
{
|
|
|
|
|
*p++ = *s;
|
|
|
|
|
if (*s == '\"')
|
|
|
|
|
*p++ = *s;
|
|
|
|
|
}
|
|
|
|
|
*p++ = '\"';
|
|
|
|
|
*p = 0;
|
|
|
|
|
}
|
2010-03-24 12:15:30 +00:00
|
|
|
|
else /* Copy verbatim. */
|
2007-06-20 11:16:42 +00:00
|
|
|
|
p = stpcpy (p, string);
|
|
|
|
|
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
|
/* Build a command line for use with W32's CreateProcess. On success
|
|
|
|
|
CMDLINE gets the address of a newly allocated string. */
|
2010-03-24 12:15:30 +00:00
|
|
|
|
static int
|
2010-05-04 15:21:47 +00:00
|
|
|
|
build_w32_commandline (const char * const *argv,
|
2010-08-23 19:26:05 +00:00
|
|
|
|
int rvid0, int rvid1, int rvid2,
|
2007-06-20 11:16:42 +00:00
|
|
|
|
char **cmdline)
|
2004-12-15 14:15:54 +00:00
|
|
|
|
{
|
|
|
|
|
int i, n;
|
|
|
|
|
const char *s;
|
|
|
|
|
char *buf, *p;
|
2010-03-24 12:15:30 +00:00
|
|
|
|
char fdbuf[3*30];
|
2004-12-15 14:15:54 +00:00
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
p = fdbuf;
|
|
|
|
|
*p = 0;
|
2010-08-23 19:26:05 +00:00
|
|
|
|
|
|
|
|
|
if (rvid0)
|
|
|
|
|
snprintf (p, 25, "-&S0=%d ", rvid0);
|
|
|
|
|
else
|
|
|
|
|
strcpy (p, "-&S0=null ");
|
|
|
|
|
p += strlen (p);
|
|
|
|
|
|
|
|
|
|
if (rvid1)
|
|
|
|
|
snprintf (p, 25, "-&S1=%d ", rvid1);
|
|
|
|
|
else
|
|
|
|
|
strcpy (p, "-&S1=null ");
|
|
|
|
|
p += strlen (p);
|
|
|
|
|
|
|
|
|
|
if (rvid2)
|
|
|
|
|
snprintf (p, 25, "-&S2=%d ", rvid2);
|
|
|
|
|
else
|
|
|
|
|
strcpy (p, "-&S2=null ");
|
|
|
|
|
p += strlen (p);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
|
*cmdline = NULL;
|
2010-03-24 12:15:30 +00:00
|
|
|
|
n = strlen (fdbuf);
|
|
|
|
|
for (i=0; (s = argv[i]); i++)
|
2004-12-15 14:15:54 +00:00
|
|
|
|
{
|
2010-03-24 12:15:30 +00:00
|
|
|
|
n += strlen (s) + 1 + 2; /* (1 space, 2 quoting) */
|
2004-12-15 14:15:54 +00:00
|
|
|
|
for (; *s; s++)
|
|
|
|
|
if (*s == '\"')
|
|
|
|
|
n++; /* Need to double inner quotes. */
|
|
|
|
|
}
|
|
|
|
|
n++;
|
|
|
|
|
|
|
|
|
|
buf = p = xtrymalloc (n);
|
2010-03-24 12:15:30 +00:00
|
|
|
|
if (! buf)
|
|
|
|
|
return -1;
|
2004-12-15 14:15:54 +00:00
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
p = stpcpy (p, fdbuf);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
for (i = 0; argv[i]; i++)
|
2004-12-15 14:15:54 +00:00
|
|
|
|
{
|
2007-06-20 11:16:42 +00:00
|
|
|
|
*p++ = ' ';
|
2010-03-24 12:15:30 +00:00
|
|
|
|
p = copy_quoted (p, argv[i]);
|
2004-12-15 14:15:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
*cmdline = buf;
|
2004-12-15 14:15:54 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-03-22 14:22:41 +00:00
|
|
|
|
/* Create pipe where one end is inheritable: With an INHERIT_IDX of 0
|
2010-03-24 12:15:30 +00:00
|
|
|
|
the read end is inheritable, with 1 the write end is inheritable.
|
|
|
|
|
Note that the inheritable ends are rendezvous ids and no file
|
|
|
|
|
descriptors or handles. */
|
|
|
|
|
static gpg_error_t
|
2010-03-22 14:22:41 +00:00
|
|
|
|
create_inheritable_pipe (int filedes[2], int inherit_idx)
|
2004-12-15 14:15:54 +00:00
|
|
|
|
{
|
2010-03-24 12:15:30 +00:00
|
|
|
|
HANDLE hd;
|
|
|
|
|
int rvid;
|
2004-12-15 14:15:54 +00:00
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
filedes[0] = filedes[1] = -1;
|
|
|
|
|
hd = _assuan_w32ce_prepare_pipe (&rvid, !inherit_idx);
|
|
|
|
|
if (hd == INVALID_HANDLE_VALUE)
|
2004-12-15 14:15:54 +00:00
|
|
|
|
{
|
2010-03-24 12:15:30 +00:00
|
|
|
|
log_error ("_assuan_w32ce_prepare_pipe failed: %s\n", w32_strerror (-1));
|
|
|
|
|
gpg_err_set_errno (EIO);
|
|
|
|
|
return gpg_error_from_syserror ();
|
2004-12-15 14:15:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-03-22 14:22:41 +00:00
|
|
|
|
if (inherit_idx)
|
2009-09-30 15:28:38 +00:00
|
|
|
|
{
|
2010-03-24 12:15:30 +00:00
|
|
|
|
filedes[0] = handle_to_fd (hd);
|
|
|
|
|
filedes[1] = rvid;
|
2010-03-22 14:22:41 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2010-03-24 12:15:30 +00:00
|
|
|
|
filedes[0] = rvid;
|
|
|
|
|
filedes[1] = handle_to_fd (hd);
|
2009-09-30 15:28:38 +00:00
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2006-09-07 15:13:33 +00:00
|
|
|
|
|
2004-12-06 18:28:56 +00:00
|
|
|
|
|
2010-03-22 14:22:41 +00:00
|
|
|
|
/* Portable function to create a pipe. Under Windows the write end is
|
2010-03-24 12:15:30 +00:00
|
|
|
|
inheritable (i.e. an rendezvous id). */
|
2010-03-22 14:22:41 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gnupg_create_inbound_pipe (int filedes[2])
|
|
|
|
|
{
|
2010-03-24 12:15:30 +00:00
|
|
|
|
return create_inheritable_pipe (filedes, 1);
|
2010-03-22 14:22:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-09-30 15:28:38 +00:00
|
|
|
|
|
|
|
|
|
/* Portable function to create a pipe. Under Windows the read end is
|
2010-03-24 12:15:30 +00:00
|
|
|
|
inheritable (i.e. an rendezvous id). */
|
2009-09-30 15:28:38 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gnupg_create_outbound_pipe (int filedes[2])
|
|
|
|
|
{
|
2010-03-24 12:15:30 +00:00
|
|
|
|
return create_inheritable_pipe (filedes, 0);
|
2007-08-29 16:59:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
static int
|
|
|
|
|
create_process (const char *pgmname, const char *cmdline,
|
|
|
|
|
PROCESS_INFORMATION *pi)
|
|
|
|
|
{
|
|
|
|
|
int res;
|
|
|
|
|
wchar_t *wpgmname, *wcmdline;
|
|
|
|
|
|
|
|
|
|
wpgmname = utf8_to_wchar (pgmname);
|
|
|
|
|
if (!wpgmname)
|
|
|
|
|
return 0;
|
|
|
|
|
wcmdline = utf8_to_wchar (cmdline);
|
|
|
|
|
if (!wcmdline)
|
|
|
|
|
{
|
|
|
|
|
xfree (wpgmname);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
res = CreateProcess (wpgmname, /* Program to start. */
|
|
|
|
|
wcmdline, /* Command line arguments. */
|
|
|
|
|
NULL, /* Process security attributes. */
|
|
|
|
|
NULL, /* Thread security attributes. */
|
|
|
|
|
FALSE, /* Inherit handles. */
|
|
|
|
|
CREATE_SUSPENDED, /* Creation flags. */
|
|
|
|
|
NULL, /* Environment. */
|
|
|
|
|
NULL, /* Use current drive/directory. */
|
|
|
|
|
NULL, /* Startup information. */
|
|
|
|
|
pi); /* Returns process information. */
|
|
|
|
|
xfree (wcmdline);
|
|
|
|
|
xfree (wpgmname);
|
|
|
|
|
return res;
|
|
|
|
|
}
|
2008-01-27 14:43:52 +00:00
|
|
|
|
|
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
/* Fork and exec the PGMNAME, see exechelp.h for details. */
|
2004-12-06 18:28:56 +00:00
|
|
|
|
gpg_error_t
|
|
|
|
|
gnupg_spawn_process (const char *pgmname, const char *argv[],
|
2010-08-20 12:18:38 +00:00
|
|
|
|
gpg_err_source_t errsource,
|
2008-01-27 14:43:52 +00:00
|
|
|
|
void (*preexec)(void), unsigned int flags,
|
2010-08-20 12:18:38 +00:00
|
|
|
|
estream_t infp,
|
|
|
|
|
estream_t *r_outfp,
|
|
|
|
|
estream_t *r_errfp,
|
|
|
|
|
pid_t *pid)
|
2004-12-06 18:28:56 +00:00
|
|
|
|
{
|
2004-12-15 14:15:54 +00:00
|
|
|
|
gpg_error_t err;
|
2010-03-24 12:15:30 +00:00
|
|
|
|
PROCESS_INFORMATION pi = {NULL };
|
2004-12-15 14:15:54 +00:00
|
|
|
|
char *cmdline;
|
2010-08-23 19:26:05 +00:00
|
|
|
|
es_syshd_t syshd;
|
|
|
|
|
struct {
|
|
|
|
|
HANDLE hd;
|
|
|
|
|
int rvid;
|
|
|
|
|
} inpipe = {INVALID_HANDLE_VALUE, 0};
|
|
|
|
|
struct {
|
|
|
|
|
HANDLE hd;
|
|
|
|
|
int rvid;
|
|
|
|
|
} outpipe = {INVALID_HANDLE_VALUE, 0};
|
|
|
|
|
struct {
|
|
|
|
|
HANDLE hd;
|
|
|
|
|
int rvid;
|
|
|
|
|
} errpipe = {INVALID_HANDLE_VALUE, 0};
|
|
|
|
|
estream_t outfp = NULL;
|
|
|
|
|
estream_t errfp = NULL;
|
2004-12-06 18:28:56 +00:00
|
|
|
|
|
2008-10-20 13:53:23 +00:00
|
|
|
|
(void)preexec;
|
2010-03-24 12:15:30 +00:00
|
|
|
|
(void)flags;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
|
/* Setup return values. */
|
2010-08-23 19:26:05 +00:00
|
|
|
|
if (r_outfp)
|
|
|
|
|
*r_outfp = NULL;
|
|
|
|
|
if (r_errfp)
|
|
|
|
|
*r_errfp = NULL;
|
|
|
|
|
*pid = (pid_t)(-1); /* Always required. */
|
|
|
|
|
|
|
|
|
|
log_debug ("%s: enter\n", __func__);
|
|
|
|
|
if (infp)
|
2010-03-24 12:15:30 +00:00
|
|
|
|
{
|
2010-08-23 19:26:05 +00:00
|
|
|
|
es_fflush (infp);
|
|
|
|
|
es_rewind (infp);
|
|
|
|
|
|
|
|
|
|
/* Create a pipe to copy our infile to the stdin of the child
|
|
|
|
|
process. On success inpipe.hd is owned by the feeder. */
|
|
|
|
|
inpipe.hd = _assuan_w32ce_prepare_pipe (&inpipe.rvid, 1);
|
|
|
|
|
if (inpipe.hd == INVALID_HANDLE_VALUE)
|
|
|
|
|
{
|
|
|
|
|
log_error ("_assuan_w32ce_prepare_pipe failed: %s\n",
|
|
|
|
|
w32_strerror (-1));
|
|
|
|
|
gpg_err_set_errno (EIO);
|
|
|
|
|
return gpg_error_from_syserror ();
|
|
|
|
|
}
|
|
|
|
|
log_debug ("%s: inpipe %p created; hd=%p rvid=%d\n", __func__,
|
|
|
|
|
infp, inpipe.hd, inpipe.rvid);
|
|
|
|
|
err = start_feeder (infp, inpipe.hd, 1);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
log_error ("error spawning feeder: %s\n", gpg_strerror (err));
|
|
|
|
|
CloseHandle (inpipe.hd);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
inpipe.hd = INVALID_HANDLE_VALUE; /* Now owned by the feeder. */
|
|
|
|
|
log_debug ("%s: inpipe %p created; feeder started\n", __func__,
|
|
|
|
|
infp);
|
2010-03-24 12:15:30 +00:00
|
|
|
|
}
|
2004-12-15 14:15:54 +00:00
|
|
|
|
|
2010-08-23 19:26:05 +00:00
|
|
|
|
if (r_outfp)
|
2004-12-15 14:15:54 +00:00
|
|
|
|
{
|
2010-08-23 19:26:05 +00:00
|
|
|
|
/* Create a pipe to make the stdout of the child process
|
|
|
|
|
available as a stream. */
|
|
|
|
|
outpipe.hd = _assuan_w32ce_prepare_pipe (&outpipe.rvid, 0);
|
|
|
|
|
if (outpipe.hd == INVALID_HANDLE_VALUE)
|
|
|
|
|
{
|
|
|
|
|
log_error ("_assuan_w32ce_prepare_pipe failed: %s\n",
|
|
|
|
|
w32_strerror (-1));
|
|
|
|
|
gpg_err_set_errno (EIO);
|
|
|
|
|
/* Fixme release other stuff/kill feeder. */
|
|
|
|
|
return gpg_error_from_syserror ();
|
|
|
|
|
}
|
|
|
|
|
syshd.type = ES_SYSHD_HANDLE;
|
|
|
|
|
syshd.u.handle = outpipe.hd;
|
|
|
|
|
err = 0;
|
|
|
|
|
outfp = es_sysopen (&syshd, "r");
|
|
|
|
|
if (!outfp)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_err_make (errsource, gpg_err_code_from_syserror ());
|
|
|
|
|
log_error ("error opening pipe stream: %s\n", gpg_strerror (err));
|
|
|
|
|
CloseHandle (outpipe.hd);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
log_debug ("%s: outpipe %p created; hd=%p rvid=%d\n", __func__,
|
|
|
|
|
outfp, outpipe.hd, outpipe.rvid);
|
|
|
|
|
outpipe.hd = INVALID_HANDLE_VALUE; /* Now owned by the OUTFP. */
|
2004-12-15 14:15:54 +00:00
|
|
|
|
}
|
2010-08-23 19:26:05 +00:00
|
|
|
|
|
|
|
|
|
if (r_errfp)
|
2010-03-24 12:15:30 +00:00
|
|
|
|
{
|
2010-08-23 19:26:05 +00:00
|
|
|
|
/* Create a pipe to make the stderr of the child process
|
|
|
|
|
available as a stream. */
|
|
|
|
|
errpipe.hd = _assuan_w32ce_prepare_pipe (&errpipe.rvid, 0);
|
|
|
|
|
if (errpipe.hd == INVALID_HANDLE_VALUE)
|
|
|
|
|
{
|
|
|
|
|
log_error ("_assuan_w32ce_prepare_pipe failed: %s\n",
|
|
|
|
|
w32_strerror (-1));
|
|
|
|
|
gpg_err_set_errno (EIO);
|
|
|
|
|
/* Fixme release other stuff/kill feeder. */
|
|
|
|
|
return gpg_error_from_syserror ();
|
|
|
|
|
}
|
|
|
|
|
syshd.type = ES_SYSHD_HANDLE;
|
|
|
|
|
syshd.u.handle = errpipe.hd;
|
|
|
|
|
err = 0;
|
|
|
|
|
errfp = es_sysopen (&syshd, "r");
|
|
|
|
|
if (!errfp)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_err_make (errsource, gpg_err_code_from_syserror ());
|
|
|
|
|
log_error ("error opening pipe stream: %s\n", gpg_strerror (err));
|
|
|
|
|
CloseHandle (errpipe.hd);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
log_debug ("%s: errpipe %p created; hd=%p rvid=%d\n", __func__,
|
|
|
|
|
errfp, errpipe.hd, errpipe.rvid);
|
|
|
|
|
errpipe.hd = INVALID_HANDLE_VALUE; /* Now owned by the ERRFP. */
|
2010-03-24 12:15:30 +00:00
|
|
|
|
}
|
2010-03-22 15:00:54 +00:00
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Build the command line. */
|
2010-08-23 19:26:05 +00:00
|
|
|
|
err = build_w32_commandline (argv, inpipe.rvid, outpipe.rvid, errpipe.rvid,
|
2010-05-04 15:21:47 +00:00
|
|
|
|
&cmdline);
|
2010-03-24 12:15:30 +00:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
2010-08-23 19:26:05 +00:00
|
|
|
|
/* Fixme release other stuff/kill feeder. */
|
|
|
|
|
CloseHandle (errpipe.hd);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
return err;
|
2010-03-24 12:15:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_debug ("CreateProcess, path='%s' cmdline='%s'\n", pgmname, cmdline);
|
2010-03-24 12:15:30 +00:00
|
|
|
|
if (!create_process (pgmname, cmdline, &pi))
|
2004-12-15 14:15:54 +00:00
|
|
|
|
{
|
|
|
|
|
log_error ("CreateProcess failed: %s\n", w32_strerror (-1));
|
|
|
|
|
xfree (cmdline);
|
2010-08-23 19:26:05 +00:00
|
|
|
|
/* Fixme release other stuff/kill feeder. */
|
|
|
|
|
CloseHandle (errpipe.hd);
|
2004-12-15 14:15:54 +00:00
|
|
|
|
return gpg_error (GPG_ERR_GENERAL);
|
|
|
|
|
}
|
|
|
|
|
xfree (cmdline);
|
|
|
|
|
cmdline = NULL;
|
|
|
|
|
|
2010-03-24 12:15:30 +00:00
|
|
|
|
/* Note: The other end of the pipe is a rendezvous id and thus there
|
2010-08-23 19:26:05 +00:00
|
|
|
|
is no need for a close. */
|
2010-03-24 12:15:30 +00:00
|
|
|
|
|
|
|
|
|
log_debug ("CreateProcess ready: hProcess=%p hThread=%p"
|
|
|
|
|
" dwProcessID=%d dwThreadId=%d\n",
|
|
|
|
|
pi.hProcess, pi.hThread,
|
|
|
|
|
(int) pi.dwProcessId, (int) pi.dwThreadId);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
|
|
2007-06-20 11:16:42 +00:00
|
|
|
|
/* Process has been created suspended; resume it now. */
|
2004-12-15 14:15:54 +00:00
|
|
|
|
ResumeThread (pi.hThread);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
CloseHandle (pi.hThread);
|
2004-12-15 14:15:54 +00:00
|
|
|
|
|
2010-08-23 19:26:05 +00:00
|
|
|
|
if (r_outfp)
|
|
|
|
|
*r_outfp = outfp;
|
|
|
|
|
if (r_errfp)
|
|
|
|
|
*r_errfp = errfp;
|
2004-12-15 14:15:54 +00:00
|
|
|
|
*pid = handle_to_pid (pi.hProcess);
|
|
|
|
|
return 0;
|
2004-12-06 18:28:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-08-27 18:10:27 +00:00
|
|
|
|
|
|
|
|
|
/* Simplified version of gnupg_spawn_process. This function forks and
|
|
|
|
|
then execs PGMNAME, while connecting INFD to stdin, OUTFD to stdout
|
|
|
|
|
and ERRFD to stderr (any of them may be -1 to connect them to
|
|
|
|
|
/dev/null). The arguments for the process are expected in the NULL
|
|
|
|
|
terminated array ARGV. The program name itself should not be
|
|
|
|
|
included there. Calling gnupg_wait_process is required.
|
|
|
|
|
|
|
|
|
|
Returns 0 on success or an error code. */
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gnupg_spawn_process_fd (const char *pgmname, const char *argv[],
|
|
|
|
|
int infd, int outfd, int errfd, pid_t *pid)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
2010-05-04 15:21:47 +00:00
|
|
|
|
PROCESS_INFORMATION pi = {NULL};
|
2007-08-27 18:10:27 +00:00
|
|
|
|
char *cmdline;
|
|
|
|
|
|
|
|
|
|
/* Setup return values. */
|
|
|
|
|
*pid = (pid_t)(-1);
|
|
|
|
|
|
2010-05-04 15:21:47 +00:00
|
|
|
|
if (infd != -1 || outfd != -1 || errfd != -1)
|
|
|
|
|
return gpg_error (GPG_ERR_NOT_SUPPORTED);
|
|
|
|
|
|
2007-08-27 18:10:27 +00:00
|
|
|
|
/* Build the command line. */
|
2010-08-23 19:26:05 +00:00
|
|
|
|
err = build_w32_commandline (argv, 0, 0, 0, &cmdline);
|
2007-08-27 18:10:27 +00:00
|
|
|
|
if (err)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
return err;
|
2007-08-27 18:10:27 +00:00
|
|
|
|
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_debug ("CreateProcess, path='%s' cmdline='%s'\n", pgmname, cmdline);
|
2010-05-04 15:21:47 +00:00
|
|
|
|
if (!create_process (pgmname, cmdline, &pi))
|
2007-08-27 18:10:27 +00:00
|
|
|
|
{
|
2010-05-04 15:21:47 +00:00
|
|
|
|
log_error ("CreateProcess(fd) failed: %s\n", w32_strerror (-1));
|
|
|
|
|
xfree (cmdline);
|
|
|
|
|
return gpg_error (GPG_ERR_GENERAL);
|
2007-08-27 18:10:27 +00:00
|
|
|
|
}
|
|
|
|
|
xfree (cmdline);
|
2010-05-04 15:21:47 +00:00
|
|
|
|
cmdline = NULL;
|
2007-08-27 18:10:27 +00:00
|
|
|
|
|
2010-05-04 15:21:47 +00:00
|
|
|
|
log_debug ("CreateProcess(fd) ready: hProcess=%p hThread=%p"
|
|
|
|
|
" dwProcessID=%d dwThreadId=%d\n",
|
|
|
|
|
pi.hProcess, pi.hThread,
|
|
|
|
|
(int) pi.dwProcessId, (int) pi.dwThreadId);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2007-08-27 18:10:27 +00:00
|
|
|
|
/* Process has been created suspended; resume it now. */
|
|
|
|
|
ResumeThread (pi.hThread);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
CloseHandle (pi.hThread);
|
2007-08-27 18:10:27 +00:00
|
|
|
|
|
|
|
|
|
*pid = handle_to_pid (pi.hProcess);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
/* See exechelp.h for a description. */
|
2004-12-06 18:28:56 +00:00
|
|
|
|
gpg_error_t
|
2010-06-09 16:53:51 +00:00
|
|
|
|
gnupg_wait_process (const char *pgmname, pid_t pid, int hang, int *exitcode)
|
2004-12-06 18:28:56 +00:00
|
|
|
|
{
|
|
|
|
|
gpg_err_code_t ec;
|
2004-12-15 14:15:54 +00:00
|
|
|
|
HANDLE proc = fd_to_handle (pid);
|
|
|
|
|
int code;
|
|
|
|
|
DWORD exc;
|
|
|
|
|
|
2007-08-29 09:51:37 +00:00
|
|
|
|
if (exitcode)
|
|
|
|
|
*exitcode = -1;
|
|
|
|
|
|
2004-12-15 14:15:54 +00:00
|
|
|
|
if (pid == (pid_t)(-1))
|
|
|
|
|
return gpg_error (GPG_ERR_INV_VALUE);
|
|
|
|
|
|
|
|
|
|
/* FIXME: We should do a pth_waitpid here. However this has not yet
|
|
|
|
|
been implemented. A special W32 pth system call would even be
|
|
|
|
|
better. */
|
2010-06-09 16:53:51 +00:00
|
|
|
|
code = WaitForSingleObject (proc, hang? INFINITE : 0);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
switch (code)
|
2004-12-15 14:15:54 +00:00
|
|
|
|
{
|
2010-06-09 16:53:51 +00:00
|
|
|
|
case WAIT_TIMEOUT:
|
|
|
|
|
ec = GPG_ERR_TIMEOUT;
|
|
|
|
|
break;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
case WAIT_FAILED:
|
|
|
|
|
log_error (_("waiting for process %d to terminate failed: %s\n"),
|
|
|
|
|
(int)pid, w32_strerror (-1));
|
|
|
|
|
ec = GPG_ERR_GENERAL;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case WAIT_OBJECT_0:
|
|
|
|
|
if (!GetExitCodeProcess (proc, &exc))
|
|
|
|
|
{
|
|
|
|
|
log_error (_("error getting exit code of process %d: %s\n"),
|
|
|
|
|
(int)pid, w32_strerror (-1) );
|
|
|
|
|
ec = GPG_ERR_GENERAL;
|
2004-12-15 14:15:54 +00:00
|
|
|
|
}
|
2010-06-09 16:53:51 +00:00
|
|
|
|
else if (exc)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error (_("error running '%s': exit status %d\n"),
|
2004-12-15 14:15:54 +00:00
|
|
|
|
pgmname, (int)exc );
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (exitcode)
|
|
|
|
|
*exitcode = (int)exc;
|
|
|
|
|
ec = GPG_ERR_GENERAL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (exitcode)
|
|
|
|
|
*exitcode = 0;
|
|
|
|
|
ec = 0;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
default:
|
|
|
|
|
log_error ("WaitForSingleObject returned unexpected "
|
|
|
|
|
"code %d for pid %d\n", code, (int)pid );
|
|
|
|
|
ec = GPG_ERR_GENERAL;
|
|
|
|
|
break;
|
2004-12-15 14:15:54 +00:00
|
|
|
|
}
|
2004-12-06 18:28:56 +00:00
|
|
|
|
|
|
|
|
|
return gpg_err_make (GPG_ERR_SOURCE_DEFAULT, ec);
|
|
|
|
|
}
|
|
|
|
|
|
2006-09-07 15:13:33 +00:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
void
|
|
|
|
|
gnupg_release_process (pid_t pid)
|
|
|
|
|
{
|
|
|
|
|
if (pid != (pid_t)INVALID_HANDLE_VALUE)
|
|
|
|
|
{
|
|
|
|
|
HANDLE process = (HANDLE)pid;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
CloseHandle (process);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-09-07 15:13:33 +00:00
|
|
|
|
/* Spawn a new process and immediatley detach from it. The name of
|
|
|
|
|
the program to exec is PGMNAME and its arguments are in ARGV (the
|
|
|
|
|
programname is automatically passed as first argument).
|
|
|
|
|
Environment strings in ENVP are set. An error is returned if
|
|
|
|
|
pgmname is not executable; to make this work it is necessary to
|
|
|
|
|
provide an absolute file name. All standard file descriptors are
|
|
|
|
|
connected to /dev/null. */
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
|
|
|
|
|
const char *envp[] )
|
|
|
|
|
{
|
2007-06-20 11:16:42 +00:00
|
|
|
|
gpg_error_t err;
|
|
|
|
|
char *cmdline;
|
2010-05-04 15:21:47 +00:00
|
|
|
|
PROCESS_INFORMATION pi = {NULL };
|
2007-06-20 11:16:42 +00:00
|
|
|
|
|
2008-10-20 13:53:23 +00:00
|
|
|
|
(void)envp;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2007-06-20 11:16:42 +00:00
|
|
|
|
/* Build the command line. */
|
2010-08-23 19:26:05 +00:00
|
|
|
|
err = build_w32_commandline (argv, 0, 0, 0, &cmdline);
|
2007-06-20 11:16:42 +00:00
|
|
|
|
if (err)
|
2011-02-04 12:57:53 +01:00
|
|
|
|
return err;
|
2007-06-20 11:16:42 +00:00
|
|
|
|
|
2010-05-04 15:21:47 +00:00
|
|
|
|
/* Note: There is no detached flag under CE. */
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_debug ("CreateProcess, path='%s' cmdline='%s'\n", pgmname, cmdline);
|
2010-05-04 15:21:47 +00:00
|
|
|
|
if (!create_process (pgmname, cmdline, &pi))
|
2007-06-20 11:16:42 +00:00
|
|
|
|
{
|
|
|
|
|
log_error ("CreateProcess(detached) failed: %s\n", w32_strerror (-1));
|
|
|
|
|
xfree (cmdline);
|
|
|
|
|
return gpg_error (GPG_ERR_GENERAL);
|
|
|
|
|
}
|
|
|
|
|
xfree (cmdline);
|
|
|
|
|
cmdline = NULL;
|
|
|
|
|
|
2010-05-04 15:21:47 +00:00
|
|
|
|
log_debug ("CreateProcess(detached) ready: hProcess=%p hThread=%p"
|
|
|
|
|
" dwProcessID=%d dwThreadId=%d\n",
|
|
|
|
|
pi.hProcess, pi.hThread,
|
|
|
|
|
(int) pi.dwProcessId, (int) pi.dwThreadId);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2010-05-04 15:21:47 +00:00
|
|
|
|
/* Process has been created suspended; resume it now. */
|
|
|
|
|
ResumeThread (pi.hThread);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
CloseHandle (pi.hThread);
|
2007-06-20 11:16:42 +00:00
|
|
|
|
|
|
|
|
|
return 0;
|
2006-09-07 15:13:33 +00:00
|
|
|
|
}
|
2009-10-13 19:17:24 +00:00
|
|
|
|
|
2010-05-04 15:21:47 +00:00
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
/* Kill a process; that is send an appropriate signal to the process.
|
|
|
|
|
gnupg_wait_process must be called to actually remove the process
|
|
|
|
|
from the system. An invalid PID is ignored. */
|
|
|
|
|
void
|
|
|
|
|
gnupg_kill_process (pid_t pid)
|
|
|
|
|
{
|
2010-03-22 15:00:54 +00:00
|
|
|
|
if (pid != (pid_t) INVALID_HANDLE_VALUE)
|
2009-10-13 19:17:24 +00:00
|
|
|
|
{
|
|
|
|
|
HANDLE process = (HANDLE) pid;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
/* Arbitrary error code. */
|
|
|
|
|
TerminateProcess (process, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|