     check_eof();
  
     if (!count) {
-@@ -641,22 +719,21 @@
+@@ -641,22 +721,21 @@
        return -1;
     }
  

    check_eof();
 
    if (atEOT) {
@@ -595,20 +671,23 @@
                current_file, current_block, nb,s);
          errno = EIO;
          ret = -1;

       current_block = -1;
       Dmsg0(dbglevel, "EOT during reading\n");
       return -1;
@@ -860,36 +946,25 @@
       return -1;
    }
 
