Changeset 1185 in MondoRescue for trunk/mondo/src/common/libmondo-verify.c

Timestamp:

Feb 19, 2007, 1:51:26 AM (17 years ago)

Author:

Bruno Cornec

Message:

Merges in trunk modifications coming from stable (common)

File:

• trunk/mondo/src/common/libmondo-verify.c (modified) (25 diffs)

trunk/mondo/src/common/libmondo-verify.c

@@ -9 +9 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
+
 #include "mondostructures.h"
 #include "libmondo-verify.h"
@@ -18 +20 @@
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "mr_mem.h"
 
 /*@unused@*/
@@ -50 +51 @@
 {
     /*@ buffer ********************************************************** */
-    char *command;
-    char *afio_found_changes;
+    char *command = NULL;
+    char *afio_found_changes = NULL;
 
     /*@ int ************************************************************* */
@@ -66 +67 @@
     sync();
 
-/*  s-printf (command,
-       "grep \"afio: \" %s | awk '{j=substr($0,8); i=index(j,\": \");printf \"/%%s\\n\",substr(j,1,i-2);}' | sort -u | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"/dev/.*\" > %s",
-       stderr_fname, afio_found_changes);
-*/
 
     mr_msg(1, "Now scanning log file for 'afio: ' stuff");
@@ -183 +180 @@
 }
 
-
 /**
  * Verify all slices stored on the inserted CD (or a mounted ISO image).
@@ -197 +193 @@
 {
 
+    /*@ buffer ********************************************************** */
     char *tmp = NULL;
     char *tmp1 = NULL;
@@ -235 +232 @@
             mr_asprintf(&sz_exe, "lzop");
         } else if (bkpinfo->use_gzip) {
-            strcpy(sz_exe, "gzip");
-        } else if (bkpinfo->use_gzip) {
-            strcpy(sz_exe, "gzip");
+            mr_asprintf(&sz_exe, "gzip");
         } else {
             mr_asprintf(&sz_exe, "bzip2");
         }
     } else {
-        mr_asprintf(&sz_exe, " ");
+        mr_asprintf(&sz_exe, "");
     }
 
