security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

gpgsplit: Allow building without zlib support. 

* tools/gpgsplit.c [!HAVE_ZLIB]: Do not include zlib.h.
(handle_zlib): Build only if HAVE_ZLIB is defined.
(write_part): Support zlib and zip only if HAVE_ZLIB is defined.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2014-01-09 19:05:07 +01:00
parent fa318406c9
commit 00d5d2204c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/gpgsplit.c
View File

@ -29,9 +29,11 @@
#ifdef HAVE_DOSISH_SYSTEM #ifdef HAVE_DOSISH_SYSTEM
# include <fcntl.h> /* for setmode() */ # include <fcntl.h> /* for setmode() */
#endif #endif
#include <zlib.h> #ifdef HAVE_ZIP
# include <zlib.h>
#endif
#ifdef HAVE_BZIP2 #ifdef HAVE_BZIP2
#include <bzlib.h> # include <bzlib.h>
#endif /* HAVE_BZIP2 */ #endif /* HAVE_BZIP2 */
#if defined(__riscos__) && defined(USE_ZLIBRISCOS) #if defined(__riscos__) && defined(USE_ZLIBRISCOS)
# include "zlib-riscos.h" # include "zlib-riscos.h"
@ -360,6 +362,7 @@ public_key_length (const unsigned char *buf, size_t buflen)
return s - buf; return s - buf;
} }
#ifdef HAVE_ZIP
static int static int
handle_zlib(int algo,FILE *fpin,FILE *fpout) handle_zlib(int algo,FILE *fpin,FILE *fpout)
{ {
@ -452,6 +455,7 @@ handle_zlib(int algo,FILE *fpin,FILE *fpout)
return 0; return 0;
} }
#endif /*HAVE_ZIP*/
#ifdef HAVE_BZIP2 #ifdef HAVE_BZIP2
static int static int
@ -698,11 +702,15 @@ write_part (FILE *fpin, unsigned long pktlen,
if ((c = getc (fpin)) == EOF) if ((c = getc (fpin)) == EOF)
goto read_error; goto read_error;
if(c==1 || c==2) if (0)
;
#ifdef HAVE_ZIP
else if(c==1 || c==2)
{ {
if(handle_zlib(c,fpin,fpout)) if(handle_zlib(c,fpin,fpout))
goto write_error; goto write_error;
} }
#endif /* HAVE_ZIP */
#ifdef HAVE_BZIP2 #ifdef HAVE_BZIP2
else if(c==3) else if(c==3)
{ {