diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/ChangeLog | 4 | ||||
| -rw-r--r-- | util/iobuf.c | 2 | ||||
| -rw-r--r-- | util/logger.c | 56 |
3 files changed, 62 insertions, 0 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 5baefcc20..661914645 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,7 @@ +Tue Jul 7 11:49:25 1998 Werner Koch ([email protected]) + + * logger.c (log_set_filename): New. + Mon Jul 6 09:03:49 1998 Werner Koch ([email protected]) * strgutil.c (append_to_strlist): New. diff --git a/util/iobuf.c b/util/iobuf.c index bd69322b9..3067ac433 100644 --- a/util/iobuf.c +++ b/util/iobuf.c @@ -893,6 +893,8 @@ iobuf_peek(IOBUF a, byte *buf, unsigned buflen ) { int n=0; + if( a->filter_eof ) + return -1; if( !(a->d.start < a->d.len) ) { if( underflow(a) == -1 ) return -1; diff --git a/util/logger.c b/util/logger.c index 4ae74547d..0f181d8a5 100644 --- a/util/logger.c +++ b/util/logger.c @@ -73,6 +73,15 @@ print_prefix(const char *text) fprintf(stderr, "?%s: %s", pidstring, text ); } +static void +print_prefix_f(const char *text, const char *fname) +{ + if( pgm_name ) + fprintf(stderr, "%s%s:%s: %s", pgm_name, pidstring, fname, text ); + else + fprintf(stderr, "?%s:%s: %s", pidstring, fname, text ); +} + void g10_log_info( const char *fmt, ... ) { @@ -85,6 +94,17 @@ g10_log_info( const char *fmt, ... ) } void +g10_log_info_f( const char *fname, const char *fmt, ... ) +{ + va_list arg_ptr ; + + print_prefix_f("", fname); + va_start( arg_ptr, fmt ) ; + vfprintf(stderr,fmt,arg_ptr) ; + va_end(arg_ptr); +} + +void g10_log_error( const char *fmt, ... ) { va_list arg_ptr ; @@ -97,6 +117,18 @@ g10_log_error( const char *fmt, ... ) } void +g10_log_error_f( const char *fname, const char *fmt, ... ) +{ + va_list arg_ptr ; + + print_prefix_f("", fname); + va_start( arg_ptr, fmt ) ; + vfprintf(stderr,fmt,arg_ptr) ; + va_end(arg_ptr); + errorcount++; +} + +void g10_log_fatal( const char *fmt, ... ) { va_list arg_ptr ; @@ -110,6 +142,19 @@ g10_log_fatal( const char *fmt, ... ) } void +g10_log_fatal_f( const char *fname, const char *fmt, ... ) +{ + va_list arg_ptr ; + + print_prefix_f("fatal: ", fname); + va_start( arg_ptr, fmt ) ; + vfprintf(stderr,fmt,arg_ptr) ; + va_end(arg_ptr); + secmem_dump_stats(); + exit(2); +} + +void g10_log_bug( const char *fmt, ... ) { va_list arg_ptr ; @@ -149,6 +194,17 @@ g10_log_debug( const char *fmt, ... ) va_end(arg_ptr); } +void +g10_log_debug_f( const char *fname, const char *fmt, ... ) +{ + va_list arg_ptr ; + + print_prefix_f("DBG: ", fname); + va_start( arg_ptr, fmt ) ; + vfprintf(stderr,fmt,arg_ptr) ; + va_end(arg_ptr); +} + void |