diff options
| author | Marcus Brinkmann <[email protected]> | 2010-06-10 15:08:29 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2010-06-10 15:08:29 +0000 |
| commit | ab3d60c8d2ad0ece570240ef50be4900692b63f4 (patch) | |
| tree | 5d27f19bbbbbe733daaafb648c76c40d7d8582e3 | |
| parent | Include dirmngr manual (diff) | |
| download | gnupg-ab3d60c8d2ad0ece570240ef50be4900692b63f4.tar.gz gnupg-ab3d60c8d2ad0ece570240ef50be4900692b63f4.zip | |
common/
2010-06-10 Marcus Brinkmann <[email protected]>
* estream.c (_es_get_std_stream): Fix cut&paste bug.
sm/
2010-06-10 Marcus Brinkmann <[email protected]>
* server.c (SERVER_STDIN, SERVER_STDOUT): New macros.
(gpgsm_server): Use them with assuan_fdopen.
| -rw-r--r-- | sm/server.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sm/server.c b/sm/server.c index 072064539..d8a30acf3 100644 --- a/sm/server.c +++ b/sm/server.c @@ -1249,8 +1249,15 @@ gpgsm_server (certlist_t default_recplist) /* We use a pipe based server so that we can work from scripts. assuan_init_pipe_server will automagically detect when we are called with a socketpair and ignore FILEDES in this case. */ - filedes[0] = assuan_fdopen (0); - filedes[1] = assuan_fdopen (1); +#ifdef HAVE_W32CE_SYSTEM + #define SERVER_STDIN es_fileno(es_stdin) + #define SERVER_STDOUT es_fileno(es_stdout) +#else +#define SERVER_STDIN 0 +#define SERVER_STDOUT 1 +#endif + filedes[0] = assuan_fdopen (SERVER_STDIN); + filedes[1] = assuan_fdopen (SERVER_STDOUT); rc = assuan_new (&ctx); if (rc) { |