Changeset 2009 in MondoRescue for trunk/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Aug 11, 2008, 3:05:15 AM (16 years ago)

Author:

Bruno Cornec

Message:

Commit ald modifs in trunk - just in case

File:

• trunk/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (18 diffs)

trunk/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -4 +4 @@
 */
 
+#include <pthread.h>
 #include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
+#include "mr_msg.h"
+#include "mr_mem.h"
 #include "mr-externs.h"
 #include "mondo-rstr-compare.h"
 #include "mondo-restore-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
-#ifndef S_SPLINT_S
-#include <pthread.h>
-#endif
-#include "mr_mem.h"
+
+//static char cvsid[] = "$Id$";
 
 void popup_changelist_from_file(char *);
@@ -32 +33 @@
 {
 
-    FILE *fin;
-    FILE *fout;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
 
   /** needs malloc *******/
@@ -62 +63 @@
     }
     if (!(fin = fopen(tmp1, "r"))) {
-        mr_asprintf(&tmp, _("Cannot open bigfile %ld (%s)'s info file"),
-                bigfileno + 1, tmp);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen(_("Cannot open bigfile %ld (%s)'s info file"),
+                bigfileno + 1, tmp1);
         mr_free(tmp1);
         return (1);
@@ -74 +73 @@
     paranoid_fclose(fin);
 
-    mr_asprintf(&checksum, biggiestruct.checksum);
     mr_asprintf(&bigfile_fname, biggiestruct.filename);
-
     mr_msg(2, "biggiestruct.filename = %s", bigfile_fname);
-    mr_msg(2, "biggiestruct.checksum = %s", checksum);
+    if (!biggiestruct.checksum[0]) {
+        mr_msg(2, "Warning - %s has no checksum", bigfile_fname);
+    } else {
+        mr_asprintf(&checksum, biggiestruct.checksum);
+        mr_msg(2, "biggiestruct.checksum = %s", checksum);
+    }
 
     if (!g_text_mode) {
@@ -86 +88 @@
         mr_free(tmp);
     }
-    /* BERLIOS: Useless ?
-    if (!checksum[0]) {
-        mr_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
-    } */
+
     if (!strncmp(bigfile_fname, "/dev/", 5)) {
         mr_msg(2, _("Ignoring device %s"), bigfile_fname);
+        mr_free(bigfile_fname);
         return(0);
-    } else {
-        mr_asprintf(&command,
-                "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors.txt",
-                MNT_RESTORING, bigfile_fname);
-    }
+    }
+    mr_asprintf(&command,
+            "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors.txt",
+            MNT_RESTORING, bigfile_fname);
     mr_msg(2, command);
-    paranoid_system("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");
     if (system(command)) {
         log_OS_error("Warning - command failed");
+        paranoid_system("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");
         mr_free(command);
         mr_free(bigfile_fname);
@@ -157 +156 @@
 {
     int retval = 0;
-    int res;
-    long noof_biggiefiles, bigfileno = 0;
-    char *tmp;
+    int res = 0;
+    long noof_biggiefiles = 0L, bigfileno = 0L;
+    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
@@ -186 +185 @@
         update_progress_form(tmp);
         mr_free(tmp);
+
         res = compare_a_biggiefile(bkpinfo, bigfileno);
         retval += res;
@@ -218 +218 @@
 {
     int retval = 0;
-    int res;
-    long noof_lines;
-    long archiver_errors;
-    bool use_star;
-
-  /***  needs malloc *********/
+    int res = 0;
+    long noof_lines = 0L;
+    long archiver_errors = 0L;
+    bool use_star = FALSE;
+
     char *command = NULL;
     char *tmp = NULL;
@@ -242 +241 @@
         mr_asprintf(&compressor_exe, "bzip2");
     } else if (strstr(tarball_fname, ".gz")) {
-        strcpy(compressor_exe, "gzip");
-    } else if (strstr(tarball_fname, ".gz")) {
-        strcpy(compressor_exe, "gzip");
+        mr_asprintf(&compressor_exe, "gzip");
     } else if (strstr(tarball_fname, ".lzo")) {
         mr_asprintf(&compressor_exe, "lzop");
@@ -275 +272 @@
         }
     }
-// star -diff H=star -bz file=....
 
 #ifdef __FreeBSD__
@@ -317 +313 @@
         archiver_errors = 0;
     }
-
     if (archiver_errors) {
-        mr_asprintf(&tmp,
-                "Differences found while processing fileset #%d       ",
+        mr_msg(1, "Differences found while processing fileset #%d       ",
                 current_tarball_number);
-        mr_msg(1, tmp);
-        mr_free(tmp);
     }
     unlink(logfile);
@@ -343 +335 @@
 {
     int retval = 0;
-    int res;
+    int res = 0;
     int current_tarball_number = 0;
-
-  /**  needs malloc **********/
 
     char *tarball_fname = NULL;
     char *progress_str = NULL;
     char *tmp = NULL;
-    long max_val;
+    long max_val = 0L;
 
     assert(bkpinfo != NULL);
@@ -415 +405 @@
         } else {
             res = compare_a_tarball(tarball_fname, current_tarball_number);
-            mr_free(tarball_fname);
-
             g_current_progress++;
             current_tarball_number++;
         }
+        mr_free(tarball_fname);
     }
     mr_free(progress_str);
@@ -457 +446 @@
     int resA = 0;
     int resB = 0;
-    long noof_changed_files;
+    long noof_changed_files = 0L;
 
     malloc_string(cwd);
@@ -475 +464 @@
     noof_changed_files = count_lines_in_file("/tmp/changed.txt");
     if (noof_changed_files) {
-        mr_asprintf(&tmp, _("%ld files do not match the backup            "),
+        log_to_screen(_("%ld files do not match the backup            "),
                 noof_changed_files);
-        //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
-        log_to_screen(tmp);
-        mr_free(tmp);
-
         mr_asprintf(&command, "cat /tmp/changed.txt >> %s", MONDO_LOGFILE);
         paranoid_system(command);
@@ -517 +502 @@
 {
     int retval = 0;
-    long q;
-    char *tmp;
+    long q = 0L;
+    char *tmp = NULL;
 
   /**************************************************************************
@@ -633 +618 @@
     run_program_and_log_output(command, FALSE);
     mr_free(command);
+
     mvaddstr_and_log_it(g_currentY,
                         0, _("Verifying archives against filesystem"));
@@ -680 +666 @@
 int compare_to_tape(struct s_bkpinfo *bkpinfo)
 {
-    int res;
+    int res = 0;
     char *dir = NULL;
     char *command = NULL;