mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
Quote and unquote backslashes from keyserver search responses.
This commit is contained in:
parent
47c8a325f5
commit
9fb6cae5e4
@ -1,3 +1,10 @@
|
||||
2002-03-29 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyserver.c (printunquoted): unquote backslashes from keyserver
|
||||
searches
|
||||
|
||||
* hkp.c (write_quoted): quote backslashes from keyserver searches
|
||||
|
||||
2002-03-23 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* import.c (append_uid, merge_sigs): it is okay to import
|
||||
|
@ -234,6 +234,11 @@ write_quoted(IOBUF a, const char *buf, char delim)
|
||||
if(iobuf_writestr(a,quoted))
|
||||
return -1;
|
||||
}
|
||||
else if(*buf=='\\')
|
||||
{
|
||||
if(iobuf_writestr(a,"\\x5c"))
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(iobuf_writebyte(a,*buf))
|
||||
|
@ -152,7 +152,7 @@ parse_keyserver_uri(char *uri)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Unquote only the delimiter character */
|
||||
/* Unquote only the delimiter character and backslash */
|
||||
static void
|
||||
printunquoted(char *string,char delim)
|
||||
{
|
||||
@ -164,12 +164,17 @@ printunquoted(char *string,char delim)
|
||||
{
|
||||
int c;
|
||||
|
||||
sscanf(ch,"\\x%02X",&c);
|
||||
sscanf(ch,"\\x%02x",&c);
|
||||
if(c==delim)
|
||||
{
|
||||
printf("%c",c);
|
||||
ch+=3;
|
||||
}
|
||||
else if(c=='\\')
|
||||
{
|
||||
fputc('\\',stdout);
|
||||
ch+=3;
|
||||
}
|
||||
else
|
||||
fputc(*ch,stdout);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user