@@ -381 +376 @@
 {
     /*@ buffers ********************************************************* */
-    char *command;
-    char *outlog;
+    char *command = NULL;
+    char *outlog = NULL;
     char *tmp = NULL;
-    //  char *p;
 
     /*@ pointers ******************************************************* */
-    FILE *pin;
+    FILE *pin = NULL;
 
     size_t n = 0;
@@ -399 +393 @@
     log_it("Verifying fileset '%s'", tarball_fname);
 
-    /*  chdir("/"); */
     mr_asprintf(&outlog, "%s/afio.log", bkpinfo->tmpdir);
 
@@ -430 +423 @@
     if (strstr(tarball_fname, ".star")) {
         bkpinfo->use_star = TRUE;
-        if (strstr(tarball_fname, ".bz2"))
+        if (strstr(tarball_fname, ".bz2")) {
             mr_asprintf(&command,
                      "star -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s",
@@ -436 +429 @@
                      (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog,
                      outlog);
+        } else {
+            mr_asprintf(&command,"");
+        }
     } else {
         bkpinfo->use_star = FALSE;
@@ -446 +442 @@
 
     if (length_of_file(outlog) < 10) {
+        /* BERLIOS: This seems useless !! */
         mr_asprintf(&command, "cat %s >> %s", outlog, MONDO_LOGFILE);
     } else {
@@ -488 +485 @@
     mr_free(command);
 
-    /*  chdir(old_pwd); */
-    //  s-printf (tmp, "uniq -u %s >> %s", "/tmp/mondo-verify.err", MONDO_LOGFILE);
-    //  paranoid_system (tmp);
-    //  unlink ("/tmp/mondo-verify.err");
     return (0);
 }
@@ -543 +536 @@
 
     /*@ buffers ********************************************************** */
-    char *tmp;
-    char *tarball_fname;
+    char *tmp = NULL;
+    char *tarball_fname = NULL;
 
     /*@ pointers ********************************************************* */
-    char *p;
+    char *p = NULL;
 
     assert(bkpinfo != NULL);
@@ -563 +556 @@
 
     mr_asprintf(&tarball_fname, "%s/tmpfs/temporary-%s", bkpinfo->tmpdir, p);
-    /* BERLIOS : useless
-       mr_asprintf(&tmp, "Temporarily copying file from tape to '%s'",
-       tarball_fname);
-       log_it(tmp); 
-       mr_free(tmp);
-     */
     read_file_from_stream_to_file(bkpinfo, tarball_fname, size);
     res = verify_a_tarball(bkpinfo, tarball_fname);
     if (res) {
-        mr_asprintf(&tmp,
-                 "Afioball '%s' no longer matches your live filesystem",
-                 p);
-        mr_msg(0, tmp);
-        mr_free(tmp);
+        mr_msg(0, "Afioball '%s' no longer matches your live filesystem", p);
         retval++;
     }
@@ -604 +587 @@
 
     /*@ char ************************************************************ */
-    char *test_file;
-    char *biggie_cksum;
-    char *orig_cksum;
-    char *tmp;
+    char *test_file = NULL;
+    char *biggie_cksum = NULL;
+    char *orig_cksum = NULL;
+    char *tmp = NULL;
     char *slice_fnam = (char *) &res;
 
@@ -626 +609 @@
     }
     mr_asprintf(&test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
-    mr_asprintf(&tmp,
-             "Temporarily copying biggiefile %s's slices from tape to '%s'",
-             p, test_file);
-    log_it(tmp);
-    mr_free(tmp);
     for (res =
          read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr);
@@ -704 +682 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char *fname = (char *) &res;    /* Should NOT be NULL */
-    char *curr_xattr_list_fname;
-    char *curr_acl_list_fname;
+    char *curr_xattr_list_fname = NULL;
+    char *curr_acl_list_fname = NULL;
 
     /*@ long long *************************************************** */
@@ -772 +750 @@
         }
         mr_asprintf(&tmp, "Verifying fileset #%ld", current_afioball_number);
-        /*log_it(tmp); */
         update_progress_form(tmp);
         mr_free(tmp);
@@ -824 +801 @@
     /*@ buffers ******************************************************** */
     char *orig_fname = (char *) &ctrl_chr;  /* Should NOT be NULL */
-    char *logical_fname;
-    char *comment;
-    char *curr_xattr_list_fname;
-    char *curr_acl_list_fname;
+    char *logical_fname = NULL;
+    char *comment = NULL;
+    char *curr_xattr_list_fname = NULL;
+    char *curr_acl_list_fname = NULL;
     /*@ pointers ******************************************************* */
-    char *p;
+    char *p = NULL;
 
     /*@ long long size ************************************************* */
@@ -931 +908 @@
 
     /*@ buffers ******************************************************** */
-    char *mountpoint;
-    char *command;
-    char *tmp;
-    char *fname;
+    char *mountpoint = NULL;
+    char *command = NULL;
+    char *tmp = NULL;
+    char *fname = NULL;
 #ifdef __FreeBSD__
     char mdd[32];
@@ -991 +968 @@
             log_to_screen(tmp);
             mr_free(tmp);
+            mr_free(command);
             return (1);
         }
@@ -1014 +992 @@
     verify_all_slices_on_CD(bkpinfo, mountpoint);
 
+    mr_asprintf(&command, "umount %s", mountpoint);
 #ifdef __FreeBSD__
     ret = 0;
-    mr_asprintf(&command, "umount %s", mountpoint);
     ret += system(command);
-
     ret += kick_vn(mddevice);
     if (ret)
 #else
-    mr_asprintf(&command, "umount %s", mountpoint);
-
     if (system(command))
 #endif
@@ -1067 +1042 @@
 
     /*@ buffers ******************************************************** */
-    char *tmp;
-    char *changed_files_fname;
+    char *tmp = NULL;
+    char *changed_files_fname = NULL;
 
     /*@ long *********************************************************** */
@@ -1089 +1064 @@
 
     /* close tape; exit */
-    //  fclose(g_tape_stream); <-- not needed; is handled by closein_tape()
     paranoid_system
         ("rm -f /tmp/biggies.changed /tmp/changed.files.[0-9]* 2> /dev/null");