From c8355f665c61d3d760265bb24e09a49dfeb9670b Mon Sep 17 00:00:00 2001
From: sgunderson <sgunderson>
Date: Sun, 5 Nov 2000 01:48:51 +0000
Subject: [PATCH] (Hopefully) fixed a bug that prevented uploading from working
 properly (thanks to Andreas Marienborg <omega@palle.net>).

---
 ftpd.c | 45 +++++++++++++++++++++++++++++++++------------
 ftpd.h |  2 ++
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/ftpd.c b/ftpd.c
index 7f73e89..1312a85 100644
--- a/ftpd.c
+++ b/ftpd.c
@@ -580,6 +580,29 @@ int process_all_clients(const fd_set * const active_clients, const int num_ac)
 	return checked_through;
 }
 
+/*
+ * finish_transfer():
+ *		Send a message that the transfer is completed, write xferlog
+ *		entry (optional), and update the last_transfer record in the
+ *		file transfer object. Goes for both uploads and downloads.
+ */
+void finish_transfer(struct ftran * const f)
+{
+	numeric(f->owner, 226, "Transfer complete.");
+	time(&(f->owner->last_transfer));
+
+#if WANT_XFERLOG
+	if (!f->dir_listing) {
+		write_xferlog(f);
+	}
+#endif
+
+	destroy_ftran(f);
+#if WANT_FULLSCREEN
+	update_display(first_conn);
+#endif
+}
+
 /*
  * process_all_sendfiles():
  *		Sends data to all clients that are ready to receive it.
@@ -601,8 +624,15 @@ int process_all_sendfiles(fd_set * const active_clients, const int num_ac)
 		f = next;
 		next = f->next_ftran;
 
+#if HAVE_UPLOAD
+		if (f->upload == 1 && fds[f->sock].revents & POLLHUP) {
+			finish_transfer(f);
+			continue;
+		}
+#endif
+
 #if HAVE_POLL
-		if (fds[f->sock].revents & (POLLHUP|POLLERR|POLLNVAL)) {
+		if (fds[f->sock].revents & (POLLERR|POLLNVAL|POLLHUP)) {
 			destroy_ftran(f);
 			continue;
 		}
@@ -610,7 +640,7 @@ int process_all_sendfiles(fd_set * const active_clients, const int num_ac)
 
 		/* state = 2: incoming PASV, state >3: send file */
 #if HAVE_POLL
-		if ((f->state < 2) || (f->state == 3) ||  (fds[f->sock].revents & (POLLIN|POLLOUT)) == 0) {
+		if ((f->state < 2) || (f->state == 3) || (fds[f->sock].revents & (POLLIN|POLLOUT)) == 0) {
 #else
 		if ((f->state < 2) || (f->state == 3) || !FD_ISSET(f->sock, active_clients)) {
 #endif
@@ -660,16 +690,7 @@ int process_all_sendfiles(fd_set * const active_clients, const int num_ac)
 			if (do_download(f)) continue;
 
 		/* do_{upload,download} returned 0, the transfer is complete */
-                numeric(f->owner, 226, "Transfer complete.");
-                time(&(f->owner->last_transfer));
-
-#if WANT_XFERLOG
-                if (!f->dir_listing) {
-			write_xferlog(f);
-		}
-#endif
-
-		destroy_ftran(f);
+		finish_transfer(f);
 #if WANT_FULLSCREEN
                 update_display(first_conn);
 #endif
diff --git a/ftpd.h b/ftpd.h
index 3110b10..5ccd11f 100644
--- a/ftpd.h
+++ b/ftpd.h
@@ -184,6 +184,8 @@ void del_fd(const int fd);
 void destroy_conn(struct conn * const c);
 void destroy_ftran(struct ftran * const f);
 
+void finish_transfer(struct ftran * const f);
+
 #if HAVE_POLL
 int process_all_clients(const int num_ac);
 int process_all_sendfiles(const int num_ac);
-- 
2.39.2