Changeset 687 in MondoRescue for trunk/mondo/mondo/common/libmondo-archive.c

Timestamp:

Jul 17, 2006, 3:39:42 PM (18 years ago)

Author:

bcornec

Message:

merge -r671:686 $SVN_M/branches/stable

File:

• trunk/mondo/mondo/common/libmondo-archive.c (modified) (12 diffs)

trunk/mondo/mondo/common/libmondo-archive.c

@@ -1217 +1217 @@
     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);
     }
@@ -1713 +1713 @@
                 log_to_screen("%s...OK", message_to_screen);
                 if (!run_program_and_log_output
-                    ("tail -n10 /var/log/mondo-archive.log | fgrep ':-('",
+                    ("tail -n10 /var/log/mondo-archive.log | grep -F ':-('",
                      1)) {
                     log_to_screen
@@ -1981 +1981 @@
     bool delete_when_done;
     bool use_ntfsprog;
-    /*@ long long ****************************************** */
-    long long biggie_fsize;
+    off_t biggie_fsize;
 
     assert(bkpinfo != NULL);
@@ -2081 +2080 @@
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
                 tmp = calc_checksum_of_file(bigfile_fname);
-                write_header_block_to_stream(0, tmp, BLK_STOP_A_BIGGIE);
+                write_header_block_to_stream((off_t)0, tmp, BLK_STOP_A_BIGGIE);
                 paranoid_free(tmp);
             }
@@ -2259 +2258 @@
 
     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
@@ -2268 +2267 @@
         res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
 #endif
-        write_header_block_to_stream(0, "stop-afioballs",
+        write_header_block_to_stream((off_t)0, "stop-afioballs",
                                      BLK_STOP_AFIOBALLS);
     } else {
@@ -2344 +2343 @@
         res += write_EXAT_files_to_tape(bkpinfo, xattr_fname, acl_fname);
         asprintf(&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);
         paranoid_free(blah);
     }
@@ -2354 +2353 @@
 
     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);
     }
@@ -2720 +2719 @@
     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;
@@ -2755 +2754 @@
         paranoid_free(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);
@@ -3035 +3034 @@
 
     /*@ 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 ******************************************************** */
@@ -3080 +3079 @@
         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;