git-svn-id: file:///var/lib/svn/clamav-devel/branches/clamd-proto@4638 77e5149b-7576-45b1-b177-96237e5ba77b
aCaB authored on 2009/01/23 20:59:11... | ... |
@@ -164,6 +164,7 @@ static int recvln(struct RCVLN *s, char **rbol, char **reol) { |
164 | 164 |
memmove(s->buf, s->bol, s->r); |
165 | 165 |
s->cur = &s->buf[s->r]; |
166 | 166 |
s->bol = s->buf; |
167 |
+ s->r = 0; |
|
167 | 168 |
} |
168 | 169 |
return ret; |
169 | 170 |
} |
... | ... |
@@ -455,10 +456,10 @@ int get_clamd_version(const struct optstruct *opts) |
455 | 455 |
int len, sockd; |
456 | 456 |
struct RCVLN rcv; |
457 | 457 |
|
458 |
- recvlninit(&rcv, sockd); |
|
459 | 458 |
isremote(opts); |
460 | 459 |
if(!mainsa) return 2; |
461 | 460 |
if((sockd = dconnect()) < 0) return 2; |
461 |
+ recvlninit(&rcv, sockd); |
|
462 | 462 |
|
463 | 463 |
if(sendln(sockd, "zVERSION", 9)) { |
464 | 464 |
logg("!Can't write to the socket.\n"); |
... | ... |
@@ -484,10 +485,10 @@ int reload_clamd_database(const struct optstruct *opts) |
484 | 484 |
int len, sockd; |
485 | 485 |
struct RCVLN rcv; |
486 | 486 |
|
487 |
- recvlninit(&rcv, sockd); |
|
488 | 487 |
isremote(opts); |
489 | 488 |
if(!mainsa) return 2; |
490 | 489 |
if((sockd = dconnect()) < 0) return 2; |
490 |
+ recvlninit(&rcv, sockd); |
|
491 | 491 |
|
492 | 492 |
if(sendln(sockd, "zRELOAD", 8)) { |
493 | 493 |
logg("!Can't write to the socket.\n"); |