Ticket #2674: mc-4.8.0-reget-align.patch

src/filemanager/file.c

@@ -1522 +1522 @@
         struct timeval tv_current, tv_last_update, tv_last_input;
         int secs, update_secs;
         const char *stalled_msg = "";
+        int read_size;
+        char buf[BUF_8K];
 
         tv_last_update = tv_transfer_start;
 
+        read_size = sizeof (buf) - ctx->do_reget % sizeof (buf);
+
         for (;;)
         {
-            char buf[BUF_8K];
-
             /* src_read */
             if (mc_ctl (src_desc, VFS_CTL_IS_NOTREADY, 0))
                 n_read = -1;
             else
-                while ((n_read = mc_read (src_desc, buf, sizeof (buf))) < 0 && !ctx->skip_all)
+                while ((n_read = mc_read (src_desc, buf, read_size)) < 0 && !ctx->skip_all)
                 {
                     return_status = file_error (_("Cannot read source file\"%s\"\n%s"), src_path);
                     if (return_status == FILE_RETRY)
@@ -1545 +1547 @@
             if (n_read == 0)
                 break;
 
+            read_size = sizeof (buf);
+
             gettimeofday (&tv_current, NULL);
 
             if (n_read > 0)