X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fftp.c;h=ec6dbab649d613891dbc8c92782547be983f69f4;hb=44494b046145941d3bed279e0046cb0ef9279669;hp=04a8ae4318738258bf54561d78d9020b7a594094;hpb=cd17f98f32857e5cb547984387239bd86749044e;p=oftp

diff --git a/src/ftp.c b/src/ftp.c
index 04a8ae4..ec6dbab 100644
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -20,7 +20,7 @@
 #define fcntlsocket		fcntl
 #endif
 
-#define TIMEOUT	5
+#define TIMEOUT	15
 
 static int newconn(struct ftp *ftp);
 static int sendcmd(struct ftp *ftp, const char *fmt, ...);
@@ -187,7 +187,7 @@ int ftp_queue(struct ftp *ftp, int op, const char *arg)
 {
 	struct ftp_op *fop;
 
-	if(!ftp->qhead) {
+	if(!ftp->busy && !ftp->qhead) {
 		exec_op(ftp, op, arg);
 		return 0;
 	}
@@ -195,15 +195,23 @@ int ftp_queue(struct ftp *ftp, int op, const char *arg)
 	if(!(fop = malloc(sizeof *fop))) {
 		return -1;
 	}
-	if(!(fop->arg = strdup(arg))) {
-		free(fop);
-		return -1;
+	if(arg) {
+		if(!(fop->arg = strdup(arg))) {
+			free(fop);
+			return -1;
+		}
+	} else {
+		fop->arg = 0;
 	}
 	fop->op = op;
 	fop->next = 0;
 
-	ftp->qtail->next = fop;
-	ftp->qtail = fop;
+	if(ftp->qhead) {
+		ftp->qtail->next = fop;
+		ftp->qtail = fop;
+	} else {
+		ftp->qhead = ftp->qtail = fop;
+	}
 	return 0;
 }
 
@@ -330,6 +338,8 @@ static int sendcmd(struct ftp *ftp, const char *fmt, ...)
 		return -1;
 	}
 
+	ftp->busy = 1;
+
 	va_start(ap, fmt);
 	vsprintf(buf, fmt, ap);
 	va_end(ap);
@@ -343,7 +353,13 @@ static int handle_control(struct ftp *ftp)
 	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;
@@ -358,7 +374,9 @@ static int handle_control(struct ftp *ftp)
 		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;
@@ -367,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);
+		} else {
+			ftp->num_crecv = 0;
 		}
 	}
 	return 0;
@@ -443,12 +463,14 @@ static void proc_control(struct ftp *ftp, const char *buf)
 	if(ftp->cproc) {
 		if(ftp->cproc(ftp, code, buf, ftp->cproc_cls) <= 0) {
 			ftp->cproc = 0;
+			ftp->busy = 0;
 
 			/* execute next operation if there's one queued */
 			exec_queued(ftp);
 		}
 		return;
 	}
+	ftp->busy = 0;
 
 	switch(code) {
 	case 220:
@@ -621,15 +643,93 @@ static int cproc_list(struct ftp *ftp, int code, const char *buf, void *cls)
 	return 0;
 }
 
+static void free_dirlist(struct ftp_dirent *list)
+{
+	struct ftp_dirent *tmp;
+
+	while(list) {
+		tmp = list;
+		list = list->next;
+
+		free(tmp->name);
+		free(tmp);
+	}
+}
+
+#define SKIP_FIELD(p) \
+	do { \
+		while(*(p) && *(p) != '\n' && !isspace(*(p))) (p)++; \
+		while(*(p) && *(p) != '\n' && isspace(*(p))) (p)++; \
+	} while(0)
+
+static int parse_dirent(struct ftp_dirent *ent, const char *line)
+{
+	int len;
+	const char *ptr = line;
+	const char *end;
+
+	if(!(end = strchr(line, '\r')) && !(end = strchr(line, '\n'))) {
+		return -1;
+	}
+
+	if(line[0] == 'd') {
+		ent->type = FTP_DIR;
+	} else {
+		ent->type = FTP_FILE;
+	}
+
+	SKIP_FIELD(ptr);		/* skip mode */
+	SKIP_FIELD(ptr);		/* skip links */
+	SKIP_FIELD(ptr);		/* skip owner */
+	SKIP_FIELD(ptr);		/* skip group */
+
+	if(ent->type == FTP_FILE) {
+		ent->size = atoi(ptr);
+	}
+	SKIP_FIELD(ptr);		/* skip size */
+	SKIP_FIELD(ptr);		/* skip month */
+	SKIP_FIELD(ptr);		/* skip day */
+	SKIP_FIELD(ptr);		/* skip year */
+
+	if(ptr >= end) return -1;
+
+	len = end - ptr;
+	ent->name = malloc(len + 1);
+	memcpy(ent->name, ptr, len);
+	ent->name[len] = 0;
+
+	return 0;
+}
+
 static void dproc_list(struct ftp *ftp, const char *buf, int sz, void *cls)
 {
 	struct recvbuf *rbuf = cls;
 
 	if(sz == 0) {
 		/* EOF condition, we got the whole list, update directory entries */
-		/* TODO */
-		rbuf->buf[rbuf->size] = 0;
-		infomsg("%s\n", rbuf->buf);
+		char *ptr = rbuf->buf;
+		char *end = rbuf->buf + rbuf->size;
+		struct ftp_dirent *tail = 0;
+		struct ftp_dirent *ent;
+
+		free_dirlist(ftp->dent_rem);
+		ftp->dent_rem = 0;
+
+		while(ptr < end) {
+			ent = malloc_nf(sizeof *ent);
+			if(parse_dirent(ent, ptr) != -1) {
+				ent->next = 0;
+				if(!tail) {
+					ftp->dent_rem = tail = ent;
+				} else {
+					tail->next = ent;
+					tail = ent;
+				}
+			}
+			while(ptr < end && *ptr != '\n' && *ptr != '\r') ptr++;
+			while(ptr < end && (*ptr == '\r' || *ptr == '\n')) ptr++;
+		}
+		ftp->modified |= FTP_MOD_REMDIR;
 
 		free(rbuf->buf);
 		free(rbuf);