From ac963d1b137cef5ca20d2afa01a20d5114ba33d5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Sat, 22 May 2010 09:47:14 +0000
Subject: [PATCH] * receive_spool(): remove debugging output; just open
 tempfile if there is anything to read

---
 citadel/modules/network/serv_network.c | 85 +++++++++++++-------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 7cb78fa6a..9ed349bab 100644
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -1873,56 +1873,57 @@ void receive_spool(int *sock, char *remote_nodename) {
 	}
 	download_len = extract_long(&buf[4], 0);
 
-	bytes_received = 0L;
-	fp = fopen(tempfilename, "w");
-	if (fp == NULL) {
-		CtdlLogPrintf(CTDL_CRIT, "cannot open download file locally: %s\n",
-			strerror(errno));
-		return;
-	}
-
-	CtdlLogPrintf(CTDL_DEBUG, "For this download we are expecting %d bytes\n", download_len);
-	while (bytes_received < download_len) {
-		/*
-		 * If shutting down we can exit here and unlink the temp file.
-		 * this shouldn't loose us any messages.
-		 */
-		if (CtdlThreadCheckStop())
-		{
-			fclose(fp);
-			unlink(tempfilename);
-			return;
-		}
-		snprintf(buf, sizeof buf, "READ %ld|%ld",
-			bytes_received,
-		     ((download_len - bytes_received > IGNET_PACKET_SIZE)
-		 ? IGNET_PACKET_SIZE : (download_len - bytes_received)));
-		CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
-		if (sock_puts(sock, buf) < 0) {
-			fclose(fp);
-			unlink(tempfilename);
-			return;
-		}
-		if (sock_getln(sock, buf, sizeof buf) < 0) {
-			fclose(fp);
-			unlink(tempfilename);
+	if (download_len>0) {
+		bytes_received = 0L;
+		fp = fopen(tempfilename, "w");
+		if (fp == NULL) {
+			CtdlLogPrintf(CTDL_CRIT, "cannot open download file locally: %s\n",
+				      strerror(errno));
 			return;
 		}
-		CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
-		if (buf[0] == '6') {
-			plen = extract_long(&buf[4], 0);
-			if (sock_read(sock, pbuf, plen, 1) < 0) {
+
+		CtdlLogPrintf(CTDL_DEBUG, "For this download we are expecting %d bytes\n", download_len);
+		while (bytes_received < download_len) {
+			/*
+			 * If shutting down we can exit here and unlink the temp file.
+			 * this shouldn't loose us any messages.
+			 */
+			if (CtdlThreadCheckStop())
+			{
 				fclose(fp);
 				unlink(tempfilename);
 				return;
 			}
-			fwrite((char *) pbuf, plen, 1, fp);
-			bytes_received = bytes_received + plen;
+			snprintf(buf, sizeof buf, "READ %ld|%ld",
+				 bytes_received,
+				 ((download_len - bytes_received > IGNET_PACKET_SIZE)
+				  ? IGNET_PACKET_SIZE : (download_len - bytes_received)));
+			
+			if (sock_puts(sock, buf) < 0) {
+				fclose(fp);
+				unlink(tempfilename);
+				return;
+			}
+			if (sock_getln(sock, buf, sizeof buf) < 0) {
+				fclose(fp);
+				unlink(tempfilename);
+				return;
+			}
+			
+			if (buf[0] == '6') {
+				plen = extract_long(&buf[4], 0);
+				if (sock_read(sock, pbuf, plen, 1) < 0) {
+					fclose(fp);
+					unlink(tempfilename);
+					return;
+				}
+				fwrite((char *) pbuf, plen, 1, fp);
+				bytes_received = bytes_received + plen;
+			}
 		}
-	}
-
-	fclose(fp);
 
+		fclose(fp);
+	}
 	/* Last chance for shutdown exit */
 	if (CtdlThreadCheckStop())
 	{
-- 
2.39.2