diff options
| author | Werner Koch <[email protected]> | 2007-11-12 15:52:01 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-11-12 15:52:01 +0000 |
| commit | 14296f338fe2bff8871f04be9f3804b33aa6ab6b (patch) | |
| tree | d3ea8016f905a33707981e4359d31673120ddac4 | |
| parent | * parse-packet.c (parse_onepass_sig): Sigclass is hex, so include the (diff) | |
| download | gnupg-14296f338fe2bff8871f04be9f3804b33aa6ab6b.tar.gz gnupg-14296f338fe2bff8871f04be9f3804b33aa6ab6b.zip | |
* status.c (do_get_from_fd, do_shm_get): s/bool/getbool/ to
overcome problems with Mac OS 10.5 which seems to include
stdbool.h silently.
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | doc/faq.raw | 1 | ||||
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/status.c | 16 |
4 files changed, 16 insertions, 8 deletions
@@ -2,6 +2,7 @@ Program: GnuPG Maintainer: Werner Koch <[email protected]> Bug reports: <[email protected]> Security related bug reports: <[email protected]> +License: GPLv3+ Authors diff --git a/doc/faq.raw b/doc/faq.raw index 27018c599..6ffe09dc9 100644 --- a/doc/faq.raw +++ b/doc/faq.raw @@ -1338,5 +1338,6 @@ you could search in the mailing list archive. [H hr] Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc., + Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. diff --git a/g10/ChangeLog b/g10/ChangeLog index bec8c5353..de3a7bb6c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2007-11-12 Werner Koch <[email protected]> + + * status.c (do_get_from_fd, do_shm_get): s/bool/getbool/ to + overcome problems with Mac OS 10.5 which seems to include + stdbool.h silently. + 2007-10-27 David Shaw <[email protected]> * parse-packet.c (parse_onepass_sig): Sigclass is hex, so include diff --git a/g10/status.c b/g10/status.c index de33b468e..217856fc3 100644 --- a/g10/status.c +++ b/g10/status.c @@ -468,10 +468,10 @@ init_shm_coprocessing ( ulong requested_shm_size, int lock_mem ) /**************** * Request a string from client - * If bool, returns static string on true (do not free) or NULL for false + * If GETBOOL, returns static string on true (do not free) or NULL for false */ static char * -do_shm_get( const char *keyword, int hidden, int bool ) +do_shm_get( const char *keyword, int hidden, int getbool ) { size_t n; byte *p; @@ -485,7 +485,7 @@ do_shm_get( const char *keyword, int hidden, int bool ) shm_area[2] = 1; /* indicate that we are waiting on a reply */ shm_area[3] = 0; /* clear data available flag */ - write_status_text( bool? STATUS_SHM_GET_BOOL : + write_status_text( getbool? STATUS_SHM_GET_BOOL : hidden? STATUS_SHM_GET_HIDDEN : STATUS_SHM_GET, keyword ); do { @@ -500,7 +500,7 @@ do_shm_get( const char *keyword, int hidden, int bool ) if( n+32+2+1 > 4095 ) log_fatal("client returns too large data (%u bytes)\n", (unsigned)n ); - if( bool ) + if( getbool ) return p[0]? "" : NULL; string = hidden? xmalloc_secure( n+1 ) : xmalloc( n+1 ); @@ -543,10 +543,10 @@ myread(int fd, void *buf, size_t count) /**************** * Request a string from the client over the command-fd - * If bool, returns static string on true (do not free) or NULL for false + * If getbool, returns static string on true (do not free) or NULL for false */ static char * -do_get_from_fd( const char *keyword, int hidden, int bool ) +do_get_from_fd( const char *keyword, int hidden, int getbool ) { int i, len; char *string; @@ -554,7 +554,7 @@ do_get_from_fd( const char *keyword, int hidden, int bool ) if(statusfp!=stdout) fflush(stdout); - write_status_text( bool? STATUS_GET_BOOL : + write_status_text( getbool? STATUS_GET_BOOL : hidden? STATUS_GET_HIDDEN : STATUS_GET_LINE, keyword ); for( string = NULL, i = len = 200; ; i++ ) { @@ -581,7 +581,7 @@ do_get_from_fd( const char *keyword, int hidden, int bool ) write_status( STATUS_GOT_IT ); - if( bool ) /* Fixme: is this correct??? */ + if( getbool ) /* Fixme: is this correct??? */ return (string[0] == 'Y' || string[0] == 'y') ? "" : NULL; return string; |