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

Timestamp:

Sep 29, 2013, 9:31:34 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Finish with backports from 3.1 for now. Still some work to do, but we will now make that version compile and work again and serve as a base

so the gettext patch can be added

File:

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

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

@@ -76 +76 @@
     paranoid_fclose(fin);
 
+
+    mr_asprintf(bigfile_fname, "%s", biggiestruct.filename);
+    log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
     mr_asprintf(checksum, "%s", biggiestruct.checksum);
-    mr_asprintf(bigfile_fname, "%s", biggiestruct.filename);
-
-    log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
     log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
 
@@ -85 +85 @@
         mr_asprintf(tmp, "Comparing %s", bigfile_fname);
         newtDrawRootText(0, 22, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         newtRefresh();
     }
-    if (!checksum[0]) {
+    if (checksum == NULL]) {
         log_msg(2, "Warning - %s has no checksum", bigfile_fname);
     }
     if (!strncmp(bigfile_fname, "/dev/", 5)) {
         log_msg(2, "IGNORING %s as begining with /dev", bigfile_fname);
+        mr_free(checksum);
         mr_free(bigfile_fname);
         return (1);
@@ -104 +105 @@
     mr_asprintf(tmp, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
     paranoid_system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (i) {
         log_OS_error("Warning - command failed");
+        mr_free(checksum);
+        mr_free(bigfile_fname);
         return (1);
     } else {
         if (!(fin = fopen("/tmp/md5sum.txt", "r"))) {
-            log_msg(2,
-                    "Unable to open /tmp/md5sum.txt; can't get live checksum");
+            log_msg(2, "Unable to open /tmp/md5sum.txt; can't get live checksum");
+            mr_free(checksum);
             mr_free(bigfile_fname);
             return (1);
@@ -135 +138 @@
 
     log_msg(1, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (retval) {
@@ -270 +273 @@
         } else {
             // afio
+            mr_asprintf(tmp, "%s", compressor_exe);
             mr_free(compressor_exe);
-            mr_asprintf(tmp, "%s", compressor_exe);
             mr_asprintf(compressor_exe, "-P %s -Z", tmp);
             mr_free(tmp);
@@ -291 +294 @@
     }
     mr_free(compressor_exe);
-    paranoid_free(archiver_exe);
+    mr_free(archiver_exe);
 
 #undef BUFSIZE
@@ -474 +477 @@
     noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt");
     if (noof_changed_files) {
-        mr_asprintf(tmp, "%ld files do not match the backup            ", noof_changed_files);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("%ld files do not match the backup            ", noof_changed_files);
 
         mr_asprintf(command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
@@ -525 +526 @@
 
   /**************************************************************************
-   * also deletes tmp/filelist.full & biggielist.txt _and_ tries to     *
+   * also deletes tmp/filelist.full & tmp/biggielist.txt _and_ tries to     *
    * restore them from start of tape, if available                          *
    **************************************************************************/
@@ -653 +654 @@
     }
 
-    mvaddstr_and_log_it(g_currentY,
-                        0, "Verifying archives against filesystem");
+    mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem");
 
     mr_free(bkpinfo->media_device);
@@ -711 +711 @@
     }
 
-    mvaddstr_and_log_it(g_currentY,
-                        0, "Verifying archives against filesystem");
+    mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem");
     res = verify_tape_backups();
     if (chdir(dir)) {