diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/ChangeLog | 5 | ||||
| -rw-r--r-- | util/iobuf.c | 22 | ||||
| -rw-r--r-- | util/logger.c | 70 |
3 files changed, 27 insertions, 70 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 9768748bb..c9d1ce3d2 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,6 +1,11 @@ 2004-10-13 Werner Koch <[email protected]> + * logger.c (g10_log_error_f, g10_log_fatal_f, g10_log_info_f) + (g10_log_debug_f, print_prefix_f): Removed. + * iobuf.c (iobuf_is_pipe_filename): New. + (iobuf_get_fd): New. + * fileutil.c (is_file_compressed): Use it here. 2004-09-30 David Shaw <[email protected]> diff --git a/util/iobuf.c b/util/iobuf.c index 26cde114f..3b1fe8636 100644 --- a/util/iobuf.c +++ b/util/iobuf.c @@ -1850,6 +1850,28 @@ iobuf_get_filelength( IOBUF a ) return 0; } + +/* Return the file descriptor of the underlying file or -1 if it is + not available. */ +int +iobuf_get_fd (IOBUF a) +{ + if (a->directfp) + return a->directfp? fileno(a->directfp) : -1; + + for ( ; a; a = a->chain ) + if (!a->chain && a->filter == file_filter) + { + file_filter_ctx_t *b = a->filter_ov; + FILEP_OR_FD fp = b->fp; + + return my_fileno (fp); + } + + return -1; +} + + /**************** * Tell the file position, where the next read will take place */ diff --git a/util/logger.c b/util/logger.c index 6990473b2..bd3156f3d 100644 --- a/util/logger.c +++ b/util/logger.c @@ -130,19 +130,6 @@ g10_log_print_prefix(const char *text) #endif /* __riscos__ */ } -static void -print_prefix_f(const char *text, const char *fname) -{ - if( !logfp ) - logfp = stderr; - if( pgm_name ) - fprintf(logfp, "%s%s:%s: %s", pgm_name, pidstring, fname, text ); - else - fprintf(logfp, "?%s:%s: %s", pidstring, fname, text ); -#ifdef __riscos__ - fflush( logfp ); -#endif /* __riscos__ */ -} void g10_log_info( const char *fmt, ... ) @@ -158,19 +145,6 @@ g10_log_info( const char *fmt, ... ) #endif /* __riscos__ */ } -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(logfp,fmt,arg_ptr) ; - va_end(arg_ptr); -#ifdef __riscos__ - fflush( logfp ); -#endif /* __riscos__ */ -} void g10_log_warning( const char *fmt, ... ) @@ -209,20 +183,6 @@ g10_log_error( const char *fmt, ... ) #endif /* __riscos__ */ } -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(logfp,fmt,arg_ptr) ; - va_end(arg_ptr); - errorcount++; -#ifdef __riscos__ - fflush( logfp ); -#endif /* __riscos__ */ -} void g10_log_fatal( const char *fmt, ... ) @@ -241,22 +201,6 @@ 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(logfp,fmt,arg_ptr) ; - va_end(arg_ptr); - secmem_dump_stats(); -#ifdef __riscos__ - fflush( logfp ); -#endif /* __riscos__ */ - exit(2); -} - -void g10_log_bug( const char *fmt, ... ) { va_list arg_ptr ; @@ -300,20 +244,6 @@ g10_log_debug( const char *fmt, ... ) #endif /* __riscos__ */ } -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(logfp,fmt,arg_ptr) ; - va_end(arg_ptr); -#ifdef __riscos__ - fflush( logfp ); -#endif /* __riscos__ */ -} - void |