[svn] GnuPG - r5353 - trunk/sm

[svn author marcus]

Author: marcus
Date: 2010-06-10 17:08:29 +0200 (Thu, 10 Jun 2010)
New Revision: 5353

Modified:
   trunk/sm/server.c
Log:
common/
2010-06-10  Marcus Brinkmann  <marcus at g10code.de>

	* estream.c (_es_get_std_stream): Fix cut&paste bug.

sm/
2010-06-10  Marcus Brinkmann  <marcus at g10code.de>

	* server.c (SERVER_STDIN, SERVER_STDOUT): New macros.
	(gpgsm_server): Use them with assuan_fdopen.


Modified: trunk/sm/server.c
===================================================================
--- trunk/sm/server.c	2010-06-10 10:39:44 UTC (rev 5352)
+++ trunk/sm/server.c	2010-06-10 15:08:29 UTC (rev 5353)
@@ -1249,8 +1249,15 @@
   /* 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)
     {