Changeset 3646 in MondoRescue for branches

Timestamp:

Jan 12, 2017, 11:48:04 AM (8 years ago)

Author:

Bruno Cornec

Message:

Do not exit too early when dealing with an empty file, as the verify step isn't working if we do. Just avoid to run what would create an issue instead (David C. Partridge david.partridge_at_perdrix.co.uk)

File:

• branches/3.3/mondo/src/common/libmondo-stream.c (modified) (2 diffs)

branches/3.3/mondo/src/common/libmondo-stream.c

@@ -1761 +1761 @@
     /*@ end vars *************************************************** */
 
-    if (length_of_incoming_file <= 0) {
-        return(1);
-    }
-
     olen = length_of_incoming_file;
     p = strrchr(filename, '/'); /* Make 'em go, "Unnnh!" Oh wait, that was _Master_ P... */
@@ -1781 +1777 @@
     sprintf(tempblock + 6000 + control_char, STR_HEADER);
     tempblock[7000] = control_char;
-    memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t));
+    if (length_of_incoming_file > 0) {
+        memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t));
+    }
     strcpy(tempblock + 1000, filename);
     g_tape_posK += fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream) / 1024;