diff options
| author | David Shaw <[email protected]> | 2002-09-12 12:10:04 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-09-12 12:10:04 +0000 |
| commit | 72cd3ef8597581d172b02f7cbba8ed3cdf477396 (patch) | |
| tree | b39a647569d62a2280952b3b95fbda32159dd3fe | |
| parent | fixed the test for a missing mail address (diff) | |
| download | gnupg-72cd3ef8597581d172b02f7cbba8ed3cdf477396.tar.gz gnupg-72cd3ef8597581d172b02f7cbba8ed3cdf477396.zip | |
* keyserver.c (keyserver_spawn): Remove whitespace after keyserver
commands.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/keyserver.c | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index a180dfc55..001c555fd 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2002-09-12 David Shaw <[email protected]> + + * keyserver.c (keyserver_spawn): Remove whitespace after keyserver + commands. + 2002-09-10 David Shaw <[email protected]> * exec.c (expand_args): Remove loop left over from earlier diff --git a/g10/keyserver.c b/g10/keyserver.c index 1afe1e7e4..eff486b0b 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -543,6 +543,7 @@ keyserver_spawn(int action,STRLIST list, for(;;) { char *ptr; + int plen; if(iobuf_read_line(spawn->fromchild,&line,&buflen,&maxlen)==0) { @@ -552,11 +553,11 @@ keyserver_spawn(int action,STRLIST list, ptr=line; - if(*ptr=='\r') - ptr++; - - if(*ptr=='\n') - ptr++; + /* remove trailing whitespace */ + plen=strlen(ptr); + while(plen>0 && isspace(ptr[plen-1])) + plen--; + plen[ptr]='\0'; if(*ptr=='\0') break; |