Changeset 684 in MondoRescue for branches/stable/mondo/mondo/common/libmondo-archive.c

Timestamp:

Jun 26, 2006, 1:12:48 PM (18 years ago)

Author:

bcornec

Message:

Attempt to fix Bug #7820 Does not backup a file greater than 2 GB
Report from taps23@…
Changed legnth_of_file to off_t for ftello support and all relative changes made as well in various functions to be consistent

File:

• branches/stable/mondo/mondo/common/libmondo-archive.c (modified) (10 diffs)

branches/stable/mondo/mondo/common/libmondo-archive.c

@@ -1364 +1364 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        write_header_block_to_stream(0, "start-of-tape",
+        write_header_block_to_stream((off_t)0, "start-of-tape",
                                      BLK_START_OF_TAPE);
-        write_header_block_to_stream(0, "start-of-backup",
+        write_header_block_to_stream((off_t)0, "start-of-backup",
                                      BLK_START_OF_BACKUP);
     }
@@ -2175 +2175 @@
     bool delete_when_done;
     bool use_ntfsprog;
-    /*@ long long ****************************************** */
-    long long biggie_fsize;
+    off_t biggie_fsize;
 
     assert(bkpinfo != NULL);
@@ -2274 +2273 @@
                                   noof_biggie_files, use_ntfsprog);
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                write_header_block_to_stream(0,
+                write_header_block_to_stream((off_t)0,
                                              calc_checksum_of_file
                                              (bigfile_fname),
@@ -2461 +2460 @@
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        write_header_block_to_stream(0, "start-of-afioballs",
+        write_header_block_to_stream((off_t)0, "start-of-afioballs",
                                      BLK_START_AFIOBALLS);
 #if __FreeBSD__ == 5
@@ -2470 +2469 @@
         res = make_afioballs_and_images_OLD(bkpinfo);
 #endif
-        write_header_block_to_stream(0, "stop-afioballs",
+        write_header_block_to_stream((off_t)0, "stop-afioballs",
                                      BLK_STOP_AFIOBALLS);
     } else {
@@ -2543 +2542 @@
         res += write_EXAT_files_to_tape(bkpinfo, xattr_fname, acl_fname);
         sprintf(blah, "%ld", count_lines_in_file(biggielist));
-        write_header_block_to_stream(0, blah, BLK_START_BIGGIEFILES);
+        write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
     }
     res = make_slices_and_images(bkpinfo, biggielist);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        write_header_block_to_stream(0, "end-of-biggiefiles",
+        write_header_block_to_stream((off_t)0, "end-of-biggiefiles",
                                      BLK_STOP_BIGGIEFILES);
     }
@@ -2931 +2930 @@
     char *curr_file, *cf;
     /*@ long long ****************************************************** */
-    long long length_of_incoming_file = 0;
+    off_t length_of_incoming_file = (off_t)0;
     t_archtype type;
     va_list ap;
@@ -2966 +2965 @@
         unlink(curr_file);
 /* write closing header */
-        write_header_block_to_stream(0, "finished-writing-file", stop_chr);
+        write_header_block_to_stream((off_t)0, "finished-writing-file", stop_chr);
     }
     va_end(ap);
@@ -3306 +3305 @@
 
     /*@ long long ************************************************** */
-    long long totalread = 0;
-    long long totallength = 0;
-    long long length;
+    off_t totalread = (off_t)0;
+    off_t totallength = (off_t)0;
+    off_t length;
 
     /*@ int ******************************************************** */
@@ -3360 +3359 @@
         strcpy (tmp, call_program_and_get_last_line_of_output(command));
         log_it("res of it = %s", tmp); 
-        totallength = atoll(tmp);
+        totallength = (off_t)atoll(tmp);
     } else {
         file_to_openin = biggie_filename;