security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

added option export

Browse source
This commit is contained in:
Werner Koch 1998-02-13 20:58:50 +00:00
parent b9fccd69e4
commit f477447d9a
43 changed files with 734 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

18
util/ChangeLog Normal file
View file

@ -0,0 +1,18 @@
Fri Feb 13 19:34:59 1998 Werner Koch (wk@isil.d.shuttle.de)
* iobuf.c (iobuf_seek): Set counters to new offset.
Fri Feb 13 17:13:04 1998 Werner Koch (wk@isil.d.shuttle.de)
* logger.c (log_set_name, log_get_name): New.
(print_prefix, pgm_name): New, changed all function to make use it.
(log_mpidump): Removed the "DBG" prefix.
(log_hexdump): Ditto.
* logger.c (printstr): Removed.
Fri Feb 13 15:14:13 1998 Werner Koch (wk@isil.d.shuttle.de)
* argparse.c (show_help): New '\v' kludge.

1
util/Makefile.in
View file

@ -85,7 +85,6 @@ POSUB = @POSUB@
RANLIB = @RANLIB@
VERSION = @VERSION@
ZLIBS = @ZLIBS@
ZLIB_SUBDIR = @ZLIB_SUBDIR@
INCLUDES = -I$(top_srcdir)/include

21
util/argparse.c
View file

@ -538,16 +538,31 @@ show_help( ARGPARSE_OPTS *opts, unsigned flags )
/* get max. length of long options */
for(i=indent=0; opts[i].short_opt; i++ ) {
if( opts[i].long_opt )
if( (j=strlen(opts[i].long_opt)) > indent && j < 35 )
indent = j;
if( !opts[i].description || *opts[i].description != '\v' )
if( (j=strlen(opts[i].long_opt)) > indent && j < 35 )
indent = j;
}
/* example: " -v, --verbose Viele Sachen ausgeben" */
indent += 10;
puts("Options:");
if( *opts[0].description != '\v' )
puts("Options:");
for(i=0; opts[i].short_opt; i++ ) {
s = _( opts[i].description );
if( s && *s== '\r' ) /* hide this line */
continue;
if( s && *s == '\v' ) { /* unindented comment only line */
for(s++; *s; s++ ) {
if( *s == '\n' ) {
if( s[1] )
putchar('\n');
}
else
putchar(*s);
}
putchar('\n');
continue;
}
if( opts[i].short_opt < 256 )
printf(" -%c", opts[i].short_opt );
else

9
util/iobuf.c
View file

@ -867,6 +867,11 @@ iobuf_tell( IOBUF a )
}
/****************
* This is a very limited implementation. It simply discards all internal
* buffering and remove all filters but the first one.
*/
int
iobuf_seek( IOBUF a, ulong newpos )
{
@ -885,6 +890,10 @@ iobuf_seek( IOBUF a, ulong newpos )
log_error("can't seek to %lu: %s\n", newpos, strerror(errno) );
return -1;
}
a->d.len = 0; /* discard buffer */
a->d.start = 0;
a->nbytes = 0;
a->nlimit = 0;
a->ntotal = newpos;
/* remove filters, but the last */
while( a->chain )

69
util/logger.c
View file

@ -26,8 +26,26 @@
#include "util.h"
static char pidstring[15];
static char *pgm_name;
static int errorcount;
void
log_set_name( const char *name )
{
m_free(pgm_name);
if( name )
pgm_name = m_strdup(name);
else
pgm_name = NULL;
}
const char *
log_get_name(void)
{
return pgm_name? pgm_name : "";
}
void
log_set_pid( int pid )
{
@ -46,45 +64,21 @@ log_get_errorcount( int clear)
return n;
}
/****************
* General interface for printing a line
* level 0 := print to /dev/null
* 1 := print to stdout
* 2 := print as info to stderr
* 3 := ditto but as error
*/
void
printstr( int level, const char *fmt, ... )
static void
print_prefix(const char *text)
{
va_list arg_ptr ;
if( !level )
return;
if( !fmt ) {
putc('\n', level? stderr: stdout);
return;
}
va_start( arg_ptr, fmt ) ;
if( level < 2 ) {
vfprintf(stdout,fmt,arg_ptr) ;
}
else {
fprintf(stderr, level==2? "%s: ": "%s: error: ", strusage(13) ) ;
vfprintf(stderr,fmt,arg_ptr) ;
}
va_end(arg_ptr);
if( pgm_name )
fprintf(stderr, "%s%s: %s", pgm_name, pidstring, text );
else
fprintf(stderr, "?%s: %s", pidstring, text );
}
void
log_info( const char *fmt, ... )
{
va_list arg_ptr ;
fprintf(stderr, "info%s: ", pidstring ) ;
print_prefix("");
va_start( arg_ptr, fmt ) ;
vfprintf(stderr,fmt,arg_ptr) ;
va_end(arg_ptr);
@ -95,7 +89,7 @@ log_error( const char *fmt, ... )
{
va_list arg_ptr ;
fprintf(stderr, "error%s: ", pidstring ) ;
print_prefix("");
va_start( arg_ptr, fmt ) ;
vfprintf(stderr,fmt,arg_ptr) ;
va_end(arg_ptr);
@ -107,7 +101,7 @@ log_fatal( const char *fmt, ... )
{
va_list arg_ptr ;
fprintf(stderr, "Fatal%s: ", pidstring ) ;
print_prefix("fatal: ");
va_start( arg_ptr, fmt ) ;
vfprintf(stderr,fmt,arg_ptr) ;
va_end(arg_ptr);
@ -120,7 +114,8 @@ log_bug( const char *fmt, ... )
{
va_list arg_ptr ;
fprintf(stderr, "\nInternal Error%s: ", pidstring ) ;
putc('\n', stderr );
print_prefix("Ooops: ");
va_start( arg_ptr, fmt ) ;
vfprintf(stderr,fmt,arg_ptr) ;
va_end(arg_ptr);
@ -148,7 +143,7 @@ log_debug( const char *fmt, ... )
{
va_list arg_ptr ;
fprintf(stderr, "DBG%s: ", pidstring ) ;
print_prefix("DBG: ");
va_start( arg_ptr, fmt ) ;
vfprintf(stderr,fmt,arg_ptr) ;
va_end(arg_ptr);
@ -161,7 +156,7 @@ log_hexdump( const char *text, char *buf, size_t len )
{
int i;
fprintf(stderr, "DBG%s: %s", pidstring, text );
print_prefix(text);
for(i=0; i < len; i++ )
fprintf(stderr, " %02X", ((byte*)buf)[i] );
fputc('\n', stderr);
@ -171,7 +166,7 @@ log_hexdump( const char *text, char *buf, size_t len )
void
log_mpidump( const char *text, MPI a )
{
fprintf(stderr, "DBG%s: %s", pidstring, text );
print_prefix(text);
mpi_print(stderr, a, 1 );
fputc('\n', stderr);
}