security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

2010-06-08 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* Makefile.am (AM_CFLAGS): Add $(LIBASSUAN_CFLAGS).
	(t_common_ldadd): Add $(LIBASSUAN_LIBS).
	* sysutils.c: Include <assuan.h>.
	(translate_sys2libc_fd_int): Cast to silence gcc warning.
	* iobuf.c: Include <assuan.h>
	(translate_file_handle): Fix syntax error.
This commit is contained in:
Marcus Brinkmann 2010-06-08 18:33:21 +00:00
parent f7b0b80e4a
commit 70f3a9bbb6
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/ChangeLog
View File

@ -1,3 +1,12 @@
2010-06-08 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (AM_CFLAGS): Add $(LIBASSUAN_CFLAGS).
(t_common_ldadd): Add $(LIBASSUAN_LIBS).
* sysutils.c: Include <assuan.h>.
(translate_sys2libc_fd_int): Cast to silence gcc warning.
* iobuf.c: Include <assuan.h>
(translate_file_handle): Fix syntax error.
2010-06-08 Werner Koch <wk@g10code.com> 2010-06-08 Werner Koch <wk@g10code.com>
* iobuf.c (translate_file_handle) [W32CE]: Handle rendezvous ids. * iobuf.c (translate_file_handle) [W32CE]: Handle rendezvous ids.

4
common/Makefile.am
View File

@ -34,7 +34,7 @@ CLEANFILES = audit-events.h status-codes.h
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS)
include $(top_srcdir)/am/cmacros.am include $(top_srcdir)/am/cmacros.am
@ -168,7 +168,7 @@ module_maint_tests = t-helpfile t-b64
t_common_ldadd = libcommon.a ../gl/libgnu.a \ t_common_ldadd = libcommon.a ../gl/libgnu.a \
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
# jnlib tests # jnlib tests
t_stringhelp_SOURCES = t-stringhelp.c $(t_jnlib_src) t_stringhelp_SOURCES = t-stringhelp.c $(t_jnlib_src)

6
common/iobuf.c
View File

@ -37,6 +37,8 @@
# include <swis.h> # include <swis.h>
#endif /* __riscos__ */ #endif /* __riscos__ */
#include <assuan.h>
#include "util.h" #include "util.h"
#include "sysutils.h" #include "sysutils.h"
#include "iobuf.h" #include "iobuf.h"
@ -2366,11 +2368,11 @@ iobuf_read_line (iobuf_t a, byte ** addr_of_buffer,
static int static int
translate_file_handle (int fd, int for_write) translate_file_handle (int fd, int for_write)
{ {
#if defined (HAVE_W32CE_SYSTEM) #if defined(HAVE_W32CE_SYSTEM)
/* This is called only with one of the special filenames. Under /* This is called only with one of the special filenames. Under
W32CE the FD here is not a file descriptor but a rendezvous id, W32CE the FD here is not a file descriptor but a rendezvous id,
thus we need to finish the pipe first. */ thus we need to finish the pipe first. */
fd = _assuan_w32ce_finish_pipe fd, for_write); fd = _assuan_w32ce_finish_pipe (fd, for_write);
#elif defined(HAVE_W32_SYSTEM) #elif defined(HAVE_W32_SYSTEM)
{ {
int x; int x;

4
common/sysutils.c
View File

@ -51,6 +51,8 @@
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#include <assuan.h>
#include "setenv.h" /* Gnulib replacement. */ #include "setenv.h" /* Gnulib replacement. */
#include "util.h" #include "util.h"
@ -306,7 +308,7 @@ int
translate_sys2libc_fd_int (int fd, int for_write) translate_sys2libc_fd_int (int fd, int for_write)
{ {
#if HAVE_W32CE_SYSTEM #if HAVE_W32CE_SYSTEM
fd = _assuan_w32ce_finish_pipe fd, for_write); fd = (int) _assuan_w32ce_finish_pipe (fd, for_write);
return translate_sys2libc_fd ((void*)fd, for_write); return translate_sys2libc_fd ((void*)fd, for_write);
#elif HAVE_W32_SYSTEM #elif HAVE_W32_SYSTEM
if (fd <= 2) if (fd <= 2)