security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +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
Download patch file Download diff file Expand all files Collapse all files

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);
}
/****************