* partialy revert r8246; we're working in units of one here, so the number of units...

diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index b7b0cb3f32c5935f0d4af095918b3e7acee3db65..ced5a31d568c3fef6f83466c7e51313abfdd4fbc 100644 (file)
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -621,6 +621,7 @@ void cmd_read(char *cmdbuf)
 {
        long start_pos;
        size_t bytes;
+       size_t actual_bytes;
        char *buf = NULL;
 
        start_pos = extract_long(cmdbuf, 0);
@@ -636,8 +637,10 @@ void cmd_read(char *cmdbuf)
        buf = malloc(bytes + 1);
 
        fseek(CC->download_fp, start_pos, 0);
-       if (fread(buf, 1, bytes, CC->download_fp) == 1) {
-               cprintf("%d %d\n", BINARY_FOLLOWS, (int)bytes);
+
+       actual_bytes = fread(buf, 1, bytes, CC->download_fp);
+       if (actual_bytes > 0) {
+               cprintf("%d %d\n", BINARY_FOLLOWS, (int)actual_bytes);
                client_write(buf, bytes);
        }
        else {