Changeset 1108 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-restore.c

Timestamp:

Feb 8, 2007, 12:10:16 AM (17 years ago)

Author:

Bruno Cornec

Message:

log_msg => mr_msg for main files

File:

• branches/stable/mondo/src/mondorestore/mondo-restore.c (modified) (102 diffs)

branches/stable/mondo/src/mondorestore/mondo-restore.c

@@ -163 +163 @@
     int retval = 0, res = 0;
 
-    log_msg(2, "let_user_edit_the_mountlist() --- starting");
+    mr_msg(2, "let_user_edit_the_mountlist() --- starting");
 
     assert(bkpinfo != NULL);
@@ -170 +170 @@
     if (!bkpinfo->disaster_recovery) {
         strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
-        log_msg(2, "I guess you're testing edit_mountlist()");
+        mr_msg(2, "I guess you're testing edit_mountlist()");
     }
     if (!does_file_exist(g_mountlist_fname)) {
@@ -218 +218 @@
     for (i = 0; i < mountlist->entries; i++) {
         if (strstr(mountlist->el[i].format, "ompaq")) {
-            log_msg(2, "mountlist[%d] (%s) is %s (Compaq alert!)",
+            mr_msg(2, "mountlist[%d] (%s) is %s (Compaq alert!)",
                     i, mountlist->el[i].device, mountlist->el[i].format);
 
@@ -296 +296 @@
     if (bkpinfo->backup_media_type == iso) {
         if (iso_fiddly_bits(bkpinfo, (c == 'N') ? TRUE : FALSE)) {
-            log_msg(2,
+            mr_msg(2,
                     "catchall_mode --- iso_fiddly_bits returned w/ error");
             return (1);
         } else {
-            log_msg(2, "catchall_mode --- iso_fiddly_bits ok");
+            mr_msg(2, "catchall_mode --- iso_fiddly_bits ok");
         }
     }
 
     if (c == 'I') {
-        log_msg(2, "IM selected");
+        mr_msg(2, "IM selected");
         retval += interactive_mode(bkpinfo, mountlist, raidlist);
     } else if (c == 'N') {
-        log_msg(2, "NM selected");
+        mr_msg(2, "NM selected");
         retval += nuke_mode(bkpinfo, mountlist, raidlist);
     } else if (c == 'C') {
-        log_msg(2, "CM selected");
+        mr_msg(2, "CM selected");
         retval += compare_mode(bkpinfo, mountlist, raidlist);
     }
@@ -400 +400 @@
     /* try to partition and format */
 
-    log_msg(2, "interactive_mode --- starting (great, assertions OK)");
+    mr_msg(2, "interactive_mode --- starting (great, assertions OK)");
 
     malloc_string(tmp);
@@ -409 +409 @@
     assert(raidlist != NULL);
 
-    log_msg(2, "interactive_mode --- assertions OK");
+    mr_msg(2, "interactive_mode --- assertions OK");
 
     if (g_text_mode) {
@@ -433 +433 @@
 #endif
     {
-        log_msg(1, "Not resizing mountlist.");
+        mr_msg(1, "Not resizing mountlist.");
     } else {
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
@@ -451 +451 @@
             paranoid_MR_finish(1);
         }
-        log_msg(2, "Proceeding...");
+        mr_msg(2, "Proceeding...");
         save_mountlist_to_disk(mountlist, g_mountlist_fname);
         save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
@@ -534 +534 @@
          ask_me_yes_or_no("Do you want me to restore all of your data?")))
     {
-        log_msg(1, "Restoring all data");
+        mr_msg(1, "Restoring all data");
         retval += restore_everything(bkpinfo, NULL);
     } else
@@ -561 +561 @@
                     }
                     strcpy(bkpinfo->restore_path, tmp);
-                    log_msg(1, "Restoring subset");
+                    mr_msg(1, "Restoring subset");
                     retval += restore_everything(bkpinfo, filelist);
                     free_filelist(filelist);
@@ -666 +666 @@
     assert(raidlist != NULL);
     if (iso_fiddly_bits(bkpinfo, nuke_me_please)) {
-        log_msg(1, "iso_mode --- returning w/ error");
+        mr_msg(1, "iso_mode --- returning w/ error");
         return (1);
     } else {
@@ -732 +732 @@
     assert(raidlist != NULL);
 
-    log_msg(2, "nuke_mode --- starting");
+    mr_msg(2, "nuke_mode --- starting");
 
     get_cfg_file_from_archive_or_bust(bkpinfo);
@@ -746 +746 @@
 #endif
     {
-        log_msg(2, "Not resizing mountlist.");
+        mr_msg(2, "Not resizing mountlist.");
     } else {
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
@@ -784 +784 @@
 #endif
             {
-                log_msg(2,
+                mr_msg(2,
                         "Not partitioning drives due to 'nopart' option.");
                 res = 0;
@@ -831 +831 @@
     retval += restore_everything(bkpinfo, NULL);
     if (!run_boot_loader(FALSE)) {
-        log_msg(1,
+        mr_msg(1,
                 "Great! Boot loader was installed. No need for msg at end.");
         boot_loader_installed = TRUE;
@@ -910 +910 @@
     struct s_node *filelist;
 
-    log_msg(1, "restore_to_live_filesystem() - starting");
+    mr_msg(1, "restore_to_live_filesystem() - starting");
     assert(bkpinfo != NULL);
     malloc_string(old_restpath);
@@ -923 +923 @@
     }
     interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-    log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
+    mr_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
     if (!bkpinfo->media_device[0]) {
-        log_msg(2, "Warning - failed to find media dev");
-    }
-
-
-    log_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
+        mr_msg(2, "Warning - failed to find media dev");
+    }
+
+
+    mr_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
 
     open_evalcall_form("Thinking...");
@@ -957 +957 @@
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        log_msg(2,
+        mr_msg(2,
                 "I probably don't need to unmount or eject the CD-ROM but I'm doing it anyway.");
     }
@@ -1046 +1046 @@
     if (fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin) <
         sizeof(biggiestruct)) {
-        log_msg(2, "Warning - unable to get biggiestruct of bigfile #%d",
+        mr_msg(2, "Warning - unable to get biggiestruct of bigfile #%d",
                 bigfileno + 1);
     }
@@ -1056 +1056 @@
         sprintf(tmp, "Warning - bigfile %ld does not have a checksum",
                 bigfileno + 1);
-        log_msg(3, tmp);
+        mr_msg(3, tmp);
         p = checksum;
     }
@@ -1072 +1072 @@
         node = find_string_at_node(filelist, biggiestruct.filename);
         if (!node) {
-            log_msg(0, "Skipping %s (name isn't in filelist)",
+            mr_msg(0, "Skipping %s (name isn't in filelist)",
                     biggiestruct.filename);
             pathname_of_last_file_restored[0] = '\0';
             return (0);
         } else if (!(node->selected)) {
-            log_msg(1, "Skipping %s (name isn't in biggielist subset)",
+            mr_msg(1, "Skipping %s (name isn't in biggielist subset)",
                     biggiestruct.filename);
             pathname_of_last_file_restored[0] = '\0';
@@ -1085 +1085 @@
     /* otherwise, continue */
 
-    log_msg(1, "DEFINITELY restoring %s", biggiestruct.filename);
+    mr_msg(1, "DEFINITELY restoring %s", biggiestruct.filename);
     if (biggiestruct.use_ntfsprog) {
         if (strncmp(biggiestruct.filename, "/dev/", 5)) {
-            log_msg(1,
+            mr_msg(1,
                     "I was in error when I set biggiestruct.use_ntfsprog to TRUE.");
-            log_msg(1, "%s isn't even in /dev", biggiestruct.filename);
+            mr_msg(1, "%s isn't even in /dev", biggiestruct.filename);
             biggiestruct.use_ntfsprog = FALSE;
         }
@@ -1100 +1100 @@
         g_loglevel = 4;
         use_ntfsprog_hack = TRUE;
-        log_msg(2,
+        mr_msg(2,
                 "Calling ntfsclone in background because %s is an NTFS /dev entry",
                 outfile_fname);
@@ -1112 +1112 @@
             fatal_error("Fork failure");
         case 0:
-            log_msg(3,
+            mr_msg(3,
                     "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)",
                     biggiestruct.filename, ntfsprog_fifo);
@@ -1118 +1118 @@
                 feed_outfrom_ntfsprog(biggiestruct.filename,
                                        ntfsprog_fifo);
-//          log_msg(3, "CHILD - fip - exiting");
+//          mr_msg(3, "CHILD - fip - exiting");
             exit(res);
             break;
         default:
-            log_msg(3,
+            mr_msg(3,
                     "feed_into_ntfsprog() called in background --- pid=%ld",
                     (long int) (pid));
@@ -1138 +1138 @@
     sprintf(tmp, "Reassembling big file %ld (%s)", bigfileno + 1,
             outfile_fname);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
 
     /*
@@ -1150 +1150 @@
     pathname_of_last_file_restored[MAX_STR_LEN - 1] = '\0';
 
-    log_msg(3, "file_to_openout = %s", file_to_openout);
+    mr_msg(3, "file_to_openout = %s", file_to_openout);
     if (!(fout = fopen(file_to_openout, "w"))) {
         log_to_screen("Cannot openout outfile_fname - hard disk full?");
         return (1);
     }
-    log_msg(3, "Opened out to %s", outfile_fname);  // CD/DVD --> mondorestore --> ntfsclone --> hard disk itself
+    mr_msg(3, "Opened out to %s", outfile_fname);   // CD/DVD --> mondorestore --> ntfsclone --> hard disk itself
 
     for (sliceno = 1, finished = FALSE; !finished;) {
@@ -1169 +1169 @@
             !does_file_exist(slice_fname
                              (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
-            log_msg(3,
+            mr_msg(3,
                     "Cannot find a data slice or terminator slice on CD %d",
                     g_current_media_number);
@@ -1177 +1177 @@
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number, sliceno);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
             sprintf(tmp, "Restoring from %s #%d",
                     media_descriptor_string(bkpinfo->backup_media_type),
@@ -1188 +1188 @@
                    slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
             if (does_file_exist(tmp) && length_of_file(tmp) == 0) {
-                log_msg(2,
+                mr_msg(2,
                         "End of bigfile # %ld (slice %ld is the terminator)",
                         bigfileno + 1, sliceno);
@@ -1235 +1235 @@
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number, bigfileno + 1, sliceno);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
 
             if (!g_text_mode) {
@@ -1253 +1253 @@
                     sprintf(sz_msg + strlen(sz_msg),
                             "; written %ld to fout", siz);
-//        log_msg(2. sz_msg);
+//        mr_msg(2. sz_msg);
                 }
             }
@@ -1274 +1274 @@
 
     if (use_ntfsprog_hack) {
-        log_msg(3, "Waiting for ntfsclone to finish");
+        mr_msg(3, "Waiting for ntfsclone to finish");
         sprintf(tmp,
                 " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
@@ -1370 +1370 @@
     if (use_ntfsprog == BLK_START_A_PIHBIGGIE) {
         use_ntfsprog = 1;
-        log_msg(1, "%s --- pih=YES", orig_bf_fname);
+        mr_msg(1, "%s --- pih=YES", orig_bf_fname);
     } else if (use_ntfsprog == BLK_START_A_NORMBIGGIE) {
         use_ntfsprog = 0;
-        log_msg(1, "%s --- pih=NO", orig_bf_fname);
+        mr_msg(1, "%s --- pih=NO", orig_bf_fname);
     } else {
         use_ntfsprog = 0;
-        log_msg(1, "%s --- pih=NO (weird marker though)", orig_bf_fname);
+        mr_msg(1, "%s --- pih=NO (weird marker though)", orig_bf_fname);
     }
 
@@ -1389 +1389 @@
         if (!node) {
             dummy_restore = TRUE;
-            log_msg(1,
+            mr_msg(1,
                     "Skipping big file %ld (%s) - not in biggielist subset",
                     biggiefile_number + 1, orig_bf_fname);
@@ -1395 +1395 @@
         } else if (!(node->selected)) {
             dummy_restore = TRUE;
-            log_msg(1, "Skipping %s (name isn't in biggielist subset)",
+            mr_msg(1, "Skipping %s (name isn't in biggielist subset)",
                     orig_bf_fname);
             pathname_of_last_file_restored[0] = '\0';
@@ -1403 +1403 @@
     if (use_ntfsprog) {
         if (strncmp(orig_bf_fname, "/dev/", 5)) {
-            log_msg(1,
+            mr_msg(1,
                     "I was in error when I set use_ntfsprog to TRUE.");
-            log_msg(1, "%s isn't even in /dev", orig_bf_fname);
+            mr_msg(1, "%s isn't even in /dev", orig_bf_fname);
             use_ntfsprog = FALSE;
         }
@@ -1414 +1414 @@
         strcpy(outfile_fname, orig_bf_fname);
         use_ntfsprog_hack = TRUE;
-        log_msg(2,
+        mr_msg(2,
                 "Calling ntfsclone in background because %s is a /dev entry",
                 outfile_fname);
@@ -1428 +1428 @@
             fatal_error("Fork failure");
         case 0:
-            log_msg(3,
+            mr_msg(3,
                     "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)",
                     outfile_fname, ntfsprog_fifo);
             res =
                 feed_outfrom_ntfsprog(outfile_fname, ntfsprog_fifo);
-//          log_msg(3, "CHILD - fip - exiting");
+//          mr_msg(3, "CHILD - fip - exiting");
             exit(res);
             break;
         default:
-            log_msg(3,
+            mr_msg(3,
                     "feed_into_ntfsprog() called in background --- pid=%ld",
                     (long int) (pid));
@@ -1459 +1459 @@
         sprintf(tmp, "Reassembling big file %ld (%s)",
                 biggiefile_number + 1, orig_bf_fname);
-        log_msg(2, tmp);
+        mr_msg(2, tmp);
     }
 
@@ -1473 +1473 @@
     }
     sprintf(tmp, "Pipe command = '%s'", command);
-    log_msg(3, tmp);
+    mr_msg(3, tmp);
 
     /* restore biggiefile, one slice at a time */
@@ -1487 +1487 @@
         sprintf(tmp, "Working on file #%ld, slice #%ld    ",
                 biggiefile_number + 1, current_slice_number);
-        log_msg(2, tmp);
+        mr_msg(2, tmp);
         if (!g_text_mode) {
             newtDrawRootText(0, g_noof_rows - 2, tmp);
@@ -1505 +1505 @@
                     ((void *) &biggiestruct, 1, sizeof(biggiestruct),
                      fin) < sizeof(biggiestruct)) {
-                    log_msg(2,
+                    mr_msg(2,
                             "Warning - unable to get biggiestruct of bigfile #%d",
                             biggiefile_number + 1);
@@ -1525 +1525 @@
     paranoid_pclose(pout);
 
-    log_msg(1, "pathname_of_last_file_restored is now %s",
+    mr_msg(1, "pathname_of_last_file_restored is now %s",
             pathname_of_last_file_restored);
 
     if (use_ntfsprog_hack) {
-        log_msg(3, "Waiting for ntfsclone to finish");
+        mr_msg(3, "Waiting for ntfsclone to finish");
         sprintf(tmp,
                 " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
@@ -1535 +1535 @@
             sleep(1);
         }
-        log_msg(3, "OK, ntfsclone has really finished");
-    }
-
-    log_msg(3, "biggiestruct.filename = %s", biggiestruct.filename);
-    log_msg(3, "biggiestruct.checksum = %s", biggiestruct.checksum);
+        mr_msg(3, "OK, ntfsclone has really finished");
+    }
+
+    mr_msg(3, "biggiestruct.filename = %s", biggiestruct.filename);
+    mr_msg(3, "biggiestruct.checksum = %s", biggiestruct.checksum);
     if (strcmp(outfile_fname, "/dev/null")) {
         chmod(outfile_fname, biggiestruct.properties.st_mode);
@@ -1609 +1609 @@
     malloc_string(acl_fname);
 
-    log_msg(5, "Entering");
+    mr_msg(5, "Entering");
     filelist_subset_fname[0] = '\0';
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
@@ -1621 +1621 @@
             current_tarball_number);
     if (length_of_file(filelist_name) <= 2) {
-        log_msg(2, "There are _zero_ files in filelist '%s'",
+        mr_msg(2, "There are _zero_ files in filelist '%s'",
                 filelist_name);
-        log_msg(2,
+        mr_msg(2,
                 "This is a bit silly (ask dev-team to fix mondo_makefilelist, please)");
-        log_msg(2,
+        mr_msg(2,
                 "but it's non-critical. It's cosmetic. Don't worry about it.");
         retval = 0;
@@ -1632 +1632 @@
     if (count_lines_in_file(filelist_name) <= 0
         || length_of_file(tarball_fname) <= 0) {
-        log_msg(3, "length_of_file(%s) = %llu", tarball_fname,
+        mr_msg(3, "length_of_file(%s) = %llu", tarball_fname,
                 length_of_file(tarball_fname));
         sprintf(tmp, "Unable to restore fileset #%ld (CD I/O error)",
@@ -1650 +1650 @@
             <= 0) {
             sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
-            log_msg(1, tmp);
+            mr_msg(1, tmp);
         } else {
-            log_msg(3, "Saved fileset %ld's subset to %s",
+            mr_msg(3, "Saved fileset %ld's subset to %s",
                     current_tarball_number, filelist_subset_fname);
         }
@@ -1722 +1722 @@
         sprintf(command + strlen(command), " 2>> %s >> %s", temp_log,
                 temp_log);
-        log_msg(1, "command = '%s'", command);
+        mr_msg(1, "command = '%s'", command);
         unlink(temp_log);
         res = system(command);
@@ -1729 +1729 @@
             if (p) {
                 p[0] = p[1] = p[2] = p[3] = ' ';
-                log_msg(1, "new command = '%s'", command);
+                mr_msg(1, "new command = '%s'", command);
                 res = system(command);
             }
@@ -1738 +1738 @@
 
         if (g_getfattr) {
-            log_msg(1, "Setting fattr list %s", xattr_fname);
+            mr_msg(1, "Setting fattr list %s", xattr_fname);
             if (length_of_file(xattr_fname) > 0) {
                 res = set_fattr_list(filelist_subset_fname, xattr_fname);
@@ -1745 +1745 @@
                         ("Errors occurred while setting extended attributes");
                 } else {
-                    log_msg(1, "I set xattr OK");
+                    mr_msg(1, "I set xattr OK");
                 }
                 retval += res;
@@ -1751 +1751 @@
         }
         if (g_getfacl) {
-            log_msg(1, "Setting acl list %s", acl_fname);
+            mr_msg(1, "Setting acl list %s", acl_fname);
             if (length_of_file(acl_fname) > 0) {
                 res = set_acl_list(filelist_subset_fname, acl_fname);
@@ -1758 +1758 @@
                         ("Errors occurred while setting access control lists");
                 } else {
-                    log_msg(1, "I set ACL OK");
+                    mr_msg(1, "I set ACL OK");
                 }
                 retval += res;
@@ -1766 +1766 @@
             sprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             system(command);
-            log_msg(2, "Errors occurred while processing fileset #%d",
+            mr_msg(2, "Errors occurred while processing fileset #%d",
                     current_tarball_number);
         } else {
-            log_msg(2, "Fileset #%d processed OK", current_tarball_number);
+            mr_msg(2, "Fileset #%d processed OK", current_tarball_number);
         }
     }
@@ -1790 +1790 @@
     mr_free(xattr_fname);
     mr_free(acl_fname);
-    log_msg(5, "Leaving");
+    mr_msg(5, "Leaving");
     return (retval);
 }
@@ -1852 +1852 @@
             media_descriptor_string(bkpinfo->backup_media_type),
             g_current_media_number);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
 
@@ -1873 +1873 @@
     }
     if (res) {
-        log_msg(1, "Warning - error reading afioball from tape");
+        mr_msg(1, "Warning - error reading afioball from tape");
     }
     if (bkpinfo->compression_level == 0) {
@@ -1900 +1900 @@
         sprintf(command + strlen(command), " > %s 2>> %s", filelist_fname,
                 MONDO_LOGFILE);
-        log_msg(1, "command = %s", command);
+        mr_msg(1, "command = %s", command);
         if (system(command)) {
-            log_msg(4, "Warning - error occurred while retrieving TOC");
+            mr_msg(4, "Warning - error occurred while retrieving TOC");
         }
         if ((matches =
@@ -1910 +1910 @@
             <= 0 || length_of_file(filelist_subset_fname) < 2) {
             if (length_of_file(filelist_subset_fname) < 2) {
-                log_msg(1, "No matches found in fileset %ld",
+                mr_msg(1, "No matches found in fileset %ld",
                         current_tarball_number);
             }
             sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
             restore_this_fileset = FALSE;
         } else {
-            log_msg(5, "%ld matches. Saved fileset %ld's subset to %s",
+            mr_msg(5, "%ld matches. Saved fileset %ld's subset to %s",
                     matches, current_tarball_number,
                     filelist_subset_fname);
@@ -1946 +1946 @@
 // Call if IF there are files to restore (selectively/unconditionally)
     if (restore_this_fileset) {
-        log_msg(1, "Calling command='%s'", command);
+        mr_msg(1, "Calling command='%s'", command);
         paranoid_system(command);
 
@@ -1953 +1953 @@
             res = set_fattr_list(filelist_subset_fname, xattr_fname);
             if (res) {
-                log_msg(1, "Errors occurred while setting xattr");
+                mr_msg(1, "Errors occurred while setting xattr");
             } else {
-                log_msg(1, "I set xattr OK");
+                mr_msg(1, "I set xattr OK");
             }
             retval += res;
@@ -1964 +1964 @@
             res = set_acl_list(filelist_subset_fname, acl_fname);
             if (res) {
-                log_msg(1, "Errors occurred while setting ACL");
+                mr_msg(1, "Errors occurred while setting ACL");
             } else {
-                log_msg(1, "I set ACL OK");
+                mr_msg(1, "I set ACL OK");
             }
             retval += res;
@@ -1972 +1972 @@
 
     } else {
-        log_msg(1, "NOT CALLING '%s'", command);
+        mr_msg(1, "NOT CALLING '%s'", command);
     }
 
@@ -2034 +2034 @@
             "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
-        log_msg(1, "Warning - cannot openout %s",
+        mr_msg(1, "Warning - cannot openout %s",
                 biggies_whose_EXATs_we_should_set);
     }
@@ -2043 +2043 @@
     mvaddstr_and_log_it(g_currentY, 0, tmp);
     if (length_of_file(BIGGIELIST) < 6) {
-        log_msg(1, "OK, no biggielist; not restoring biggiefiles");
+        mr_msg(1, "OK, no biggielist; not restoring biggiefiles");
         return (0);
     }
     noof_biggiefiles = count_lines_in_file(BIGGIELIST);
     if (noof_biggiefiles <= 0) {
-        log_msg(2,
+        mr_msg(2,
                 "OK, no biggiefiles in biggielist; not restoring biggiefiles");
         return (0);
@@ -2054 +2054 @@
     sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
             noof_biggiefiles);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
 
     open_progress_form("Reassembling large files",
@@ -2061 +2061 @@
                        "", total_slices);
     for (bigfileno = 0, finished = FALSE; !finished;) {
-        log_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
+        mr_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
         if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
-            log_msg(3,
+            mr_msg(3,
                     "...but its first slice isn't on this CD. Perhaps this was a selective restore?");
-            log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d",
+            mr_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d",
                     bigfileno + 1,
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number);
-            log_msg(3, "Slicename would have been %s",
+            mr_msg(3, "Slicename would have been %s",
                     slice_fname(bigfileno + 1, 0, ARCHIVES_PATH, ""));
             // I'm not positive 'just_changed_cds' is even necessary...
             if (just_changed_cds) {
                 just_changed_cds = FALSE;
-                log_msg(3,
+                mr_msg(3,
                         "I'll continue to scan this CD for bigfiles to be restored.");
             } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
@@ -2086 +2086 @@
                 just_changed_cds = TRUE;
             } else {
-                log_msg(2, "There was no bigfile #%ld. That's OK.",
+                mr_msg(2, "There was no bigfile #%ld. That's OK.",
                         bigfileno + 1);
-                log_msg(2, "I'm going to stop restoring bigfiles now.");
+                mr_msg(2, "I'm going to stop restoring bigfiles now.");
                 finished = TRUE;
             }
@@ -2180 +2180 @@
 
     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-    log_msg(2,
+    mr_msg(2,
             "Insisting on 1st CD, so that I can have a look at LAST-FILELIST-NUMBER");
     if (g_current_media_number != 1) {
-        log_msg(3, "OK, that's jacked up.");
+        mr_msg(3, "OK, that's jacked up.");
         g_current_media_number = 1;
     }
@@ -2244 +2244 @@
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number);
-//    log_msg(3, "progress_str = %s", progress_str);
+//    mr_msg(3, "progress_str = %s", progress_str);
             for (res = 999, attempts = 0; attempts < 3 && res != 0;
                  attempts++) {
@@ -2350 +2350 @@
             "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
-        log_msg(1, "Warning - cannot openout %s",
+        mr_msg(1, "Warning - cannot openout %s",
                 biggies_whose_EXATs_we_should_set);
     }
@@ -2366 +2366 @@
     sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
             noof_biggiefiles);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     open_progress_form("Reassembling large files",
                        "I am now reassembling all the large files.",
@@ -2398 +2398 @@
                                                filelist, ctrl_chr,
                                                pathname_of_last_biggie_restored);
-        log_msg(1, "I believe I have restored %s",
+        mr_msg(1, "I believe I have restored %s",
                 pathname_of_last_biggie_restored);
         if (fbw && pathname_of_last_biggie_restored[0]) {
@@ -2416 +2416 @@
                 noof_biggiefiles, current_bigfile_number);
     }
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
 
     if (fbw) {
@@ -2424 +2424 @@
             if (g_getfattr) {
                 if (length_of_file(xattr_fname) > 0) {
-                    log_msg(1, "set_fattr_List(%s,%s)",
+                    mr_msg(1, "set_fattr_List(%s,%s)",
                         biggies_whose_EXATs_we_should_set, xattr_fname);
                     set_fattr_list(biggies_whose_EXATs_we_should_set,
@@ -2432 +2432 @@
             if (g_getfacl) {
                 if (length_of_file(acl_fname) > 0) {
-                    log_msg(1, "set_acl_list(%s,%s)",
+                    mr_msg(1, "set_acl_list(%s,%s)",
                             biggies_whose_EXATs_we_should_set, acl_fname);
                     set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
@@ -2523 +2523 @@
                        progress_str, max_val);
 
-    log_msg(3, "hey");
+    mr_msg(3, "hey");
 
     res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
     if (res) {
-        log_msg(2, "Warning - error reading afioball from tape");
+        mr_msg(2, "Warning - error reading afioball from tape");
     }
     retval += res;
@@ -2533 +2533 @@
         wrong_marker(BLK_START_AFIOBALLS, ctrl_chr);
     }
-    log_msg(2, "ho");
+    mr_msg(2, "ho");
     res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
     while (ctrl_chr != BLK_STOP_AFIOBALLS) {
@@ -2592 +2592 @@
         }
     }                           // next
-    log_msg(1, "All done with afioballs");
+    mr_msg(1, "All done with afioballs");
     close_progress_form();
     if (retval) {
@@ -2636 +2636 @@
     malloc_string(newpath);
     malloc_string(tmp);
-    log_msg(2, "restore_everything() --- starting");
+    mr_msg(2, "restore_everything() --- starting");
     g_current_media_number = 1;
     getcwd(cwd, MAX_STR_LEN - 1);
     sprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
     run_program_and_log_output(tmp, FALSE);
-    log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
+    mr_msg(1, "Changing dir to %s", bkpinfo->restore_path);
     chdir(bkpinfo->restore_path);
     getcwd(newpath, MAX_STR_LEN - 1);
-    log_msg(1, "path is now %s", newpath);
-    log_msg(1, "restoring everything");
+    mr_msg(1, "path is now %s", newpath);
+    mr_msg(1, "restoring everything");
     if (!find_home_of_exe("petris") && !g_text_mode) {
         newtDrawRootText(0, g_noof_rows - 2,
@@ -2682 +2682 @@
     }
     if (length_of_file("/etc/raidtab") > 0) {
-        log_msg(2, "Copying local raidtab to restored filesystem");
+        mr_msg(2, "Copying local raidtab to restored filesystem");
         run_program_and_log_output("cp -f /etc/raidtab " MNT_RESTORING
                                    "/etc/raidtab", FALSE);
     }
     kill_petris();
-    log_msg(2, "restore_everything() --- leaving");
+    mr_msg(2, "restore_everything() --- leaving");
     mr_free(cwd);
     mr_free(newpath);
@@ -2732 +2732 @@
     sprintf(tmp, "restore_here = '%s'", restore_here);
 
-    log_msg(2, tmp);
-
-    log_msg(2, "restore_live_from_monitas_server() - starting");
+    mr_msg(2, tmp);
+
+    mr_msg(2, "restore_live_from_monitas_server() - starting");
     unlink("/tmp/mountlist.txt");
     unlink("/tmp/filelist.full");
@@ -2743 +2743 @@
         strcpy(bkpinfo->restore_path, restore_here);
     }
-    log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
+    mr_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
     sprintf(tmp, "FYI - data will be restored to %s",
             bkpinfo->restore_path);
-    log_msg(3, tmp);
-    log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
+    mr_msg(3, tmp);
+    mr_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
     sprintf(datadisks_fname, "/tmp/mondorestore.datadisks.%d",
             (int) (random() % 32768));
@@ -2798 +2798 @@
             restore_this_directory, g_biggielist_txt, g_biggielist_txt);
     if (system(command)) {
-        log_msg(1,
+        mr_msg(1,
                 "Error(s) occurred while processing biggielist and wildcard");
     }
@@ -2806 +2806 @@
     retval += restore_everything(bkpinfo, filelist);
     free_filelist(filelist);
-    log_msg(2, "--------End of restore_live_from_monitas_server--------");
+    mr_msg(2, "--------End of restore_live_from_monitas_server--------");
     return (retval);
 }
@@ -2828 +2828 @@
 void welcome_to_mondorestore()
 {
-    log_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
-    log_msg(0,
+    mr_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
+    mr_msg(0,
             "DON'T PANIC! Mondorestore logs almost everything, so please ");
-    log_msg(0,
+    mr_msg(0,
             "don't break out in a cold sweat just because you see a few  ");
-    log_msg(0,
+    mr_msg(0,
             "error messages in the log. Read them; analyze them; see if  ");
-    log_msg(0,
+    mr_msg(0,
             "they are significant; above all, verify your backups! Please");
-    log_msg(0,
+    mr_msg(0,
             "attach a compressed copy of this log to any e-mail you send ");
-    log_msg(0,
+    mr_msg(0,
             "to the Mondo mailing list when you are seeking technical    ");
-    log_msg(0,
+    mr_msg(0,
             "support. Without it, we can't help you.            - DevTeam");
-    log_msg(0,
+    mr_msg(0,
             "------------------------------------------------------------");
-    log_msg(0,
+    mr_msg(0,
             "BTW, despite (or perhaps because of) the wealth of messages,");
-    log_msg(0,
+    mr_msg(0,
             "some users are inclined to stop reading this log.  If Mondo ");
-    log_msg(0,
+    mr_msg(0,
             "stopped for some reason, chances are it's detailed here.    ");
-    log_msg(0,
+    mr_msg(0,
             "More than likely there's a message at the very end of this  ");
-    log_msg(0,
+    mr_msg(0,
             "log that will tell you what is wrong.  Please read it!      ");
-    log_msg(0,
+    mr_msg(0,
             "------------------------------------------------------------");
 }
@@ -2906 +2906 @@
     {
         g_text_mode = TRUE;
-        log_msg(1, "TEXTONLY MODE");
+        mr_msg(1, "TEXTONLY MODE");
     } else {
         g_text_mode = FALSE;
@@ -2941 +2941 @@
     g_kernel_version = get_kernel_version();
 
-    log_msg(1, "FYI - g_mountlist_fname = %s", g_mountlist_fname);
+    mr_msg(1, "FYI - g_mountlist_fname = %s", g_mountlist_fname);
     if (strlen(g_mountlist_fname) < 3) {
         fatal_error
@@ -2951 +2951 @@
     sprintf(tmp, "%s.orig", g_mountlist_fname);
     if (!does_file_exist(g_mountlist_fname)) {
-        log_msg(2,
+        mr_msg(2,
                 "%ld: Warning - g_mountlist_fname (%s) does not exist yet",
                 __LINE__, g_mountlist_fname);
@@ -2978 +2978 @@
     welcome_to_mondorestore();
     if (bkpinfo->disaster_recovery) {
-        log_msg(1, "I am in disaster recovery mode");
+        mr_msg(1, "I am in disaster recovery mode");
     } else {
-        log_msg(1, "I am in normal, live mode");
+        mr_msg(1, "I am in normal, live mode");
     }
 
@@ -3061 +3061 @@
 
     if (argc == 5 && strcmp(argv[1], "--copy") == 0) {
-        log_msg(1, "SCORE");
+        mr_msg(1, "SCORE");
         g_loglevel = 10;
         if (strstr(argv[2], "save")) {
-            log_msg(1, "Saving from %s to %s", argv[3], argv[4]);
+            mr_msg(1, "Saving from %s to %s", argv[3], argv[4]);
             fin = fopen(argv[3], "r");
             fout = fopen(argv[4], "w");
@@ -3116 +3116 @@
 //    return(1);
         }
-        log_msg(1, "I am in normal, live mode.");
-        log_msg(2, "FYI, MOUNTLIST_FNAME = %s", g_mountlist_fname);
+        mr_msg(1, "I am in normal, live mode.");
+        mr_msg(2, "FYI, MOUNTLIST_FNAME = %s", g_mountlist_fname);
         mount_boot_if_necessary();  /* for Gentoo users */
-        log_msg(2, "Still here.");
+        mr_msg(2, "Still here.");
         if (argc > 1 && strcmp(argv[argc - 1], "--live-from-cd") == 0) {
             g_restoring_live_from_cd = TRUE;
@@ -3129 +3129 @@
                                                  argv[3], argv[4]);
         } else {
-            log_msg(2, "Calling restore_to_live_filesystem()");
+            mr_msg(2, "Calling restore_to_live_filesystem()");
             retval = restore_to_live_filesystem(bkpinfo);
         }
-        log_msg(2, "Still here. Yay.");
+        mr_msg(2, "Still here. Yay.");
         if (strlen(bkpinfo->tmpdir) > 0) {
             sprintf(tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
@@ -3141 +3141 @@
     } else {
         /* Disaster recovery mode (must be) */
-        log_msg(1, "I must be in disaster recovery mode.");
-        log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
+        mr_msg(1, "I must be in disaster recovery mode.");
+        mr_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
         if (argc == 3 && strcmp(argv[1], "--monitas-memorex") == 0) {
             log_to_screen("Uh, that hasn't been implemented yet.");
@@ -3161 +3161 @@
             if (bkpinfo->backup_media_type == nfs
                 && !is_this_device_mounted(bkpinfo->nfs_mount)) {
-                log_msg(1, "Mounting nfs dir");
+                mr_msg(1, "Mounting nfs dir");
                 sprintf(bkpinfo->isodir, "/tmp/isodir");
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
@@ -3177 +3177 @@
 
 
-        log_msg(1, "Send in the clowns.");
+        mr_msg(1, "Send in the clowns.");
 
         if (argc == 2 && strcmp(argv[1], "--partition-only") == 0) {
-            log_msg(0, "Partitioning only.");
+            mr_msg(0, "Partitioning only.");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
             strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
@@ -3189 +3189 @@
 
         if (argc == 2 && strcmp(argv[1], "--format-only") == 0) {
-            log_msg(0, "Formatting only.");
+            mr_msg(0, "Formatting only.");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
             strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
@@ -3198 +3198 @@
 
         if (argc == 2 && strcmp(argv[1], "--stop-lvm-and-raid") == 0) {
-            log_msg(0, "Stopping LVM and RAID");
+            mr_msg(0, "Stopping LVM and RAID");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
             strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
@@ -3281 +3281 @@
 // g_I_have_just_nuked is set true by nuke_mode() just before it returns
     if (!system("which post-nuke > /dev/null 2> /dev/null")) {
-      log_msg(1, "post-nuke found; find out whether we should run it...");
+      mr_msg(1, "post-nuke found; find out whether we should run it...");
       if (g_I_have_just_nuked || does_file_exist("/POST-NUKE-ANYWAY")) {
         run_postnuke = TRUE;
-        log_msg(1, "Yes, will run post-nuke because in nuke mode or file /POST-NUKE-ANYWAY exists.");
+        mr_msg(1, "Yes, will run post-nuke because in nuke mode or file /POST-NUKE-ANYWAY exists.");
       } else if (ask_me_yes_or_no("post-nuke script found. Do you want to run it?")) {
         run_postnuke = TRUE;
-        log_msg(1, "Yes, will run post-nuke because user interactively asked for it.");
+        mr_msg(1, "Yes, will run post-nuke because user interactively asked for it.");
       } else {
         run_postnuke = FALSE;
-        log_msg(1, "No, will not run post-nuke.");
+        mr_msg(1, "No, will not run post-nuke.");
       }
     } else {
-      log_msg(1, "No post-nuke found.");
+      mr_msg(1, "No post-nuke found.");
     }
     if (run_postnuke) {
@@ -3301 +3301 @@
           ("Unable to re-mount partitions for post-nuke stuff");
       } else {
-        log_msg(1, "Re-mounted partitions for post-nuke stuff");
+        mr_msg(1, "Re-mounted partitions for post-nuke stuff");
         sprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path,
             retval);
-        log_msg(2, "Calling '%s'", tmp);
+        mr_msg(2, "Calling '%s'", tmp);
         if ((res = run_program_and_log_output(tmp, 0))) {
           log_OS_error(tmp);
         }
-        log_msg(1, "post-nuke returned w/ res=%d", res);
+        mr_msg(1, "post-nuke returned w/ res=%d", res);
       }
       unmount_all_devices(mountlist);