Changeset 3147 in MondoRescue for branches/3.1/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (12 diffs)

branches/3.1/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -71 +71 @@
         return (1);
     }
-    fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin);
+    if (fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin)) {
+        // FIXME
+    }
     paranoid_fclose(fin);
 
@@ -218 +220 @@
     int retval = 0;
     int res;
-    long noof_lines;
     long archiver_errors;
     bool use_star;
@@ -289 +290 @@
     if (use_star) {
         // doesn't use compressor_exe
-        mr_asprintf(command, "%s -diff H=exustar file=%s >> %s 2>> %s", archiver_exe, tarball_fname, logfile, logfile);
+        mr_asprintf(command, "%s -sparse -diff H=exustar file=%s >> %s 2>> %s", archiver_exe, tarball_fname, logfile, logfile);
     } else {
         mr_asprintf(command, "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s", archiver_exe, TAPE_BLOCK_SIZE, BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
@@ -308 +309 @@
     if (length_of_file(logfile) > 5) {
         mr_asprintf(command, "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt", logfile);
-        system(command);
+        paranoid_system(command);
         mr_free(command);
 
@@ -337 +338 @@
 {
     int retval = 0;
-    int res;
     int current_tarball_number = 0;
 
@@ -409 +409 @@
             log_to_screen(progress_str);
         } else {
-            res = compare_a_tarball(tarball_fname, current_tarball_number);
+            retval += compare_a_tarball(tarball_fname, current_tarball_number);
 
             g_current_progress++;
@@ -459 +459 @@
     assert(bkpinfo != NULL);
 
-    getcwd(cwd, MAX_STR_LEN - 1);
-    chdir(bkpinfo->restore_path);
-    getcwd(new, MAX_STR_LEN - 1);
+    if (getcwd(cwd, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        //FIXME
+    }
+    if (getcwd(new, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
     insist_on_this_cd_number(g_current_media_number);
     unlink(MONDO_CACHE"/changed.txt");
@@ -467 +473 @@
     resA = compare_all_tarballs();
     resB = compare_all_biggiefiles();
-    chdir(cwd);
+    if (chdir(cwd)) {
+        // FIXME
+    }
     noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt");
     if (noof_changed_files) {
@@ -594 +602 @@
 
             log_msg(2, "calling popup_changelist_from_file()");
-            getcwd(cwd, MAX_STR_LEN - 1);
-            chdir(bkpinfo->restore_path);
-            getcwd(new, MAX_STR_LEN - 1);
+            if (getcwd(cwd, MAX_STR_LEN - 1)) {
+                //FIXME
+            }
+            if (chdir(bkpinfo->restore_path)) {
+                // FIXME
+            }
+            if (getcwd(new, MAX_STR_LEN - 1)) {
+                //FIXME
+            }
             popup_changelist_from_file(MONDO_CACHE"/changed.files");
-            chdir(cwd);
+            if (chdir(cwd)) {
+                // FIXME
+            }
             log_msg(2, "Returning from popup_changelist_from_file()");
         }
@@ -634 +650 @@
     assert(bkpinfo != NULL);
     malloc_string(dir);
-    getcwd(dir, MAX_STR_LEN);
-    chdir(bkpinfo->restore_path);
+    if (getcwd(dir, MAX_STR_LEN)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        // FIXME
+    }
 
     mvaddstr_and_log_it(g_currentY,
@@ -647 +667 @@
     }
     res = verify_tape_backups();
-    chdir(dir);
+    if (chdir(dir)) {
+        // FIXME
+    }
     if (length_of_file(MONDO_CACHE"/changed.txt") > 2
         && length_of_file(MONDO_CACHE"/changed.files") > 2) {
@@ -686 +708 @@
     malloc_string(dir);
 
-    getcwd(dir, MAX_STR_LEN);
-    chdir(bkpinfo->restore_path);
+    if (getcwd(dir, MAX_STR_LEN)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        // FIXME
+    }
 
     mvaddstr_and_log_it(g_currentY,
                         0, "Verifying archives against filesystem");
     res = verify_tape_backups();
-    chdir(dir);
+    if (chdir(dir)) {
+        // FIXME
+    }
     if (res) {
         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");