security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-21 01:02:46 +02:00
Code Activity

* argparse.c (default_strusage): Update copyright date. (initialize):

Browse Source 
Avoid a number of -Wformat-nonliteral warnings. These aren't actual
problems, but the warnings bothered me.

* miscutil.c (print_string2): New variation on print_string that allows
two delimiters. (print_string): Call print_string2 to do work.
This commit is contained in:
David Shaw 2004-01-16 05:16:42 +00:00
parent 7bd05d176b
commit 2f3c2f4870
3 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/ChangeLog
View File

@ -1,3 +1,13 @@
2004-01-15 David Shaw <dshaw@jabberwocky.com>
* argparse.c (default_strusage): Update copyright date.
(initialize): Avoid a number of -Wformat-nonliteral warnings.
These aren't actual problems, but the warnings bothered me.
* miscutil.c (print_string2): New variation on print_string that
allows two delimiters.
(print_string): Call print_string2 to do work.
2003-12-29 David Shaw <dshaw@jabberwocky.com>
* g10u.c: Dead code. Remove.

40
util/argparse.c
View File

@ -1,5 +1,6 @@
/* [argparse.c wk 17.06.97] Argument Parser for option handling
* Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
* Copyright (C) 1998, 1999, 2000, 2001, 2003
* 2004 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -158,39 +159,42 @@ initialize( ARGPARSE_ARGS *arg, const char *filename, unsigned *lineno )
if( arg->err ) { /* last option was erroneous */
const char *s;
if( filename ) {
if( arg->r_opt == -6 )
s = "%s:%u: argument not expected\n";
log_error("%s:%u: argument not expected\n", filename, *lineno );
else if( arg->r_opt == -5 )
s = "%s:%u: read error\n";
log_error("%s:%u: read error\n", filename, *lineno );
else if( arg->r_opt == -4 )
s = "%s:%u: keyword too long\n";
log_error("%s:%u: keyword too long\n", filename, *lineno );
else if( arg->r_opt == -3 )
s = "%s:%u: missing argument\n";
log_error("%s:%u: missing argument\n", filename, *lineno );
else if( arg->r_opt == -7 )
s = "%s:%u: invalid command\n";
log_error("%s:%u: invalid command\n", filename, *lineno );
else if( arg->r_opt == -10 )
s = "%s:%u: invalid alias definition\n";
log_error("%s:%u: invalid alias definition\n",filename,*lineno);
else
s = "%s:%u: invalid option\n";
log_error(s, filename, *lineno );
log_error("%s:%u: invalid option\n", filename, *lineno );
}
else {
if( arg->r_opt == -3 )
s = "Missing argument for option \"%.50s\"\n";
log_error("Missing argument for option \"%.50s\"\n",
arg->internal.last? arg->internal.last:"[??]" );
else if( arg->r_opt == -6 )
s = "Option \"%.50s\" does not expect an argument\n";
log_error("Option \"%.50s\" does not expect an argument\n",
arg->internal.last? arg->internal.last:"[??]" );
else if( arg->r_opt == -7 )
s = "Invalid command \"%.50s\"\n";
log_error("Invalid command \"%.50s\"\n",
arg->internal.last? arg->internal.last:"[??]" );
else if( arg->r_opt == -8 )
s = "Option \"%.50s\" is ambiguous\n";
log_error("Option \"%.50s\" is ambiguous\n",
arg->internal.last? arg->internal.last:"[??]" );
else if( arg->r_opt == -9 )
s = "Command \"%.50s\" is ambiguous\n";
log_error("Command \"%.50s\" is ambiguous\n",
arg->internal.last? arg->internal.last:"[??]" );
else
s = "Invalid option \"%.50s\"\n";
log_error(s, arg->internal.last? arg->internal.last:"[??]" );
log_error("Invalid option \"%.50s\"\n",
arg->internal.last? arg->internal.last:"[??]" );
}
if( arg->err != 1 || arg->r_opt == -5 )
exit(2);
@ -910,7 +914,7 @@ default_strusage( int level )
switch( level ) {
case 11: p = "foo"; break;
case 13: p = "0.0"; break;
case 14: p = "Copyright (C) 2003 Free Software Foundation, Inc."; break;
case 14: p = "Copyright (C) 2004 Free Software Foundation, Inc."; break;
case 15: p =
"This program comes with ABSOLUTELY NO WARRANTY.\n"
"This is free software, and you are welcome to redistribute it\n"

22
util/miscutil.c
View File

@ -1,5 +1,6 @@
/* miscutil.c - miscellaneous utilities
* Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
* Copyright (C) 1998, 1999, 2000, 2001, 2003,
* 2004 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -175,15 +176,18 @@ asctimestamp( u32 stamp )
return buffer;
}
/****************
* Print a string to FP, but filter all control characters out.
*/
void
print_string( FILE *fp, const byte *p, size_t n, int delim )
print_string2( FILE *fp, const byte *p, size_t n, int delim, int delim2 )
{
for( ; n; n--, p++ )
if( *p < 0x20 || (*p >= 0x7f && *p < 0xa0) || *p == delim ||
(delim && *p=='\\')) {
if( *p < 0x20 || (*p >= 0x7f && *p < 0xa0)
|| *p == delim || *p == delim2
|| ((delim || delim2) && *p=='\\'))
{
putc('\\', fp);
if( *p == '\n' )
putc('n', fp);
@ -199,9 +203,15 @@ print_string( FILE *fp, const byte *p, size_t n, int delim )
putc('0', fp);
else
fprintf(fp, "x%02x", *p );
}
}
else
putc(*p, fp);
putc(*p, fp);
}
void
print_string( FILE *fp, const byte *p, size_t n, int delim )
{
print_string2(fp,p,n,delim,0);
}
/****************