X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit-ng%2Fctdlclient.c;h=2467b1237c5f3c7bc9b510d801579fb3603794a4;hp=0a5e1fbcd47492b64781f24f7d12c93fc775c1e2;hb=2dd0ef8fe2953cbdec20f4dcd016c93f12117fad;hpb=b5c457f32fc0d890d24f334d9dcce7987e09885c

diff --git a/webcit-ng/ctdlclient.c b/webcit-ng/ctdlclient.c
index 0a5e1fbcd..2467b1237 100644
--- a/webcit-ng/ctdlclient.c
+++ b/webcit-ng/ctdlclient.c
@@ -18,9 +18,29 @@ struct ctdlsession *cpool = NULL;				// linked list of connections to the Citade
 pthread_mutex_t cpool_mutex = PTHREAD_MUTEX_INITIALIZER;	// Lock it before modifying
 
 
+/*
+ * Read a specific number of bytes of binary data from the Citadel server.
+ * Returns the number of bytes read or -1 for error.
+ */
+int ctdl_read_binary(struct ctdlsession *ctdl, char *buf, int bytes_requested)
+{
+	int bytes_read = 0;
+	int c = 0;
+
+	while (bytes_read < bytes_requested) {
+		c = read(ctdl->sock, &buf[bytes_read], bytes_requested-bytes_read);
+		if (c <= 0) {
+			syslog(LOG_DEBUG, "Socket error or zero-length read");
+			return (-1);
+		}
+		bytes_read += c;
+	}
+	return (bytes_read);
+}
+
+
 /*
  * Read a newline-terminated line of text from the Citadel server.
- * Implemented in terms of client_read() and is therefore transparent...
  * Returns the string length or -1 for error.
  */
 int ctdl_readline(struct ctdlsession *ctdl, char *buf, int maxbytes)