projects
/
oftp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e0c59f7
)
fixed bug in line-buffered receive routine
author
John Tsiombikas
<nuclear@member.fsf.org>
Sun, 22 Jan 2023 17:51:30 +0000
(19:51 +0200)
committer
John Tsiombikas
<nuclear@member.fsf.org>
Sun, 22 Jan 2023 17:51:30 +0000
(19:51 +0200)
src/ftp.c
patch
|
blob
|
history
diff --git
a/src/ftp.c
b/src/ftp.c
index
806c766
..
ec6dbab
100644
(file)
--- a/
src/ftp.c
+++ b/
src/ftp.c
@@
-353,7
+353,13
@@
static int handle_control(struct ftp *ftp)
int i, sz, rd;
char *buf, *start, *end;
int i, sz, rd;
char *buf, *start, *end;
- while((sz = sizeof ftp->crecv - ftp->num_crecv) > 0) {
+ for(;;) {
+ if((sz = sizeof ftp->crecv - ftp->num_crecv) <= 0) {
+ /* discard buffer */
+ warnmsg("discard buffer\n");
+ sz = sizeof ftp->crecv;
+ ftp->num_crecv = 0;
+ }
start = ftp->crecv + ftp->num_crecv;
if((rd = recv(ftp->ctl, start, sz, 0)) == -1) {
if(errno == EINTR) continue;
start = ftp->crecv + ftp->num_crecv;
if((rd = recv(ftp->ctl, start, sz, 0)) == -1) {
if(errno == EINTR) continue;
@@
-368,7
+374,9
@@
static int handle_control(struct ftp *ftp)
end = start + rd;
buf = ftp->crecv;
for(i=0; i<rd; i++) {
end = start + rd;
buf = ftp->crecv;
for(i=0; i<rd; i++) {
- if(start[i] == '\n') {
+ if(start[i] == '\r') {
+ start[i] = 0;
+ } else if(start[i] == '\n') {
start[i] = 0;
proc_control(ftp, buf);
buf = start + i + 1;
start[i] = 0;
proc_control(ftp, buf);
buf = start + i + 1;
@@
-377,6
+385,8
@@
static int handle_control(struct ftp *ftp)
if(buf != ftp->crecv && buf < end) {
ftp->num_crecv = end - buf;
memmove(ftp->crecv, buf, ftp->num_crecv);
if(buf != ftp->crecv && buf < end) {
ftp->num_crecv = end - buf;
memmove(ftp->crecv, buf, ftp->num_crecv);
+ } else {
+ ftp->num_crecv = 0;
}
}
return 0;
}
}
return 0;
@@
-460,6
+470,7
@@
static void proc_control(struct ftp *ftp, const char *buf)
}
return;
}
}
return;
}
+ ftp->busy = 0;
switch(code) {
case 220:
switch(code) {
case 220:
@@
-479,7
+490,6
@@
static void proc_control(struct ftp *ftp, const char *buf)
errmsg("login failed\n");
break;
}
errmsg("login failed\n");
break;
}
- ftp->busy = 0;
}
static int newconn(struct ftp *ftp)
}
static int newconn(struct ftp *ftp)