Changeset 2296 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-verify.c

Timestamp:

Jul 23, 2009, 2:53:30 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Replace sprintf by mr_asprintf in mondo-rstr-compare.c
• All mr_asprintf call should be on one line (for quality script) and use a string as second param
• Improve quality script

File:

• branches/2.2.10/mondo/src/common/libmondo-verify.c (modified) (9 diffs)

branches/2.2.10/mondo/src/common/libmondo-verify.c

@@ -107 +107 @@
 
     log_msg(1, "Now scanning log file for 'star: ' stuff");
-    mr_asprintf(&command,
-            "grep \"star: \" %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s",
-            stderr_fname, afio_found_changes);
+    mr_asprintf(&command, "grep \"star: \" %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s", stderr_fname, afio_found_changes);
     log_msg(2, command);
     res = system(command);
@@ -118 +116 @@
     }
     afio_diffs = count_lines_in_file(afio_found_changes);
-    mr_asprintf(&command,
-            "sort %s %s %s | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s",
-            ignorefiles_fname, afio_found_changes, afio_found_changes,
-            changedfiles_fname);
+    mr_asprintf(&command, "sort %s %s %s | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s", ignorefiles_fname, afio_found_changes, afio_found_changes, changedfiles_fname);
     mr_free(afio_found_changes);
     log_msg(2, command);
@@ -172 +167 @@
         } else {
             retval++;
-            mr_asprintf(&tmp, "Warning - missing set(s) between %d and %d\n",
-                    g_last_afioball_number, set_number - 1);
+            mr_asprintf(&tmp, "Warning - missing set(s) between %d and %d\n", g_last_afioball_number, set_number - 1);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -342 +336 @@
                     g_current_media_number, bigfile_num, slice_num);
             if (!does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
-                mr_asprintf(&command, "%s -dc %s 2>> %s",
-                        sz_exe,
-                        slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix),
-                        MONDO_LOGFILE);
+                mr_asprintf(&command, "%s -dc %s 2>> %s", sz_exe, slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix), MONDO_LOGFILE);
             } else {
                 mr_asprintf(&command, "cat %s 2>> %s", slice_fname(bigfile_num, slice_num, mountpoint, ""), MONDO_LOGFILE);
@@ -474 +465 @@
         bkpinfo->use_star = TRUE;
         if (strstr(tarball_fname, ".bz2"))
-            mr_asprintf(&command,
-                    "star -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s",
-                    tarball_fname,
-                    (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog,
-                    outlog);
+            mr_asprintf(&command, "star -diff diffopts=mode,size,data file=%s -bz >> %s 2>> %s", tarball_fname, outlog, outlog);
     } else {
         bkpinfo->use_star = FALSE;
-        mr_asprintf(&command, "afio -r -P %s -Z %s >> %s 2>> %s",
-                bkpinfo->zip_exe, tarball_fname, outlog, outlog);
+        mr_asprintf(&command, "afio -r -P %s -Z %s >> %s 2>> %s", bkpinfo->zip_exe, tarball_fname, outlog, outlog);
     }
     log_msg(6, "command=%s", command);
@@ -491 +477 @@
         mr_asprintf(&command, "cat %s >> %s", outlog, MONDO_LOGFILE);
     } else {
-        mr_asprintf(&command, "cut -d: -f%d %s | sort -u",
-                (bkpinfo->use_star) ? 1 : 2, outlog);
+        mr_asprintf(&command, "cut -d: -f%d %s | sort -u", (bkpinfo->use_star) ? 1 : 2, outlog);
         pin = popen(command, "r");
         if (pin) {
@@ -794 +779 @@
         res = verify_an_afioball_from_stream(fname, size);
         if (res) {
-            mr_asprintf(&tmp, "Afioball %ld differs from live filesystem",
-                    current_afioball_number);
+            mr_asprintf(&tmp, "Afioball %ld differs from live filesystem", current_afioball_number);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -897 +881 @@
             p++;
         }
-        mr_asprintf(&comment, "Verifying bigfile #%ld (%ld K)",
-                current_biggiefile_number, (long) size >> 10);
+        mr_asprintf(&comment, "Verifying bigfile #%ld (%ld K)", current_biggiefile_number, (long) size >> 10);
         update_progress_form(comment);
         mr_free(comment);
@@ -1208 +1191 @@
     diffs = count_lines_in_file(changed_files_fname);
     if (diffs > 0) {
-        mr_asprintf(&tmp, "cp -f %s %s/changed.files", changed_files_fname,
-                MONDO_CACHE);
+        mr_asprintf(&tmp, "cp -f %s %s/changed.files", changed_files_fname, MONDO_CACHE);
         run_program_and_log_output(tmp, FALSE);
         mr_free(tmp);