mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* gpgkeys_ldap.c, ksutil.h, ksutil.c (print_nocr): Moved from
gpgkeys_ldap.c. Print a string, but strip out any CRs. * gpgkeys_finger.c (get_key), gpgkeys_hkp.c (get_key), gpgkeys_http.c (get_key): Use it here when outputting key material to canonicalize line endings.
This commit is contained in:
parent
57b9ba5e16
commit
1517f0e945
7 changed files with 34 additions and 17 deletions
|
@ -294,3 +294,21 @@ ks_action_to_string(enum ks_action action)
|
|||
|
||||
return "?";
|
||||
}
|
||||
|
||||
/* Canonicalize CRLF to just LF by stripping CRs. This actually makes
|
||||
sense, since on Unix-like machines LF is correct, and on win32-like
|
||||
machines, our output buffer is opened in textmode and will
|
||||
re-canonicalize line endings back to CRLF. Since we only need to
|
||||
handle armored keys, we don't have to worry about odd cases like
|
||||
CRCRCR and the like. */
|
||||
|
||||
void
|
||||
print_nocr(FILE *stream,const char *str)
|
||||
{
|
||||
while(*str)
|
||||
{
|
||||
if(*str!='\r')
|
||||
fputc(*str,stream);
|
||||
str++;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue