Changeset 3060 in MondoRescue for branches/3.0/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Nov 10, 2012, 5:05:37 AM (11 years ago)

Author:

Bruno Cornec

Message:

r5035@localhost: bruno | 2012-11-09 03:17:01 +0100

• Fix a compilation error and most compilation warnings

File:

• branches/3.0/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (14 diffs)

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

@@ -93 +93 @@
         return (1);
     }
-    fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin);
+    if (fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin)) {
+        // FIXME
+    }
     paranoid_fclose(fin);
 
@@ -134 +136 @@
             return (1);
         } else {
-            fgets(original_cksum_ptr, MAX_STR_LEN - 1, fin);
+            if (fgets(original_cksum_ptr, MAX_STR_LEN - 1, fin)) {
+                // FIXME
+            }
             paranoid_fclose(fin);
             for (i = strlen(original_cksum_ptr);
@@ -245 +249 @@
     int retval = 0;
     int res;
-    long noof_lines;
     long archiver_errors;
     bool use_star;
@@ -265 +268 @@
     sprintf(filelist_name, MNT_CDROM "/archives/filelist.%d",
             current_tarball_number);
-
-    noof_lines = count_lines_in_file(filelist_name);
 
     if (strstr(tarball_fname, ".bz2")) {
@@ -336 +337 @@
                 "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt",
                 logfile);
-        system(command);
+        paranoid_system(command);
         archiver_errors = count_lines_in_file(logfile);
     } else {
@@ -372 +373 @@
 {
     int retval = 0;
-    int res;
     int current_tarball_number = 0;
 
@@ -439 +439 @@
             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++;
@@ -490 +490 @@
     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");
@@ -498 +504 @@
     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) {
@@ -633 +641 @@
 
             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()");
         }
@@ -675 +691 @@
     malloc_string(dir);
     malloc_string(command);
-    getcwd(dir, MAX_STR_LEN);
-    chdir(bkpinfo->restore_path);
+    if (getcwd(dir, MAX_STR_LEN)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        // FIXME
+    }
 
     sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
@@ -692 +712 @@
     }
     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) {
@@ -733 +755 @@
     malloc_string(command);
 
-    getcwd(dir, MAX_STR_LEN);
-    chdir(bkpinfo->restore_path);
+    if (getcwd(dir, MAX_STR_LEN)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        // FIXME
+    }
     sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
             bkpinfo->restore_path);
@@ -741 +767 @@
                         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.");