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

Timestamp:

Feb 2, 2007, 11:21:27 PM (17 years ago)

Author:

Bruno Cornec

Message:

log_msg => mr_msg in trunk

File:

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

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

@@ -71 +71 @@
 */
 
-    log_msg(1, "Now scanning log file for 'afio: ' stuff");
+    mr_msg(1, "Now scanning log file for 'afio: ' stuff");
     mr_asprintf(&command,
              "grep \"afio: \" %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s",
              stderr_fname, afio_found_changes);
-    log_msg(2, command);
+    mr_msg(2, command);
     res = system(command);
     mr_free(command);
     if (res) {
-        log_msg(2, "Warning - failed to think");
-    }
-
-    log_msg(1, "Now scanning log file for 'star: ' stuff");
+        mr_msg(2, "Warning - failed to think");
+    }
+
+    mr_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);
-    log_msg(2, command);
+    mr_msg(2, command);
     res = system(command);
     mr_free(command);
     if (res) {
-        log_msg(2, "Warning - failed to think");
+        mr_msg(2, "Warning - failed to think");
     }
 //  exclude_nonexistent_files (afio_found_changes);
@@ -98 +98 @@
              ignorefiles_fname, afio_found_changes, afio_found_changes,
              changedfiles_fname);
-    log_msg(2, command);
+    mr_msg(2, command);
     paranoid_system(command);
     mr_free(command);
