[svn] GnuPG - r5355 - trunk/common

[svn author marcus]

Author: marcus
Date: 2010-06-10 19:55:22 +0200 (Thu, 10 Jun 2010)
New Revision: 5355

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

	* sysutils.c (translate_sys2libc_fd) [HAVE_W32CE_SYSTEM]:
	Implement.
	(translate_sys2libc_fd_int) [HAVE_W32CE_SYSTEM]: Don't call
	translate_sys2libc_fd.


Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog	2010-06-10 15:26:03 UTC (rev 5354)
+++ trunk/common/ChangeLog	2010-06-10 17:55:22 UTC (rev 5355)
@@ -1,5 +1,10 @@
 2010-06-10  Marcus Brinkmann  <marcus at g10code.de>
 
+	* sysutils.c (translate_sys2libc_fd) [HAVE_W32CE_SYSTEM]:
+	Implement.
+	(translate_sys2libc_fd_int) [HAVE_W32CE_SYSTEM]: Don't call
+	translate_sys2libc_fd.
+
 	* estream.c (_es_get_std_stream): Fix cut&paste bug.
 
 2010-06-09  Werner Koch  <wk at g10code.com>

Modified: trunk/common/sysutils.c
===================================================================
--- trunk/common/sysutils.c	2010-06-10 15:26:03 UTC (rev 5354)
+++ trunk/common/sysutils.c	2010-06-10 17:55:22 UTC (rev 5355)
@@ -280,8 +280,7 @@
 translate_sys2libc_fd (gnupg_fd_t fd, int for_write)
 {
 #if defined(HAVE_W32CE_SYSTEM)
-  (void)for_write;
-  return (int)fd;
+  return (int) _assuan_w32ce_finish_pipe ((int)fd, for_write);
 #elif defined(HAVE_W32_SYSTEM)
   int x;
 
@@ -308,8 +307,7 @@
 translate_sys2libc_fd_int (int fd, int for_write)
 {
 #if HAVE_W32CE_SYSTEM
-  fd = (int) _assuan_w32ce_finish_pipe (fd, for_write);
-  return translate_sys2libc_fd ((void*)fd, for_write);
+  return (int) _assuan_w32ce_finish_pipe (fd, for_write);
 #elif HAVE_W32_SYSTEM
   if (fd <= 2)
     return fd;	/* Do not do this for error, stdin, stdout, stderr. */