Changeset 1086 in MondoRescue for trunk/mondo/src/mondorestore

Timestamp:

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

Author:

Bruno Cornec

Message:

log_msg => mr_msg in trunk

Location:

trunk/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (47 diffs)
• mondo-restore.c (modified) (102 diffs)
• mondo-rstr-compare.c (modified) (13 diffs)
• mondo-rstr-newt.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (72 diffs)

trunk/mondo/src/mondorestore/mondo-prep.c

@@ -68 +68 @@
                      drivelist->el[lino].device, MONDO_WAS_HERE);
             if (!run_program_and_log_output(command, 1)) {
-                log_msg(1, "Found MONDO_WAS_HERE marker on drive#%d (%s)",
+                mr_msg(1, "Found MONDO_WAS_HERE marker on drive#%d (%s)",
                         lino, drivelist->el[lino].device);
                 mr_free(command);
@@ -90 +90 @@
                 fout = fopen(drivelist->el[lino].device, "w+");
                 if (!fout) {
-                    log_msg(1, "Unable to open+wipe %s",
+                    mr_msg(1, "Unable to open+wipe %s",
                             drivelist->el[lino].device);
                 } else {
                     if (1 != fwrite(buf, strlen(buf)+1, 1, fout)) {
-                        log_msg(1, "Failed to wipe %s",
+                        mr_msg(1, "Failed to wipe %s",
                                 drivelist->el[lino].device);
                     } else {
-                        log_msg(1, "Successfully wiped %s",
+                        mr_msg(1, "Successfully wiped %s",
                                 drivelist->el[lino].device);
                     }
@@ -114 +114 @@
     }
 // Still here? Cool!
-    log_msg(1, "Cool. I didn't have to wipe anything.");
+    mr_msg(1, "Cool. I didn't have to wipe anything.");
 }
 
@@ -126 +126 @@
         return (-1);
     }
-    log_msg(5, "Writing string '%s', one char at a time", str);
+    mr_msg(5, "Writing string '%s', one char at a time", str);
     j = strlen(str);
     for (i = 0; i < j; i++) {
-        log_msg(6, "Writing %d ('%c')", str[i], str[i]);
+        mr_msg(6, "Writing %d ('%c')", str[i], str[i]);
         if ((fq = fopen(FDISK_LOG, "a+"))) {
             fputc(str[i], fq);
@@ -141 +141 @@
         }
     }
-    log_msg(5, "Returning");
+    mr_msg(5, "Returning");
 
     return (i);
@@ -198 +198 @@
 
     iamhere("STARTING");
-    log_msg(1, "OK, opened i-want-my-lvm. Shutting down LVM volumes...");
+    mr_msg(1, "OK, opened i-want-my-lvm. Shutting down LVM volumes...");
     tmp = find_home_of_exe("lvm");
     if (tmp)    // found it :) cool
@@ -239 +239 @@
     if (just_erase_existing_volumes) {
         paranoid_fclose(fin);
-        log_msg(1, "Closed i-want-my-lvm. Finished erasing LVMs.");
+        mr_msg(1, "Closed i-want-my-lvm. Finished erasing LVMs.");
         sync();
         sync();
@@ -245 +245 @@
         sleep(1);
         iamhere("ENDING");
-        log_msg(1, "Not many errors. Returning 0.");
+        mr_msg(1, "Not many errors. Returning 0.");
         return (0);
     }
 
-    log_msg(1, "OK, rewound i-want-my-lvm. Doing funky stuff...");
+    mr_msg(1, "OK, rewound i-want-my-lvm. Doing funky stuff...");
     rewind(fin);
     for (mr_getline(&incoming, &n1, fin); !feof(fin); mr_getline(&incoming, &n1, fin)) {
@@ -286 +286 @@
             for (q = tmp1; *q > 32; q++);
             *q = '\0';
-            log_msg(1, "Deleting old entries at /dev/%s", tmp1);
+            mr_msg(1, "Deleting old entries at /dev/%s", tmp1);
             mr_asprintf(&tmp, "rm -Rf /dev/%s", tmp1);
             mr_free(tmp1);
@@ -295 +295 @@
             run_program_and_log_output(vgscan_sz, 1);
             run_program_and_log_output(pvscan_sz, 1);
-            log_msg(3,
+            mr_msg(3,
                     "After working around potentially broken i-want-my-lvm, incoming[] is now '%s'",
                     incoming);
@@ -311 +311 @@
             res = run_program_and_log_output(command, 5);
         }
-        log_msg(0, "%s --> %d", command, res);
+        mr_msg(0, "%s --> %d", command, res);
         if (res > 0) {
             res = 1;
@@ -333 +333 @@
             for (p = tmp; *p != '\0' && !isdigit(*p); p++);
             extents = atol(p);
-            log_msg(5, "p='%s' --> extents=%ld", p, extents);
+            mr_msg(5, "p='%s' --> extents=%ld", p, extents);
             mr_free(tmp);
 
             p = strstr(command, "-L");
             if (!p) {
-                log_msg(0, "Fiddlesticks. '%s' returned %d", command, res);
+                mr_msg(0, "Fiddlesticks. '%s' returned %d", command, res);
             } else {
                 if (lvmversion == 2) {
@@ -363 +363 @@
                     *(p + i) = ' ';
                 }
-                log_msg(5, "Retrying with '%s'", command);
+                mr_msg(5, "Retrying with '%s'", command);
                 res = run_program_and_log_output(command, 5);
                 if (res > 0) {
@@ -371 +371 @@
                     fprintf(g_fprep, "%s\n", command);
                 }
-                log_msg(0, "%s --> %d", command, res);
+                mr_msg(0, "%s --> %d", command, res);
                 if (!res) {
-                    log_msg(5, "YAY! This time, it succeeded.");
+                    mr_msg(5, "YAY! This time, it succeeded.");
                 }
             }
         }
         if (strstr(command, "vgcreate")) {
-            log_msg(0, "In case you're interested...");
+            mr_msg(0, "In case you're interested...");
             run_program_and_log_output(vgscan_sz, 1);
             run_program_and_log_output(pvscan_sz, 1);
@@ -396 +396 @@
     mr_free(incoming);
 
-    log_msg(1, "Closed i-want-my-lvm. Finished doing funky stuff.");
+    mr_msg(1, "Closed i-want-my-lvm. Finished doing funky stuff.");
     sync();
     sync();
@@ -403 +403 @@
     iamhere("ENDING");
     if (retval > 2) {
-        log_msg(1, "%d errors. I'm reporting this.", retval);
+        mr_msg(1, "%d errors. I'm reporting this.", retval);
         return (retval);
     } else {
-        log_msg(1, "Not many errors. Returning 0.");
+        mr_msg(1, "Not many errors. Returning 0.");
         return (0);
     }
@@ -550 +550 @@
   // leave straight away if raidlist is initial or has no entries
   if (!raidlist || raidlist->entries == 0) {
-    log_msg(1, "No RAID arrays found.");
+    mr_msg(1, "No RAID arrays found.");
     return 1;
   } else {
-    log_msg(1, "%d RAID arrays found.", raidlist->entries);
+    mr_msg(1, "%d RAID arrays found.", raidlist->entries);
   }
   // find raidlist entry for requested device
@@ -561 +561 @@
   // check whether RAID device was found in raidlist
   if (i == raidlist->entries) {
-    log_msg(1, "RAID device %s not found in list.", device);
+    mr_msg(1, "RAID device %s not found in list.", device);
     return 1;
   }
@@ -805 +805 @@
         */
 
-        log_msg(1, "Making %s", device);
+        mr_msg(1, "Making %s", device);
         // use mkraid if it exists, otherwise use mdadm
         if (run_program_and_log_output("which mkraid", FALSE)) {
             res = create_raid_device_via_mdadm(raidlist, device);
-            log_msg(1, "Creating RAID device %s via mdadm returned %d",
+            mr_msg(1, "Creating RAID device %s via mdadm returned %d",
                     device, res);
         } else {
             mr_asprintf(&program, "mkraid --really-force %s", device);
             res = run_program_and_log_output(program, 1);
-            log_msg(1, "%s returned %d", program, res);
+            mr_msg(1, "%s returned %d", program, res);
             sync();
             sleep(3);
@@ -834 +834 @@
 
     if (!strcmp(format, "lvm")) {
-        log_msg(1, "Don't format %s - it's part of an lvm volume", device);
+        mr_msg(1, "Don't format %s - it's part of an lvm volume", device);
         return (0);
     }
@@ -937 +937 @@
 // start soft-raids now (because LVM might depend on them)
 // ...and for simplicity's sake, let's format them at the same time :)
-    log_msg(1, "Stopping all RAID devices");
+    mr_msg(1, "Stopping all RAID devices");
     stop_all_raid_devices(mountlist);
     sync();
@@ -943 +943 @@
     sync();
     sleep(2);
-    log_msg(1, "Prepare soft-RAIDs");   // prep and format too
+    mr_msg(1, "Prepare soft-RAIDs");    // prep and format too
     for (lino = 0; lino < mountlist->entries; lino++) {
         me = &mountlist->el[lino];  // the current mountlist entry
-        log_msg(2, "Examining %s", me->device);
+        mr_msg(2, "Examining %s", me->device);
         if (!strncmp(me->device, "/dev/md", 7)) {
             if (interactively) {
@@ -974 +974 @@
 //  sleep(5);
 // do LVMs now
-    log_msg(1, "Creating LVMs");
+    mr_msg(1, "Creating LVMs");
     if (does_file_exist("/tmp/i-want-my-lvm")) {
         wait_until_software_raids_are_prepped("/proc/mdstat", 100);
@@ -997 +997 @@
 // do regulars at last
     sleep(2);                   // woo!
-    log_msg(1, "Formatting regulars");
+    mr_msg(1, "Formatting regulars");
     for (lino = 0; lino < mountlist->entries; lino++) {
         me = &mountlist->el[lino];  // the current mountlist entry
@@ -1677 +1677 @@
         sync();
         paranoid_pclose(pout_to_fdisk);
-        log_msg(0,
+        mr_msg(0,
                 "------------------- fdisk.log looks like this ------------------");
         mr_asprintf(&tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
@@ -1683 +1683 @@
         mr_free(tmp);
 
-        log_msg(0,
+        mr_msg(0,
                 "------------------- end of fdisk.log... word! ------------------");
         mr_asprintf(&tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
@@ -1803 +1803 @@
     if (partsize > 0) {
         if (!strcmp(format, "7")) {
-            log_msg(1, "Adding 512K, just in case");
+            mr_msg(1, "Adding 512K, just in case");
             partsize += 512;
         }
@@ -1829 +1829 @@
 
     if (pout_to_fdisk) {
-        log_msg(1, "Doing the new all-in-one fdisk thing");
-        log_msg(1, "output = '%s'", output);
+        mr_msg(1, "Doing the new all-in-one fdisk thing");
+        mr_msg(1, "output = '%s'", output);
         fput_string_one_char_at_a_time(pout_to_fdisk, output);
         fput_string_one_char_at_a_time(pout_to_fdisk, "\n\np\n");
         tmp = last_line_of_file(FDISK_LOG);
         if (strstr(tmp, " (m ")) {
-            log_msg(1, "Successfully created %s%d", drive, partno);
+            mr_msg(1, "Successfully created %s%d", drive, partno);
         } else {
-            log_msg(1, "last line = %s", tmp);
-            log_msg(1, "Failed to create %s%d; sending 'Enter'...", drive,
+            mr_msg(1, "last line = %s", tmp);
+            mr_msg(1, "Failed to create %s%d; sending 'Enter'...", drive,
                     partno);
         }
@@ -1844 +1844 @@
 
         if (!retval) {
-            log_msg(1, "Trying to set %s%d's partition type now", drive,
+            mr_msg(1, "Trying to set %s%d's partition type now", drive,
                     partno);
             retval =
@@ -1850 +1850 @@
                                    partsize);
             if (retval) {
-                log_msg(1, "Failed. Trying again...");
+                mr_msg(1, "Failed. Trying again...");
                 retval =
                     set_partition_type(pout_to_fdisk, drive, partno,
@@ -1857 +1857 @@
         }
         if (retval) {
-            log_msg(1, "...but failed to set type");
+            mr_msg(1, "...but failed to set type");
         }
     } else {
@@ -1959 +1959 @@
         /*      mountlist=&new_mtlist; */
         /*      extrapolate_mountlist_to_include_raid_partitions(mountlist,orig_mtlist); */
-        log_msg(0,
+        mr_msg(0,
                 "Mountlist, including the partitions incorporated in RAID devices:-");
         for (i = 0; i < mountlist->entries; i++) {
             log_it(mountlist->el[i].device);
         }
-        log_msg(0, "End of mountlist.");
-    }
-    log_msg(0, "Stopping all LVMs, just in case");
+        mr_msg(0, "End of mountlist.");
+    }
+    mr_msg(0, "Stopping all LVMs, just in case");
     if (!g_text_mode) {
         newtSuspend();
@@ -1974 +1974 @@
         newtResume();
     }
-    log_msg(0, "Stopping all software RAID devices, just in case");
+    mr_msg(0, "Stopping all software RAID devices, just in case");
     stop_all_raid_devices(mountlist);
-    log_msg(0, "Done.");
+    mr_msg(0, "Done.");
 
 /*  
@@ -2096 +2096 @@
     mr_free(partition);
 
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
     mr_free(tmp);
     if (partcode[0] != '\0' && strcmp(partcode, "83")) {    /* no need to set type if 83: 83 is default */
@@ -2106 +2106 @@
             if (partno > 1
                 || strstr(tmp1, " (1-4)")) {
-                log_msg(5, "Specifying partno (%d) - yay", partno);
+                mr_msg(5, "Specifying partno (%d) - yay", partno);
                 mr_asprintf(&tmp, "%d\n", partno);
                 fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
@@ -2112 +2112 @@
                 mr_free(tmp1);
                 tmp1 = last_line_of_file(FDISK_LOG);
-                log_msg(5, "A - last line = '%s'", tmp1);
+                mr_msg(5, "A - last line = '%s'", tmp1);
             }
             mr_free(tmp1);
@@ -2120 +2120 @@
             mr_free(tmp);
             tmp1 = last_line_of_file(FDISK_LOG);
-            log_msg(5, "B - last line = '%s'",tmp1);
+            mr_msg(5, "B - last line = '%s'",tmp1);
             mr_free(tmp1);
 
             fput_string_one_char_at_a_time(pout_to_fdisk, "\n");
             tmp1 = last_line_of_file(FDISK_LOG);
-            log_msg(5, "C - last line = '%s'",tmp1);
+            mr_msg(5, "C - last line = '%s'",tmp1);
             mr_free(tmp1);
 
             tmp = last_line_of_file(FDISK_LOG);
             if (!strstr(tmp, " (m ")) {
-                log_msg(1, "last line = '%s'; part type set failed", tmp);
+                mr_msg(1, "last line = '%s'; part type set failed", tmp);
                 res++;
                 fput_string_one_char_at_a_time(pout_to_fdisk, "\n");
@@ -2140 +2140 @@
             mr_asprintf(&command, "parted2fdisk %s >> %s 2>> %s", drive,
                     MONDO_LOGFILE, MONDO_LOGFILE);
-            log_msg(5, "output = '%s'", output);
-            log_msg(5, "partno=%d; partcode=%s", partno, partcode);
-            log_msg(5, "command = '%s'", command);
+            mr_msg(5, "output = '%s'", output);
+            mr_msg(5, "partno=%d; partcode=%s", partno, partcode);
+            mr_msg(5, "command = '%s'", command);
             fout = popen(command, "w");
             if (!fout) {
@@ -2189 +2189 @@
     mr_asprintf(&program, "raidstart %s", raid_device);
 #endif
-    log_msg(1, "program = %s", program);
+    mr_msg(1, "program = %s", program);
     res = run_program_and_log_output(program, 1);
     if (g_fprep) {
@@ -2197 +2197 @@
 
     if (res) {
-        log_msg(1, "Warning - failed to start RAID device %s",
+        mr_msg(1, "Warning - failed to start RAID device %s",
                 raid_device);
     }
@@ -2238 +2238 @@
     }
 #endif
-    log_msg(1, "program = %s", program);
+    mr_msg(1, "program = %s", program);
     res = run_program_and_log_output(program, 1);
     if (g_fprep) {
@@ -2246 +2246 @@
 
     if (res) {
-        log_msg(1, "Warning - failed to stop RAID device %s", raid_device);
+        mr_msg(1, "Warning - failed to stop RAID device %s", raid_device);
     }
     retval += res;
@@ -2263 +2263 @@
             (mountlist->el[i].device, RAID_DEVICE_STUB,
              strlen(RAID_DEVICE_STUB))) {
-            log_msg(1, "Starting %s", mountlist->el[i].device);
+            mr_msg(1, "Starting %s", mountlist->el[i].device);
             res = start_raid_device(mountlist->el[i].device);
             retval += res;
@@ -2269 +2269 @@
     }
     if (retval) {
-        log_msg(1, "Started all s/w raid devices OK");
+        mr_msg(1, "Started all s/w raid devices OK");
     } else {
-        log_msg(1, "Failed to start some/all s/w raid devices");
+        mr_msg(1, "Failed to start some/all s/w raid devices");
     }
     return (retval);
@@ -2346 +2346 @@
     paranoid_fclose(fin);
     if (retval) {
-        log_msg(1, "Warning - unable to stop some RAID devices");
+        mr_msg(1, "Warning - unable to stop some RAID devices");
     }
     sync();
@@ -2548 +2548 @@
 
         if (!strcmp(drivemntlist->el[partno]->mountpoint, "image")) {
-            log_msg(1, "Skipping %s (%s) because it's an image",
+            mr_msg(1, "Skipping %s (%s) because it's an image",
                     drivemntlist->el[partno]->device,
                     drivemntlist->el[partno]->mountpoint);
@@ -2626 +2626 @@
     assert(drivemntlist != NULL);
 
-    log_msg(1, "Creating list of partitions for drive %s", drive_name);
+    mr_msg(1, "Creating list of partitions for drive %s", drive_name);
 
     mr_asprintf(&tmp_drive_name,drive_name);

trunk/mondo/src/mondorestore/mondo-restore.c

@@ -155 +155 @@
     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);
@@ -162 +162 @@
     if (!bkpinfo->disaster_recovery) {
         mr_allocstr(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)) {
@@ -207 +207 @@
     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);
 
@@ -286 +286 @@
     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);
     }
@@ -351 +351 @@
     /* try to partition and format */
 
-    log_msg(2, "interactive_mode --- starting (great, assertions OK)");
+    mr_msg(2, "interactive_mode --- starting (great, assertions OK)");
 
     assert(bkpinfo != NULL);
@@ -357 +357 @@
     assert(raidlist != NULL);
 
-    log_msg(2, "interactive_mode --- assertions OK");
+    mr_msg(2, "interactive_mode --- assertions OK");
 
     if (g_text_mode) {
@@ -378 +378 @@
 #endif
     if (strstr(tmp,"noresize")) {
-        log_msg(1, "Not resizing mountlist.");
+        mr_msg(1, "Not resizing mountlist.");
     } else {
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
@@ -400 +400 @@
             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);
@@ -496 +496 @@
                           ("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 if ((restore_all =
@@ -520 +520 @@
                         mr_allocstr(bkpinfo->restore_path, ""); // so we restore to [blank]/file/name :)
                     }
-                    log_msg(1, "Restoring subset");
+                    mr_msg(1, "Restoring subset");
                     retval += restore_everything(bkpinfo, filelist);
                     free_filelist(filelist);
@@ -626 +626 @@
     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 {
@@ -726 +726 @@
     assert(raidlist != NULL);
 
-    log_msg(2, "nuke_mode --- starting");
+    mr_msg(2, "nuke_mode --- starting");
 
     get_cfg_file_from_archive_or_bust(bkpinfo);
@@ -736 +736 @@
 #endif
     if (strstr(tmp,"noresize")) {
-        log_msg(2, "Not resizing mountlist.");
+        mr_msg(2, "Not resizing mountlist.");
     } else {
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
@@ -776 +776 @@
 #endif
             if (strstr(tmp,"nopart")) {
-                log_msg(2,
+                mr_msg(2,
                         "Not partitioning drives due to 'nopart' option.");
                 res = 0;
@@ -829 +829 @@
     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;
@@ -907 +907 @@
     struct s_node *filelist = NULL;
 
-    log_msg(1, "restore_to_live_filesystem() - starting");
+    mr_msg(1, "restore_to_live_filesystem() - starting");
     assert(bkpinfo != NULL);
 
@@ -922 +922 @@
     interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
     if (bkpinfo->media_device == NULL) {
-        log_msg(2, "Warning - failed to find media dev");
+        mr_msg(2, "Warning - failed to find media dev");
     } else {
-        log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
-    }
-
-
-    log_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
+        mr_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
+    }
+
+
+    mr_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
 
     open_evalcall_form(_("Thinking..."));
@@ -953 +953 @@
     }
     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.");
     }
@@ -1038 +1038 @@
     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);
     }
@@ -1048 +1048 @@
         mr_asprintf(&tmp, "Warning - bigfile %ld does not have a checksum",
                 bigfileno + 1);
-        log_msg(3, tmp);
+        mr_msg(3, tmp);
         mr_free(tmp);
         /* BERLIOS : Useless ???
@@ -1068 +1068 @@
         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);
             return (pathname_of_last_file_restored);
         } 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);
             return (pathname_of_last_file_restored);
@@ -1079 +1079 @@
     /* 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;
         }
@@ -1094 +1094 @@
         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);
@@ -1106 +1106 @@
             fatal_error("Fork failure");
         case 0:
-            log_msg(3,
+            mr_msg(3,
                     "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)",
                     biggiestruct.filename, ntfsprog_fifo);
@@ -1112 +1112 @@
                 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));
@@ -1133 +1133 @@
     mr_asprintf(&tmp, "Reassembling big file %ld (%s)", bigfileno + 1,
             outfile_fname);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     mr_free(tmp);
 
@@ -1144 +1144 @@
     mr_asprintf(&pathname_of_last_file_restored, biggiestruct.filename);
 
-    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 (pathname_of_last_file_restored);
     }
-    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;) {
@@ -1160 +1160 @@
             !does_file_exist(tmp1) &&
             !does_file_exist(tmp2)) {
-            log_msg(3,
+            mr_msg(3,
                     "Cannot find a data slice or terminator slice on CD %d",
                     g_current_media_number);
@@ -1168 +1168 @@
                     bkpinfo->backup_media_string,
                     g_current_media_number, sliceno);
-            log_msg(2, tmp3);
+            mr_msg(2, tmp3);
             mr_free(tmp3);
 
@@ -1181 +1181 @@
         } else {
             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);
@@ -1207 +1207 @@
                     bkpinfo->backup_media_string,
                     g_current_media_number, bigfileno + 1, sliceno);
-            log_msg(2, tmp3);
+            mr_msg(2, tmp3);
             if (!g_text_mode) {
                 newtDrawRootText(0, g_noof_rows - 2, tmp3);
@@ -1243 +1243 @@
 
     if (use_ntfsprog_hack) {
-        log_msg(3, "Waiting for ntfsclone to finish");
+        mr_msg(3, "Waiting for ntfsclone to finish");
         mr_asprintf(&tmp,
                 " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
@@ -1321 +1321 @@
     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);
     }
 
@@ -1338 +1338 @@
         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);
@@ -1344 +1344 @@
         } 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 = NULL;
@@ -1352 +1352 @@
     if (use_ntfsprog) {
         if (strncmp(orig_bf_fname, "/dev/", 5)) {
-            log_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, "I was in error when I set use_ntfsprog to TRUE.");
+            mr_msg(1, "%s isn't even in /dev", orig_bf_fname);
             use_ntfsprog = FALSE;
         }
@@ -1362 +1362 @@
         mr_asprintf(&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);
@@ -1376 +1376 @@
             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));
@@ -1406 +1406 @@
         mr_asprintf(&tmp1, "Reassembling big file %ld (%s)",
                 biggiefile_number + 1, orig_bf_fname);
-        log_msg(2, tmp1);
+        mr_msg(2, tmp1);
         mr_free(tmp1);
     }
@@ -1422 +1422 @@
     }
     mr_asprintf(&tmp1, "Pipe command = '%s'", command);
-    log_msg(3, tmp1);
+    mr_msg(3, tmp1);
     mr_free(tmp1);
 
@@ -1439 +1439 @@
         mr_asprintf(&tmp1, "Working on file #%ld, slice #%ld    ",
                 biggiefile_number + 1, current_slice_number);
-        log_msg(2, tmp1);
+        mr_msg(2, tmp1);
 
         if (!g_text_mode) {
@@ -1460 +1460 @@
                     ((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);
@@ -1481 +1481 @@
     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");
         mr_asprintf(&tmp,
                 " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
@@ -1492 +1492 @@
         }   
         mr_free(tmp);
-        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);
@@ -1550 +1550 @@
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
 
-    log_msg(5, "Entering");
+    mr_msg(5, "Entering");
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
     mr_asprintf(&command, "mkdir -p %s/tmp", MNT_RESTORING);
@@ -1559 +1559 @@
             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;
-        log_msg(5, "Leaving");
+        mr_msg(5, "Leaving");
         return (retval);
     }
     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));
         mr_asprintf(&tmp, "Unable to restore fileset #%ld (CD I/O error)",
@@ -1578 +1578 @@
         mr_free(tmp);
         retval = 1;
-        log_msg(5, "Leaving");
+        mr_msg(5, "Leaving");
         return (retval);
     }
@@ -1591 +1591 @@
             <= 0) {
             mr_asprintf(&tmp, "Skipping fileset %ld", current_tarball_number);
-            log_msg(1, tmp);
+            mr_msg(1, tmp);
             mr_free(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);
         }
@@ -1678 +1678 @@
 
 #undef BUFSIZE
-        log_msg(1, "command = '%s'", command);
+        mr_msg(1, "command = '%s'", command);
         unlink(temp_log);
         res = system(command);
@@ -1685 +1685 @@
             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);
             }
@@ -1696 +1696 @@
 
         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);
@@ -1703 +1703 @@
                         ("Errors occurred while setting extended attributes");
                 } else {
-                    log_msg(1, "I set xattr OK");
+                    mr_msg(1, "I set xattr OK");
                 }
                 retval += res;
@@ -1709 +1709 @@
         }
         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);
@@ -1716 +1716 @@
                         ("Errors occurred while setting access control lists");
                 } else {
-                    log_msg(1, "I set ACL OK");
+                    mr_msg(1, "I set ACL OK");
                 }
                 retval += res;
@@ -1725 +1725 @@
             system(command);
             mr_free(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);
         }
         unlink(xattr_fname);
@@ -1745 +1745 @@
     mr_free(acl_fname);
     mr_free(temp_log);
-    log_msg(5, "Leaving");
+    mr_msg(5, "Leaving");
     return (retval);
 }
@@ -1800 +1800 @@
             bkpinfo->backup_media_string,
             g_current_media_number);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     mr_free(tmp);
     run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
@@ -1820 +1820 @@
     }
     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) {
@@ -1843 +1843 @@
                     executable, afio_fname, 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");
         }
         mr_free(command);
@@ -1854 +1854 @@
             <= 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);
             }
             mr_asprintf(&tmp, "Skipping fileset %ld", current_tarball_number);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
             mr_free(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);
@@ -1892 +1892 @@
     // 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);
 
@@ -1899 +1899 @@
             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;
@@ -1910 +1910 @@
             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;
@@ -1918 +1918 @@
 
     } else {
-        log_msg(1, "NOT CALLING '%s'", command);
+        mr_msg(1, "NOT CALLING '%s'", command);
     }
     mr_free(command);
@@ -1970 +1970 @@
             "%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);
     }
@@ -1983 +1983 @@
 
     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);
@@ -1994 +1994 @@
     mr_asprintf(&tmp, "OK, there are %ld biggiefiles in the archives",
             noof_biggiefiles);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     mr_free(tmp);
 
@@ -2002 +2002 @@
                        "", 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);
         tmp = slice_fname(bigfileno, 0, ARCHIVES_PATH, "");
         if (!does_file_exist(tmp)) {
-            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,
                     bkpinfo->backup_media_string,
                     g_current_media_number);
             tmp1 = slice_fname(bigfileno + 1, 0, ARCHIVES_PATH, "");
-            log_msg(3, "Slicename would have been %s", tmp1);
+            mr_msg(3, "Slicename would have been %s", tmp1);
             mr_free(tmp1);
 
@@ -2018 +2018 @@
             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")) {
@@ -2031 +2031 @@
                 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;
             }
@@ -2122 +2122 @@
 
     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;
     }
@@ -2199 +2199 @@
                     bkpinfo->backup_media_string,
                     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++) {
@@ -2299 +2299 @@
             "%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);
     }
@@ -2315 +2315 @@
     mr_asprintf(&tmp, "OK, there are %ld biggiefiles in the archives",
             noof_biggiefiles);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     mr_free(tmp);
 
@@ -2350 +2350 @@
                                                current_bigfile_number,
                                                filelist, ctrl_chr);
-        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]) {
@@ -2370 +2370 @@
                 noof_biggiefiles, current_bigfile_number);
     }
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
     mr_free(tmp);
 
@@ -2379 +2379 @@
             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,
@@ -2387 +2387 @@
             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);
@@ -2469 +2469 @@
                        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;
@@ -2479 +2479 @@
         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) {
@@ -2548 +2548 @@
     mr_free(tmp_fname);
 
-    log_msg(1, "All done with afioballs");
+    mr_msg(1, "All done with afioballs");
     close_progress_form();
     if (retval) {
@@ -2586 +2586 @@
     malloc_string(cwd);
     malloc_string(newpath);
-    log_msg(2, "restore_everything() --- starting");
+    mr_msg(2, "restore_everything() --- starting");
     g_current_media_number = 1;
     /* BERLIOS: should test return value, or better change the function */
@@ -2594 +2594 @@
     mr_free(tmp);
 
-    log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
+    mr_msg(1, "Changing dir to %s", bkpinfo->restore_path);
     chdir(bkpinfo->restore_path);
     /* BERLIOS: should test return value, or better change the function */
     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");
     tmp = find_home_of_exe("petris");
     if (!tmp && !g_text_mode) {
@@ -2642 +2642 @@
     }
     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);
@@ -2690 +2690 @@
     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");
@@ -2701 +2701 @@
         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));
@@ -2756 +2756 @@
             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");
     }
@@ -2764 +2764 @@
     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);
 }
@@ -2785 +2785 @@
 void welcome_to_mondorestore()
 {
-    log_msg(0, "-------------- Mondo Restore v%s -------------",
+    mr_msg(0, "-------------- Mondo Restore v%s -------------",
             PACKAGE_VERSION);
-    log_msg(0,
+    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 near the 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,
             "------------------------------------------------------------");
 }
@@ -2863 +2863 @@
     if (strstr(tmp,"textonly")) {
         g_text_mode = TRUE;
-        log_msg(1, "TEXTONLY MODE");
+        mr_msg(1, "TEXTONLY MODE");
     } else {
         g_text_mode = FALSE;
@@ -2896 +2896 @@
     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);
     mkdir(MNT_CDROM, 0x770);
 
@@ -2902 +2902 @@
     mr_asprintf(&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);
@@ -2932 +2932 @@
     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");
     }
 
@@ -3019 +3019 @@
 
     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");
@@ -3075 +3075 @@
 //    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;
         } 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) {
             mr_asprintf(&tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
@@ -3095 +3095 @@
     } 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."));
@@ -3115 +3115 @@
             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");
                 mr_allocstr(bkpinfo->isodir, "/tmp/isodir");
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
@@ -3133 +3133 @@
 
 
-        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);
             mr_allocstr(g_mountlist_fname, "/tmp/mountlist.txt");
@@ -3145 +3145 @@
 
         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);
             mr_allocstr(g_mountlist_fname, "/tmp/mountlist.txt");
@@ -3154 +3154 @@
 
         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);
             mr_allocstr(g_mountlist_fname, "/tmp/mountlist.txt");
@@ -3241 +3241 @@
 // 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) {
@@ -3261 +3261 @@
           ("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);

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

@@ -57 +57 @@
             insist_on_this_cd_number(bkpinfo, (++g_current_media_number));
         } else {
-            log_msg(2, "No CD's left. No biggiefiles left. No problem.");
+            mr_msg(2, "No CD's left. No biggiefiles left. No problem.");
             return (0);
         }
@@ -77 +77 @@
     mr_asprintf(&bigfile_fname, biggiestruct.filename);
 
-    log_msg(2, "biggiestruct.filename = %s", bigfile_fname);
-    log_msg(2, "biggiestruct.checksum = %s", checksum);
+    mr_msg(2, "biggiestruct.filename = %s", bigfile_fname);
+    mr_msg(2, "biggiestruct.checksum = %s", checksum);
 
     if (!g_text_mode) {
@@ -88 +88 @@
     /* BERLIOS: Useless ?
     if (!checksum[0]) {
-        log_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
+        mr_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
     } */
     if (!strncmp(bigfile_fname, "/dev/", 5)) {
-        log_msg(2, _("Ignoring device %s"), bigfile_fname);
+        mr_msg(2, _("Ignoring device %s"), bigfile_fname);
         return(0);
     } else {
@@ -98 +98 @@
                 MNT_RESTORING, bigfile_fname);
     }
-    log_msg(2, command);
+    mr_msg(2, command);
     paranoid_system("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");
     if (system(command)) {
@@ -108 +108 @@
         mr_free(command);
         if (!(fin = fopen("/tmp/md5sum.txt", "r"))) {
-            log_msg(2, "Unable to open /tmp/md5sum.txt; can't get live checksum");
+            mr_msg(2, "Unable to open /tmp/md5sum.txt; can't get live checksum");
             mr_free(bigfile_fname);
             return (1);
@@ -124 +124 @@
     }
     if (!strcmp(checksum, original_cksum) != 0) {
-        log_msg(1, "bigfile #%ld ('%s') ... OK", bigfileno + 1, bigfile_fname);
-    } else {
-        log_msg(1, "bigfile #%ld ('%s') ... changed", bigfileno + 1, bigfile_fname);
+        mr_msg(1, "bigfile #%ld ('%s') ... OK", bigfileno + 1, bigfile_fname);
+    } else {
+        mr_msg(1, "bigfile #%ld ('%s') ... changed", bigfileno + 1, bigfile_fname);
         retval++;
     }
@@ -162 +162 @@
 
     assert(bkpinfo != NULL);
-    log_msg(1, "Comparing biggiefiles");
+    mr_msg(1, "Comparing biggiefiles");
 
     if (length_of_file(BIGGIELIST) < 6) {
-        log_msg(1,
+        mr_msg(1,
                 "OK, really teeny-tiny biggielist; not comparing biggiefiles");
         return (0);
@@ -171 +171 @@
     noof_biggiefiles = count_lines_in_file(BIGGIELIST);
     if (noof_biggiefiles <= 0) {
-        log_msg(1, "OK, no biggiefiles; not comparing biggiefiles");
+        mr_msg(1, "OK, no biggiefiles; not comparing biggiefiles");
         return (0);
     }
@@ -183 +183 @@
     for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
         mr_asprintf(&tmp, "Comparing big file #%ld", bigfileno + 1);
-        log_msg(1, tmp);
+        mr_msg(1, tmp);
         update_progress_form(tmp);
         mr_free(tmp);
@@ -322 +322 @@
                 "Differences found while processing fileset #%d       ",
                 current_tarball_number);
-        log_msg(1, tmp);
+        mr_msg(1, tmp);
         mr_free(tmp);
     }
@@ -402 +402 @@
                        "/archives/slice* > /dev/null 2> /dev/null")
                 == 0) {
-                log_msg(2, "OK, I think I'm done with tarballs...");
+                mr_msg(2, "OK, I think I'm done with tarballs...");
                 mr_free(tarball_fname);
                 break;
             }
-            log_msg(2, "OK, I think it's time for another CD...");
+            mr_msg(2, "OK, I think it's time for another CD...");
             g_current_media_number++;
             mr_free(progress_str);
@@ -590 +590 @@
             mr_free(tmp);
 
-            log_msg(2, "calling popup_changelist_from_file()");
+            mr_msg(2, "calling popup_changelist_from_file()");
             popup_changelist_from_file("/tmp/changed.files");
-            log_msg(2, "Returning from popup_changelist_from_file()");
+            mr_msg(2, "Returning from popup_changelist_from_file()");
         }
     } else {
@@ -650 +650 @@
     if (length_of_file("/tmp/changed.txt") > 2
         && length_of_file("/tmp/changed.files") > 2) {
-        log_msg(0,
+        mr_msg(0,
                 "Type 'less /tmp/changed.files' to see which files don't match the archives");
-        log_msg(2, "Calling popup_changelist_from_file()");
+        mr_msg(2, "Calling popup_changelist_from_file()");
         popup_changelist_from_file("/tmp/changed.files");
-        log_msg(2, "Returned from popup_changelist_from_file()");
+        mr_msg(2, "Returned from popup_changelist_from_file()");
     }
 

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

@@ -1658 +1658 @@
            sizeof(struct raid_device_record));
     mr_asprintf(&title_of_editraidForm_window, _("Edit %s"), raidrec->raid_device);
-    log_msg(2, "Opening newt window");
+    mr_msg(2, "Opening newt window");
     newtOpenWindow(20, 5, 40, 14, title_of_editraidForm_window);
     mr_free(title_of_editraidForm_window);
 
     for (;;) {
-        log_msg(2, "Main loop");
+        mr_msg(2, "Main loop");
         mr_asprintf(&sz_raid_level,
                turn_raid_level_number_to_string(raidrec->raid_level));

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

@@ -194 +194 @@
         || (!does_file_exist(output_mountlist_file)
             && does_file_exist(orig_fname))) {
-        log_msg(2, "Failed to extract %s and/or %s from ramdisk",
+        mr_msg(2, "Failed to extract %s and/or %s from ramdisk",
                 output_cfg_file, output_mountlist_file);
         retval = 1;
@@ -257 +257 @@
             "Checking to see if f=%s, file=%s, is in the list of biggiefiles",
             f, file);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     mr_free(tmp);
 
@@ -308 +308 @@
         run_program_and_log_output(command, 5);
         mr_free(command);
-        log_msg(2, "Setting isodir to %s", bkpinfo->isodir);
+        mr_msg(2, "Setting isodir to %s", bkpinfo->isodir);
     }
 
@@ -331 +331 @@
                 "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
                 mount_isodir_command);
-        log_msg(1, tmp);
+        mr_msg(1, tmp);
         mr_free(tmp);
 
@@ -352 +352 @@
     mr_asprintf(&tmp, "%s #%d has been mounted via loopback mount",
             bkpinfo->backup_media_string, i);
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
     mr_free(tmp);
 
@@ -360 +360 @@
         retval = 1;
     }
-    log_msg(2, "%ld: bkpinfo->isodir is now %s", __LINE__,
+    mr_msg(2, "%ld: bkpinfo->isodir is now %s", __LINE__,
             bkpinfo->isodir);
     return (retval);
@@ -409 +409 @@
     if (!strcmp(mpt, "/1")) {
         mr_asprintf(&mountpoint, "/");
-        log_msg(3, "Mommm! SME is being a dildo!");
+        mr_msg(3, "Mommm! SME is being a dildo!");
     } else {
         mr_asprintf(&mountpoint, mpt);
@@ -423 +423 @@
     }
     mr_asprintf(&tmp, "Mounting device %s   ", device);
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
 
     if (writeable) {
@@ -465 +465 @@
         mr_asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device,
                 additional_parameters, mountdir, MONDO_LOGFILE);
-        log_msg(2, "command='%s'", command);
+        mr_msg(2, "command='%s'", command);
     }
     mr_free(additional_parameters);
@@ -471 +471 @@
     res = run_program_and_log_output(command, TRUE);
     if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
-        log_msg(1, "Re-trying without the fancy extra parameters");
+        mr_msg(1, "Re-trying without the fancy extra parameters");
         mr_free(command);
 
@@ -479 +479 @@
     }
     if (res) {
-        log_msg(1, "Unable to mount device %s (type %s) at %s", device,
+        mr_msg(1, "Unable to mount device %s (type %s) at %s", device,
                 format, mountdir);
-        log_msg(1, "command was '%s'", command);
+        mr_msg(1, "command was '%s'", command);
         if (!strcmp(mountpoint, "swap")) {
             log_to_screen(tmp);
         } else {
-            log_msg(2, "Retrying w/o the '-t' switch");
+            mr_msg(2, "Retrying w/o the '-t' switch");
             mr_free(command);
 
             mr_asprintf(&command, "mount %s %s 2>> %s", device, mountdir,
                     MONDO_LOGFILE);
-            log_msg(2, "2nd command = '%s'", command);
+            mr_msg(2, "2nd command = '%s'", command);
             res = run_program_and_log_output(command, TRUE);
             if (res == 0) {
-                log_msg(1,
+                mr_msg(1,
                         "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
             } else {
@@ -505 +505 @@
 
     if (res && !strcmp(mountpoint, "swap")) {
-        log_msg(2, "That's ok. It's just a swap partition.");
-        log_msg(2, "Non-fatal error. Returning 0.");
+        mr_msg(2, "That's ok. It's just a swap partition.");
+        mr_msg(2, "Non-fatal error. Returning 0.");
         res = 0;
     }
@@ -550 +550 @@
     for (lino = 0; lino < mountlist->entries; lino++) {
         if (!strcmp(mountlist->el[lino].device, "/proc")) {
-            log_msg(1,
+            mr_msg(1,
                     "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
@@ -649 +649 @@
     if (bkpinfo->backup_media_type == tape
         || bkpinfo->backup_media_type == udev) {
-        log_msg(8, "Tape/udev. Therefore, no need to mount CDROM.");
+        mr_msg(8, "Tape/udev. Therefore, no need to mount CDROM.");
         return 0;
     }
 
     if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
-        log_msg(2, "mount_cdrom() - CD already mounted. Fair enough.");
+        mr_msg(2, "mount_cdrom() - CD already mounted. Fair enough.");
         return (0);
     }
 
     if (bkpinfo->backup_media_type == nfs) {
-        log_msg(2, "Mounting for NFS thingy");
-        log_msg(2, "isodir = %s", bkpinfo->isodir);
+        mr_msg(2, "Mounting for NFS thingy");
+        mr_msg(2, "isodir = %s", bkpinfo->isodir);
         if ((!bkpinfo->isodir || !strcmp(bkpinfo->isodir, "/"))
             && am_I_in_disaster_recovery_mode()) {
             mr_allocstr(bkpinfo->isodir, "/tmp/isodir");
-            log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
+            mr_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
 #ifdef __FreeBSD__
@@ -728 +728 @@
 
     }
-    log_msg(2, "(mount_cdrom) --- command = %s", mount_cmd);
+    mr_msg(2, "(mount_cdrom) --- command = %s", mount_cmd);
     for (i = 0; i < 2; i++) {
         res = run_program_and_log_output(mount_cmd, FALSE);
@@ -734 +734 @@
             break;
         } else {
-            log_msg(2, "Failed to mount CD-ROM drive.");
+            mr_msg(2, "Failed to mount CD-ROM drive.");
             sleep(5);
             run_program_and_log_output("sync", FALSE);
@@ -742 +742 @@
 
     if (res) {
-        log_msg(2, "Failed, despite %d attempts", i);
-    } else {
-        log_msg(2, "Mounted CD-ROM drive OK");
+        mr_msg(2, "Failed, despite %d attempts", i);
+    } else {
+        mr_msg(2, "Mounted CD-ROM drive OK");
     }
     return (res);
@@ -830 +830 @@
                 /* Check to see if CD is already mounted before mounting it... */
                 if (!is_this_device_mounted("/dev/cdrom")) {
-                    log_msg(2,
+                    mr_msg(2,
                             "NB: CDROM device not mounted, mounting...");
                     run_program_and_log_output("mount /dev/cdrom "
@@ -897 +897 @@
             mr_asprintf(&tmp, "Backup medium is TAPE --- dev=%s",
                     bkpinfo->media_device);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
             mr_free(tmp);
         } else {
@@ -903 +903 @@
             bkpinfo->media_size[0] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
             bkpinfo->media_size[1] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
-            log_msg(2, "Backup medium is CD-R[W]");
-        }
-    } else {
-        log_msg(2,
+            mr_msg(2, "Backup medium is CD-R[W]");
+        }
+    } else {
+        mr_msg(2,
                 "Not in Disaster Recovery Mode. No need to derive device name from config file.");
     }
@@ -913 +913 @@
     if (strstr(value, "yes")) {
         bkpinfo->use_star = TRUE;
-        log_msg(1, "Goody! ... bkpinfo->use_star is now true.");
+        mr_msg(1, "Goody! ... bkpinfo->use_star is now true.");
     }
     mr_free(value);
@@ -920 +920 @@
     if (strstr(value, "TRUE")) {
         mr_asprintf(&g_getfacl,"setfacl");
-        log_msg(1, "We will restore ACLs");
+        mr_msg(1, "We will restore ACLs");
         if (! find_home_of_exe("setfacl")) {
-            log_msg(1, "Unable to restore ACLs as no setfacl found");
+            mr_msg(1, "Unable to restore ACLs as no setfacl found");
         }
     }
@@ -928 +928 @@
     if (strstr(value, "TRUE")) {
         mr_asprintf(&g_getfattr,"setfattr");
-        log_msg(1, "We will restore XATTRs");
+        mr_msg(1, "We will restore XATTRs");
         if (! find_home_of_exe("setfattr")) {
-            log_msg(1, "Unable to restore XATTRs as no setfattr found");
+            mr_msg(1, "Unable to restore XATTRs as no setfattr found");
         }
     }
@@ -936 +936 @@
     if (0 == read_cfg_var(cfg_file, "internal-tape-block-size", value)) {
         bkpinfo->internal_tape_block_size = atol(value);
-        log_msg(1, "Internal tape block size has been custom-set to %ld",
+        mr_msg(1, "Internal tape block size has been custom-set to %ld",
                 bkpinfo->internal_tape_block_size);
     } else {
         bkpinfo->internal_tape_block_size =
             DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
-        log_msg(1, "Internal tape block size = default (%ld)",
+        mr_msg(1, "Internal tape block size = default (%ld)",
                 DEFAULT_INTERNAL_TAPE_BLOCK_SIZE);
     }
@@ -980 +980 @@
         bkpinfo->differential = TRUE;
     }
-    log_msg(2, "differential var = '%s'", value);
+    mr_msg(2, "differential var = '%s'", value);
     mr_free(value);
 
     if (bkpinfo->differential) {
-        log_msg(2, "THIS IS A DIFFERENTIAL BACKUP");
-    } else {
-        log_msg(2, "This is a regular (full) backup");
+        mr_msg(2, "THIS IS A DIFFERENTIAL BACKUP");
+    } else {
+        mr_msg(2, "This is a regular (full) backup");
     }
 
@@ -997 +997 @@
     if ((tmp != NULL) || strstr(tmp1,"donteject")) {
         bkpinfo->please_dont_eject = TRUE;
-        log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
+        mr_msg(2, "Ok, I shan't eject when restoring! Groovy.");
     }
     mr_free(tmp);
@@ -1004 +1004 @@
     if (bkpinfo->backup_media_type == nfs) {
         if (!cfgf) {
-            log_msg(2, "nfs_mount remains %s", bkpinfo->nfs_mount);
-            log_msg(2, "nfs_remote_dir remains %s",
+            mr_msg(2, "nfs_mount remains %s", bkpinfo->nfs_mount);
+            mr_msg(2, "nfs_remote_dir remains %s",
                     bkpinfo->nfs_remote_dir);
-            log_msg(2,
+            mr_msg(2,
                     "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
         } else {
@@ -1016 +1016 @@
             read_cfg_var(g_mondo_cfg_file, "nfs-server-path",
                          bkpinfo->nfs_remote_dir);
-            log_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
-            log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
+            mr_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
+            mr_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
         }
         if (strstr(call_program_and_get_last_line_of_output
@@ -1060 +1060 @@
         mr_free(g_isodir_device);
         read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
-        log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
+        mr_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
         if (bkpinfo->disaster_recovery) {
             if (is_this_device_mounted(g_isodir_device)) {
-                log_msg(2, "NB: isodir is already mounted");
+                mr_msg(2, "NB: isodir is already mounted");
                 /* Find out where it's mounted */
                 mr_asprintf(&command,
@@ -1081 +1081 @@
                 mr_asprintf(&tmp, "mount %s %s", g_isodir_device, iso_mnt);
                 if (run_program_and_log_output(tmp, 3)) {
-                    log_msg(1,
+                    mr_msg(1,
                             "Unable to mount isodir. Perhaps this is really a CD backup?");
                     bkpinfo->backup_media_type = cdr;
@@ -1095 +1095 @@
                             ("Unable to mount isodir. Failed to mount CD-ROM as well.");
                     } else {
-                        log_msg(1,
+                        mr_msg(1,
                                 "You backed up to disk, then burned some CDs.");
                     }
@@ -1114 +1114 @@
         if (g_restoring_live_from_cd) {
             if (bkpinfo->backup_media_type != media_specified_by_user) {
-                log_msg(2,
+                mr_msg(2,
                         "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
                 interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
@@ -1163 +1163 @@
     if (does_file_exist(g_filelist_full)
         && does_file_exist(g_biggielist_txt)) {
-        log_msg(1, "%s exists", g_filelist_full);
-        log_msg(1, "%s exists", g_biggielist_txt);
-        log_msg(2,
+        mr_msg(1, "%s exists", g_filelist_full);
+        mr_msg(1, "%s exists", g_biggielist_txt);
+        mr_msg(2,
                 "Filelist and biggielist already recovered from media. Yay!");
     } else {
         getcwd(tmp, MAX_STR_LEN);
         chdir(bkpinfo->tmpdir);
-        log_msg(1, "chdir(%s)", bkpinfo->tmpdir);
+        mr_msg(1, "chdir(%s)", bkpinfo->tmpdir);
         log_to_screen("Extracting filelist and biggielist from media...");
         unlink("/tmp/filelist.full");
@@ -1183 +1183 @@
                     FILELIST_FULL_STUB,
                     "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
-            log_msg(1, "tarcommand = %s", command);
+            mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
             mr_free(command);
         } else {
-            log_msg(2,
+            mr_msg(2,
                     "Calling insist_on_this_cd_number; bkpinfo->isodir=%s",
                     bkpinfo->isodir);
             insist_on_this_cd_number(bkpinfo, 1);
-            log_msg(2, "Back from iotcn");
+            mr_msg(2, "Back from iotcn");
             run_program_and_log_output("mount", 1);
             mr_asprintf(&command,
@@ -1201 +1201 @@
                     "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
 
-            log_msg(1, "tarcommand = %s", command);
+            mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
             mr_free(command);
@@ -1221 +1221 @@
         mr_asprintf(&command, "cp -f %s/%s %s", bkpinfo->tmpdir,
                 BIGGIELIST_TXT_STUB, g_biggielist_txt);
-        log_msg(1, "command = %s", command);
+        mr_msg(1, "command = %s", command);
         paranoid_system(command);
         mr_free(command);
@@ -1227 +1227 @@
         mr_asprintf(&command, "ln -sf %s/%s %s", bkpinfo->tmpdir,
                 FILELIST_FULL_STUB, g_filelist_full);
-        log_msg(1, "command = %s", command);
+        mr_msg(1, "command = %s", command);
         paranoid_system(command);
         mr_free(command);
@@ -1247 +1247 @@
 
     if (!does_file_exist(g_biggielist_txt)) {
-        log_msg(1, "Warning - %s not found", g_biggielist_txt);
+        mr_msg(1, "Warning - %s not found", g_biggielist_txt);
     }
     if (!does_file_exist(g_filelist_full)) {
-        log_msg(1, "Warning - %s does not exist", g_filelist_full);
+        mr_msg(1, "Warning - %s does not exist", g_filelist_full);
     }
 //  popup_and_OK("Wonderful.");
 
-    log_msg(2, "Forking");
+    mr_msg(2, "Forking");
     pid = fork();
     switch (pid) {
@@ -1284 +1284 @@
     close_evalcall_form();
 
-    log_msg(3, "loading filelist");
+    mr_msg(3, "loading filelist");
     filelist = load_filelist(g_filelist_full);
-    log_msg(3, "deleting original filelist");
+    mr_msg(3, "deleting original filelist");
     unlink(g_filelist_full);
     if (g_text_mode) {
@@ -1302 +1302 @@
     }
     if (res) {
-        log_msg(2, "User hit 'cancel'. Freeing filelist and aborting.");
+        mr_msg(2, "User hit 'cancel'. Freeing filelist and aborting.");
         free_filelist(filelist);
         return (NULL);
@@ -1370 +1370 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
     mr_asprintf(&tmp, "run_boot_loader: device='%s', name='%s'", device, name);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     mr_free(tmp);
 
@@ -1386 +1386 @@
 //      else
 //        {
-//    log_msg(1, "Not running run_grub(). Was a bad idea anyway.");
+//    mr_msg(1, "Not running run_grub(). Was a bad idea anyway.");
 //    res = 1;
 //  }
@@ -1404 +1404 @@
             res = run_program_and_log_output(tmp, 3);
         } else {
-            log_msg(1,
+            mr_msg(1,
                     "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
         }
@@ -1464 +1464 @@
     tmp = find_home_of_exe(output);
     if (!tmp) {
-        log_msg(2, " (find_my_editor) --- warning - %s not found", output);
+        mr_msg(2, " (find_my_editor) --- warning - %s not found", output);
     }
     mr_free(tmp);
@@ -1536 +1536 @@
         /* nuke mode */
         if (!run_program_and_log_output("which grub-MR", FALSE)) {
-            log_msg(1, "Yay! grub-MR found...");
+            mr_msg(1, "Yay! grub-MR found...");
             mr_asprintf(&command, "grub-MR %s /tmp/mountlist.txt", bd);
-            log_msg(1, "command = %s", command);
+            mr_msg(1, "command = %s", command);
         } else {
             mr_asprintf(&command, "chroot " MNT_RESTORING " grub-install %s", bd);
-            log_msg(1, "WARNING - grub-MR not found; using grub-install");
+            mr_msg(1, "WARNING - grub-MR not found; using grub-install");
         }
         mvaddstr_and_log_it(g_currentY,
@@ -1566 +1566 @@
             (_
              ("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info."));
-        log_msg(1, "Type:-");
-        log_msg(1, "    mount-me");
-        log_msg(1, "    chroot " MNT_RESTORING);
-        log_msg(1, "    mount /boot");
-        log_msg(1, "    grub-install '(hd0)'");
-        log_msg(1, "    exit");
-        log_msg(1, "    unmount-me");
-        log_msg(1,
+        mr_msg(1, "Type:-");
+        mr_msg(1, "    mount-me");
+        mr_msg(1, "    chroot " MNT_RESTORING);
+        mr_msg(1, "    mount /boot");
+        mr_msg(1, "    grub-install '(hd0)'");
+        mr_msg(1, "    exit");
+        mr_msg(1, "    unmount-me");
+        mr_msg(1,
                 "If you're really stuck, please e-mail the mailing list.");
     } else {
@@ -1829 +1829 @@
                             ("Restoring MBR...                                               "));
         mr_asprintf(&command, "raw-MR %s /tmp/mountlist.txt", bd);
-        log_msg(2, "run_raw_mbr() --- command='%s'", command);
+        mr_msg(2, "run_raw_mbr() --- command='%s'", command);
         res = run_program_and_log_output(command, 3);
         mr_free(command);
@@ -1999 +1999 @@
 void termination_in_progress(int sig)
 {
-    log_msg(1, "Termination in progress");
+    mr_msg(1, "Termination in progress");
     usleep(1000);
     pthread_exit(0);
@@ -2047 +2047 @@
          i++) {
         sleep(1);
-        log_msg(2, "Waiting for buffer() to finish");
+        mr_msg(2, "Waiting for buffer() to finish");
     }
 
@@ -2054 +2054 @@
     if (run_program_and_log_output
         ("cp -f /tmp/mondo-restore.log " MNT_RESTORING "/tmp/", FALSE)) {
-        log_msg(1,
+        mr_msg(1,
                 "Error. Failed to copy log to PC's /tmp dir. (Mounted read-only?)");
     }
     if (run_program_and_log_output
         ("cp -f /tmp/mondo-restore.log " MNT_RESTORING "/root/", FALSE)) {
-        log_msg(1,
+        mr_msg(1,
                 "Error. Failed to copy log to PC's /root dir. (Mounted read-only?)");
     }
@@ -2081 +2081 @@
                 if (!strcmp(mountlist->el[lino].mountpoint, "/1")) {
                     mr_asprintf(&command, "umount %s/", MNT_RESTORING);
-                    log_msg(3,
+                    mr_msg(3,
                             "Well, I know a certain kitty-kitty who'll be sleeping with Mommy tonight...");
                 } else {
@@ -2088 +2088 @@
                 }
             }
-            log_msg(10, "The 'umount' command is '%s'", command);
+            mr_msg(10, "The 'umount' command is '%s'", command);
             res = run_program_and_log_output(command, 3);
             mr_free(command);
@@ -2105 +2105 @@
             log_to_screen(tmp);
         } else {
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
         }
         mr_free(tmp);
@@ -2149 +2149 @@
             MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
             BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");
-    log_msg(2, "command = '%s'", command);
+    mr_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
     mr_free(command);
@@ -2185 +2185 @@
 
     assert(bkpinfo != NULL);
-    log_msg(2, "gcffa --- starting");
+    mr_msg(2, "gcffa --- starting");
     log_to_screen(_("I'm thinking..."));
     mr_asprintf(&mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
@@ -2202 +2202 @@
     mr_asprintf(&mountlist_file, "%s/%s", bkpinfo->tmpdir,
             MOUNTLIST_FNAME_STUB);
-    log_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
+    mr_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
 
     /* Floppy? */
@@ -2217 +2217 @@
             "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
             command);
-    log_msg(1, "tmp = '%s'", tmp);
+    mr_msg(1, "tmp = '%s'", tmp);
     system(tmp);
     mr_free(tmp);
@@ -2233 +2233 @@
     } else {
         try_plan_B = TRUE;
-        log_msg(2,
+        mr_msg(2,
                 "Mounted floppy OK but I don't trust it because the archives might contain more up-to-date config file than the floppy does.");
 // NB: If busybox does not support 'mount -o loop' then Plan A WILL NOT WORK.
-        log_msg(2, "Processing floppy (plan A?)");
+        mr_msg(2, "Processing floppy (plan A?)");
         mr_asprintf(&ramdisk_fname, "%s/mindi.rdz", mountpt);
         if (!does_file_exist(ramdisk_fname)) {
@@ -2243 +2243 @@
         }
         if (!does_file_exist(ramdisk_fname)) {
-            log_msg(2,
+            mr_msg(2,
                     "Cannot find ramdisk file on mountpoint. Are you sure that's a boot disk in the drive?");
         }
         if (extract_config_file_from_ramdisk
             (bkpinfo, ramdisk_fname, cfg_file, mountlist_file)) {
-            log_msg(2,
+            mr_msg(2,
                     "Warning - failed to extract config file from ramdisk. I think this boot disk is mangled.");
         }
@@ -2259 +2259 @@
     }
     if (!does_file_exist(cfg_file)) {
-        log_msg(2, "gcffa --- we don't have cfg file yet.");
+        mr_msg(2, "gcffa --- we don't have cfg file yet.");
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
             try_plan_B = TRUE;
         } else {
-            log_msg(2, "gcffa --- calling mount_cdrom now :)");
+            mr_msg(2, "gcffa --- calling mount_cdrom now :)");
             if (!mount_cdrom(bkpinfo)) {
-                log_msg(2,
+                mr_msg(2,
                         "gcffa --- managed to mount CD; so, no need for Plan B");
                 try_plan_B = FALSE;
@@ -2277 +2277 @@
         }
         if (try_plan_B) {
-            log_msg(2, "gcffa --- OK, switching to Plan B");
+            mr_msg(2, "gcffa --- OK, switching to Plan B");
             chdir(bkpinfo->tmpdir);
             run_program_and_log_output("mkdir -p tmp", FALSE);
@@ -2283 +2283 @@
             if (bkpinfo->media_device == NULL) {
                 mr_asprintf(&bkpinfo->media_device, "/dev/st0");
-                log_msg(2, "media_device is blank; assuming %s",
+                mr_msg(2, "media_device is blank; assuming %s",
                         bkpinfo->media_device);
             }
@@ -2298 +2298 @@
                         if (extract_cfg_file_and_mountlist_from_tape_dev
                             (bkpinfo->media_device)) {
-                            log_msg(3,
+                            mr_msg(3,
                                     "I tried lots of devices but none worked.");
                             mr_allocstr(bkpinfo->media_device, sav);
@@ -2313 +2313 @@
             }
         } else {
-            log_msg(2,
+            mr_msg(2,
                     "gcffa --- looking at mounted CD for mindi-boot.2880.img");
             /* BERLIOS : Useless ?
@@ -2322 +2322 @@
             mr_asprintf(&mounted_cfgf_path, "%s/%s", mountpt, cfg_file);
             if (!does_file_exist(mounted_cfgf_path)) {
-                log_msg(2,
+                mr_msg(2,
                         "gcffa --- Plan C, a.k.a. untarring some file from all.tar.gz");
                 mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm"); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
@@ -2339 +2339 @@
 
     if (does_file_exist(MONDO_CFG_FILE_STUB)) {
-        log_msg(1, "gcffa --- great! We've got the config file");
+        mr_msg(1, "gcffa --- great! We've got the config file");
         tmp1 = call_program_and_get_last_line_of_output("pwd");
         mr_asprintf(&tmp, "%s/%s", tmp1,MONDO_CFG_FILE_STUB);
@@ -2347 +2347 @@
         if (strcmp(tmp, cfg_file)
             && run_program_and_log_output(command, 1)) {
-            log_msg(1,
+            mr_msg(1,
                     "... but an error occurred when I tried to move it to %s",
                     cfg_file);
         } else {
-            log_msg(1, "... and I moved it successfully to %s", cfg_file);
+            mr_msg(1, "... and I moved it successfully to %s", cfg_file);
         }
         mr_free(command);
@@ -2362 +2362 @@
         if (strcmp(tmp, cfg_file)
             && run_program_and_log_output(command, 1)) {
-            log_msg(1, "Failed to get mountlist");
+            mr_msg(1, "Failed to get mountlist");
         } else {
-            log_msg(1, "Got mountlist too");
+            mr_msg(1, "Got mountlist too");
             mr_free(command);
             mr_asprintf(&command, "cp -f %s %s", mountlist_file,
                     g_mountlist_fname);
             if (run_program_and_log_output(command, 1)) {
-                log_msg(1, "Failed to copy mountlist to /tmp");
+                mr_msg(1, "Failed to copy mountlist to /tmp");
             } else {
-                log_msg(1, "Copied mountlist to /tmp as well OK");
+                mr_msg(1, "Copied mountlist to /tmp as well OK");
                 mr_free(command);
                 mr_asprintf(&command, "cp -f tmp/i-want-my-lvm /tmp/");
@@ -2383 +2383 @@
     if (!does_file_exist(cfg_file)) {
         iamhere(cfg_file);
-        log_msg(1, "%s not found", cfg_file);
+        mr_msg(1, "%s not found", cfg_file);
         log_to_screen
             (_
@@ -2448 +2448 @@
         if (parse_mdstat(raidlist, "/dev/")) {
             log_to_screen("Sorry, cannot read %s", MDSTAT_FILE);
-            log_msg(1, "Sorry, cannot read %s", MDSTAT_FILE);
+            mr_msg(1, "Sorry, cannot read %s", MDSTAT_FILE);
             return;
         }
@@ -2455 +2455 @@
             if (raidlist->el[i].progress < wait_for_percentage) {
                 unfinished_mdstat_devices++;
-                log_msg(1, "Sync'ing %s (i=%d)",
+                mr_msg(1, "Sync'ing %s (i=%d)",
                         raidlist->el[i].raid_device, i);
                 mr_asprintf(&screen_message, "Sync'ing %s",
@@ -2466 +2466 @@
                 }
                 while (raidlist->el[i].progress < wait_for_percentage) {
-                    log_msg(1, "Percentage sync'ed: %d",
+                    mr_msg(1, "Percentage sync'ed: %d",
                             raidlist->el[i].progress);
                     update_evalcall_form(raidlist->el[i].progress);