@@ -144 +144 @@
     if (g_last_afioball_number != set_number - 1) {
         if (set_number == 0) {
-            log_msg(1,
+            mr_msg(1,
                     "Weird error in verify_afioballs_on_CD() but it's really a cosmetic error, nothing more");
         } else {
@@ -163 +163 @@
          does_file_exist(vfy_tball_fname(bkpinfo, mountpoint, total_sets));
          total_sets++) {
-        log_msg(1, "total_sets = %d", total_sets);
+        mr_msg(1, "total_sets = %d", total_sets);
     }
     for (;
@@ -172 +172 @@
                                                            g_last_afioball_number);
         update_evalcall_form(percentage);
-        log_msg(1, "set = %d", set_number);
+        mr_msg(1, "set = %d", set_number);
         retval +=
             verify_an_afioball_from_CD(bkpinfo,
@@ -270 +270 @@
         // handle slices until end of CD
         if (slice_num == 0) {
-            log_msg(2, "ISO=%d  bigfile=%ld --START--",
+            mr_msg(2, "ISO=%d  bigfile=%ld --START--",
                     g_current_media_number, bigfile_num);
             if (!(fin = fopen(tmp1,"r"))) {
-                log_msg(2, "Cannot open bigfile's info file");
+                mr_msg(2, "Cannot open bigfile's info file");
             } else {
                 if (fread
                     ((void *) &biggiestruct, 1, sizeof(biggiestruct),
                      fin) < sizeof(biggiestruct)) {
-                    log_msg(2, "Unable to get biggiestruct");
+                    mr_msg(2, "Unable to get biggiestruct");
                 }
                 paranoid_fclose(fin);
@@ -284 +284 @@
             mr_asprintf(&tmp2, "%s/%s", bkpinfo->restore_path,
                      biggiestruct.filename);
-            log_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp2);
+            mr_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp2);
             if (!(forig = fopen(tmp2, "r"))) {
-                log_msg(2, "Failed to open bigfile. Darn.");
+                mr_msg(2, "Failed to open bigfile. Darn.");
                 retval++;
             }
@@ -293 +293 @@
             slice_num++;
         } else if (does_file_exist(tmp1)) {
-            log_msg(2, "ISO=%d  bigfile=%ld ---END---",
+            mr_msg(2, "ISO=%d  bigfile=%ld ---END---",
                     g_current_media_number, bigfile_num);
             bigfile_num++;
@@ -299 +299 @@
             slice_num = 0;
         } else {
-            log_msg(2, "ISO=%d  bigfile=%ld  slice=%ld  \r",
+            mr_msg(2, "ISO=%d  bigfile=%ld  slice=%ld  \r",
                     g_current_media_number, bigfile_num, slice_num);
             if (bkpinfo->compression_level > 0) {
@@ -327 +327 @@
                 paranoid_pclose(pin);
                 if (res && !strncmp(biggiestruct.filename, " /dev/", 5)) {
-                    log_msg(3,
+                    mr_msg(3,
                             "Ignoring differences between %s and live filesystem because it's a device and therefore the archives are stored via ntfsclone, not dd.",
                             biggiestruct.filename);
-                    log_msg(3,
+                    mr_msg(3,
                             "If you really want verification for %s, please contact the devteam and offer an incentive.",
                             biggiestruct.filename);
@@ -336 +336 @@
                 }
                 if (res) {
-                    log_msg(0,
+                    mr_msg(0,
                             "afio: \"%s\": Corrupt biggie file, says libmondo-archive.c",
                             biggiestruct.filename);
@@ -405 +405 @@
     if (strstr(tarball_fname, ".lzo")
         && strcmp(bkpinfo->zip_suffix, "lzo")) {
-        log_msg(2, "OK, I'm going to start using lzop.");
+        mr_msg(2, "OK, I'm going to start using lzop.");
         mr_allocstr(bkpinfo->zip_exe, "lzop");
         mr_allocstr(bkpinfo->zip_suffix, "lzo");
@@ -413 +413 @@
     if (strstr(tarball_fname, ".gz")
         && strcmp(bkpinfo->zip_suffix, "gz")) {
-        log_msg(2, "OK, I'm going to start using gzip.");
+        mr_msg(2, "OK, I'm going to start using gzip.");
         strcpy(bkpinfo->zip_exe, "gzip");
         strcpy(bkpinfo->zip_suffix, "gz");
@@ -421 +421 @@
     if (strstr(tarball_fname, ".bz2")
         && strcmp(bkpinfo->zip_suffix, "bz2")) {
-        log_msg(2, "OK, I'm going to start using bzip2.");
+        mr_msg(2, "OK, I'm going to start using bzip2.");
         mr_allocstr(bkpinfo->zip_exe, "bzip2");
         mr_allocstr(bkpinfo->zip_suffix, "bz2");
@@ -441 +441 @@
                  bkpinfo->zip_exe, tarball_fname, outlog, outlog);
     }
-    log_msg(6, "command=%s", command);
+    mr_msg(6, "command=%s", command);
     paranoid_system(command);
     mr_free(command);
@@ -462 +462 @@
                         if (strchr(tmp, '/')) {
                             if (!diffs) {
-                                log_msg(0, "'%s' - differences found",
+                                mr_msg(0, "'%s' - differences found",
                                         tarball_fname);
                             }
-                            log_msg(0, "star: /%s",
+                            mr_msg(0, "star: /%s",
                                     strip_afio_output_line(tmp));
                             diffs++;
@@ -472 +472 @@
                 } else {
                     if (!diffs) {
-                        log_msg(0, "'%s' - differences found",
+                        mr_msg(0, "'%s' - differences found",
                                 tarball_fname);
                     }
-                    log_msg(0, "afio: /%s", strip_afio_output_line(tmp));
+                    mr_msg(0, "afio: /%s", strip_afio_output_line(tmp));
                     diffs++;
                 }
@@ -515 +515 @@
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
 
-    log_msg(1, "Verifying %s", tarball_fname);
+    mr_msg(1, "Verifying %s", tarball_fname);
     if (!does_file_exist(tarball_fname)) {
         fatal_error("Cannot verify nonexistent afioball");
@@ -575 +575 @@
                  "Afioball '%s' no longer matches your live filesystem",
                  p);
-        log_msg(0, tmp);
+        mr_msg(0, tmp);
         mr_free(tmp);
         retval++;
@@ -648 +648 @@
                                           &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
-            log_msg(2, "test_file = %s", test_file);
+            mr_msg(2, "test_file = %s", test_file);
             wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
         }
@@ -666 +666 @@
             mr_asprintf(&tmp, "orig cksum=%s; curr cksum=%s", biggie_cksum,
                      orig_cksum);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
             mr_free(tmp);
 
@@ -795 +795 @@
         fname = (char *) &res;
     }
-    log_msg(1, "All done with afioballs");
+    mr_msg(1, "All done with afioballs");
     close_progress_form();
     mr_free(fname);
@@ -867 +867 @@
     }
     noof_biggiefiles = (long) size;
-    log_msg(1, "noof_biggiefiles = %ld", noof_biggiefiles);
+    mr_msg(1, "noof_biggiefiles = %ld", noof_biggiefiles);
     open_progress_form(_("Verifying big files"), comment,
                        _("Please wait. This may take some time."), "",
@@ -956 +956 @@
                  "%s not found; assuming you backed up to CD; verifying CD...",
                  fname);
-        log_msg(2, tmp);
+        mr_msg(2, tmp);
         mr_free(tmp);
 
@@ -995 +995 @@
         mr_free(command);
     }
-    log_msg(2, "OK, I've mounted the ISO/CD\n");
+    mr_msg(2, "OK, I've mounted the ISO/CD\n");
     mr_asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
     if (!does_file_exist(tmp)) {
-        log_msg
+        mr_msg
             (2,
              "This is the last CD. I am therefore setting bkpinfo->verify_data to FALSE.");
@@ -1033 +1033 @@
         retval++;
     } else {
-        log_msg(2, "OK, I've unmounted the ISO file\n");
+        mr_msg(2, "OK, I've unmounted the ISO file\n");
     }
     mr_free(command);
@@ -1045 +1045 @@
         if (!bkpinfo->please_dont_eject
             && eject_device(bkpinfo->media_device)) {
-            log_msg(2, "Failed to eject CD-ROM drive");
+            mr_msg(2, "Failed to eject CD-ROM drive");
         }
     }
@@ -1075 +1075 @@
     assert(bkpinfo != NULL);
 
-    log_msg(3, "verify_tape_backups --- starting");
+    mr_msg(3, "verify_tape_backups --- starting");
     log_to_screen(_("Verifying backups"));
     openin_tape(bkpinfo);
@@ -1098 +1098 @@
              (bkpinfo->use_star) ? "star" : "afio", MONDO_LOGFILE,
              changed_files_fname);
-    log_msg(2, "Running command to derive list of changed files");
-    log_msg(2, tmp);
+    mr_msg(2, "Running command to derive list of changed files");
+    mr_msg(2, tmp);
     if (system(tmp)) {
         if (does_file_exist(changed_files_fname)
@@ -1126 +1126 @@
                  "%ld files differed from live filesystem; type less %s or less %s to see",
                  diffs, changed_files_fname, "/tmp/changed.files");
-        log_msg(0, tmp);
+        mr_msg(0, tmp);
         mr_free(tmp);