Changeset 1107 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

Feb 8, 2007, 12:09:34 AM (17 years ago)

Author:

Bruno Cornec

Message:

log_msg => mr_msg for common files

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (102 diffs)

branches/stable/mondo/src/common/libmondo-archive.c

@@ -10 +10 @@
  * This is the main file (at least the longest one) in libmondo.
  */
+#include <sys/sem.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <stdarg.h>
+#include <unistd.h>
 
 #include "my-stuff.h"
 #include "../common/mondostructures.h"
+#include "mr_conf.h"
+#include "mr_mem.h"
+#include "mr_err.h"
+#include "mr_str.h"
+#include "mr_file.h"
+
 #include "libmondo-string-EXT.h"
 #include "libmondo-stream-EXT.h"
@@ -26 +37 @@
 #include "lib-common-externs.h"
 
-#include "mr_mem.h"
-#include "mr_str.h"
-#include "mr_file.h"
-
-#include <sys/sem.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <stdarg.h>
 #define DVDRWFORMAT 1
 
@@ -91 +94 @@
  */
 t_bkptype g_backup_media_type = none;
+char *g_backup_media_string = NULL;
 
 /**
@@ -142 +146 @@
 
     if (semctl(g_sem_id, 0, IPC_RMID, sem_union) == -1) {
-        log_msg(3, "Failed to delete semaphore");
+        mr_msg(3, "Failed to delete semaphore");
     }
 }
@@ -159 +163 @@
     sem_b.sem_flg = SEM_UNDO;
     if (semop(g_sem_id, &sem_b, 1) == -1) {
-        log_msg(3, "semaphore_p failed");
+        mr_msg(3, "semaphore_p failed");
         return (0);
     }
@@ -177 +181 @@
     sem_b.sem_flg = SEM_UNDO;
     if (semop(g_sem_id, &sem_b, 1) == -1) {
-        log_msg(3, "semaphore_v failed");
+        mr_msg(3, "semaphore_v failed");
         return (0);
     }
@@ -235 +239 @@
     }
     sprintf(command + strlen(command), " 2>> %s", MONDO_LOGFILE);
-    log_msg(4, "command = '%s'", command);
+    mr_msg(4, "command = '%s'", command);
 
     for (res = 99, tries = 0; tries < 3 && res != 0; tries++) {
-        log_msg(5, "command='%s'", command);
+        mr_msg(5, "command='%s'", command);
         res = system(command);
         strcpy(tmp, last_line_of_file(MONDO_LOGFILE));
-        log_msg(1, "res=%d; tmp='%s'", res, tmp);
+        mr_msg(1, "res=%d; tmp='%s'", res, tmp);
         if (bkpinfo->use_star && (res == 254 || res == 65024)
             && strstr(tmp, "star: Processed all possible files")
             && tries > 0) {
-            log_msg(1, "Star returned nonfatal error");
+            mr_msg(1, "Star returned nonfatal error");
             res = 0;
         }
@@ -253 +257 @@
             if (p) {
                 p[0] = p[1] = p[2] = p[3] = ' ';
-                log_msg(1, "new command = '%s'", command);
+                mr_msg(1, "new command = '%s'", command);
             } else {
-                log_msg(3,
+                mr_msg(3,
                         "Attempt #%d failed. Pausing 3 seconds and retrying...",
                         tries + 1);
@@ -264 +268 @@
     retval += res;
     if (retval) {
-        log_msg(3, "Failed to write set %d", setno);
+        mr_msg(3, "Failed to write set %d", setno);
     } else if (tries > 1) {
-        log_msg(3, "Succeeded in writing set %d, on try #%d", setno,
+        mr_msg(3, "Succeeded in writing set %d, on try #%d", setno,
                 tries);
     }
@@ -344 +348 @@
             strcat(zipparams, tmp);
         } else {
-            log_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
+            mr_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
         }
     } else {
@@ -373 +377 @@
 
     for (res = 99, tries = 0; tries < 3 && res != 0; tries++) {
-        log_msg(5, "command='%s'", command);
+        mr_msg(5, "command='%s'", command);
         res = system(command);
         if (res) {
             log_OS_error(command);
-            log_msg(3,
+            mr_msg(3,
                     "Attempt #%d failed. Pausing 3 seconds and retrying...",
                     tries + 1);
@@ -385 +389 @@
     retval += res;
     if (retval) {
-        log_msg(3, "Failed to write set %d", setno);
+        mr_msg(3, "Failed to write set %d", setno);
     } else if (tries > 1) {
-        log_msg(3, "Succeeded in writing set %d, on try #%d", setno,
+        mr_msg(3, "Succeeded in writing set %d, on try #%d", setno,
                 tries);
     }
@@ -397 +401 @@
             if (free_ramdisk_space > i) {
                 free_ramdisk_space = i;
-                log_msg(2, "min(free_ramdisk_space) is now %d",
+                mr_msg(2, "min(free_ramdisk_space) is now %d",
                         free_ramdisk_space);
                 if (free_ramdisk_space < 10) {
@@ -495 +499 @@
     retval += make_those_slices_phase(bkpinfo); // backup BIG files
     retval += do_that_final_phase(bkpinfo); // clean up
-    log_msg(1, "Creation of archives... complete.");
+    mr_msg(1, "Creation of archives... complete.");
     if (bkpinfo->verify_data) {
         sleep(2);
@@ -574 +578 @@
             bkpinfo->exclude_paths);
     strcpy(devs_to_exclude, call_program_and_get_last_line_of_output(tmp));
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     mvaddstr_and_log_it(g_currentY, 0,
                         "Calling MINDI to create boot+data disks");
@@ -622 +626 @@
             sprintf(tmp, "User specified boot loader. It is '%c'.",
                     bkpinfo->boot_loader);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
         } else {
             bkpinfo->boot_loader = ch;
@@ -629 +633 @@
             sprintf(tmp, "User specified boot device. It is '%s'.",
                     bkpinfo->boot_device);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
         } else {
             strcpy(bkpinfo->boot_device, bootdev);
@@ -857 +861 @@
             //use_gzip_sz);         // parameter #20 (STRING)
 
-    log_msg(2, command);
+    mr_msg(2, command);
 
     res = run_program_and_log_to_screen(command, "Generating boot+data disks");
@@ -866 +870 @@
         log_to_screen("Boot+data disks were created OK");
         sprintf(command, "mkdir -p /var/cache/mindi/");
-        log_msg(2, command);
+        mr_msg(2, command);
         run_program_and_log_output(command, FALSE);
         sprintf(command,
                 "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
                 bkpinfo->scratchdir);
-        log_msg(2, command);
+        mr_msg(2, command);
         run_program_and_log_output(command, FALSE);
         if (bkpinfo->nonbootable_backup) {
@@ -991 +995 @@
         }
         if (!semaphore_p()) {
-            log_msg(3, "P sem failed (pid=%d)", (int) getpid());
+            mr_msg(3, "P sem failed (pid=%d)", (int) getpid());
             fatal_error("Cannot get semaphore P");
         }
@@ -1008 +1012 @@
                 bkpinfo->tmpdir, archiving_set_no);
         if (!does_file_exist(archiving_filelist_fname)) {
-            log_msg(3,
+            mr_msg(3,
                     "%s[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.",
                     FORTY_SPACES, getpid(), this_thread_no,
@@ -1018 +1022 @@
                 archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
-            log_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES,
+            mr_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES,
                     getpid(), this_thread_no);
             while (does_file_exist(tmp)) {
                 sleep(1);
             }
-            log_msg(4, "[%d] - continuing", getpid());
-        }
-
-        log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
+            mr_msg(4, "[%d] - continuing", getpid());
+        }
+
+        mr_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
                 this_thread_no, archiving_set_no);
         if (g_getfattr) {
@@ -1039 +1043 @@
         }
 
-        log_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(),
+        mr_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(),
                 this_thread_no, archiving_set_no);
         res =
@@ -1066 +1070 @@
             fatal_error("Cannot get semaphore V");
         }
-        log_msg(4, "%s[%d:%d] - archived %d OK", FORTY_SPACES, getpid(),
+        mr_msg(4, "%s[%d:%d] - archived %d OK", FORTY_SPACES, getpid(),
                 this_thread_no, archiving_set_no);
         archiving_set_no++;
@@ -1077 +1081 @@
         fatal_error("Cannot get semaphore V");
     }
-    log_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(),
+    mr_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(),
             this_thread_no);
     mr_free(archiving_filelist_fname);
@@ -1113 +1117 @@
                         "Writing any remaining data to media         ");
 
-    log_msg(1, "Closing tape/CD ... ");
+    mr_msg(1, "Closing tape/CD ... ");
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type))
         /* write tape/cdstream */
@@ -1124 +1128 @@
         retval += res;
         if (res) {
-            log_msg(1, "write_final_iso_if_necessary returned an error");
-        }
-    }
-    log_msg(2, "Fork is exiting ... ");
+            mr_msg(1, "write_final_iso_if_necessary returned an error");
+        }
+    }
+    mr_msg(2, "Fork is exiting ... ");
 
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -1181 +1185 @@
     strip_spaces(g_serial_string);
     strcat(g_serial_string, "...word.");
-    log_msg(2, "g_serial_string = '%s'", g_serial_string);
+    mr_msg(2, "g_serial_string = '%s'", g_serial_string);
     assert(strlen(g_serial_string) < MAX_STR_LEN);
 
     sprintf(tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
     if (write_one_liner_data_file(tmpfile, g_serial_string)) {
-        log_msg(1, "%ld: Failed to write serial string", __LINE__);
+        mr_msg(1, "%ld: Failed to write serial string", __LINE__);
     }
 
@@ -1199 +1203 @@
             fatal_error("Cannot open backup (streaming) device");
         }
-        log_msg(1, "Backup (stream) opened OK");
+        mr_msg(1, "Backup (stream) opened OK");
         write_data_disks_to_stream(data_disks_file);
     } else {
-        log_msg(1, "Backing up to CD's");
+        mr_msg(1, "Backing up to CD's");
     }
 
@@ -1275 +1279 @@
     sprintf(command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
             tempfile);
-    log_msg(3, command);
+    mr_msg(3, command);
     open_evalcall_form(title);
     if (!(pin = popen(command, "r"))) {
@@ -1289 +1293 @@
         trackno = get_trackno_from_logfile(tempfile);
         if (trackno < 0 || trackno > 80) {
-            log_msg(1, "Weird track#");
+            mr_msg(1, "Weird track#");
             continue;
         }
@@ -1440 +1444 @@
     int misc_counter_that_is_not_important = 0;
 
-    log_msg(8, "here");
+    mr_msg(8, "here");
     assert(bkpinfo != NULL);
     tmp = mr_malloc(MAX_STR_LEN * 2);
@@ -1466 +1470 @@
     sprintf(tmp, "%s/archives/filelist.full", bkpinfo->scratchdir);
     log_to_screen("Archiving regular files");
-    log_msg(5, "Go, Shorty. It's your birthday.");
+    mr_msg(5, "Go, Shorty. It's your birthday.");
     open_progress_form("Backing up filesystem",
                        "I am backing up your live filesystem now.",
@@ -1473 +1477 @@
                        get_last_filelist_number(bkpinfo) + 1);
 
-    log_msg(5, "We're gonna party like it's your birthday.");
+    mr_msg(5, "We're gonna party like it's your birthday.");
 
     srand((unsigned int) getpid());
@@ -1486 +1490 @@
     }                           // initialize semaphore
     for (noof_threads = 0; noof_threads < ARCH_THREADS; noof_threads++) {
-        log_msg(8, "Creating thread #%d", noof_threads);
+        mr_msg(8, "Creating thread #%d", noof_threads);
         (*p_archival_threads_running)++;
         if ((res =
@@ -1496 +1500 @@
     }
 
-    log_msg(8, "About to enter while() loop");
+    mr_msg(8, "About to enter while() loop");
     while (!done_storing) {
         if (g_exiting) {
@@ -1503 +1507 @@
         if (*p_archival_threads_running == 0
             && *p_last_set_archived == storing_set_no - 1) {
-            log_msg(2,
+            mr_msg(2,
                     "No archival threads are running. The last stored set was %d and I'm looking for %d. Take off your make-up; the party's over... :-)",
                     *p_last_set_archived, storing_set_no);
@@ -1532 +1536 @@
             }
 
-            log_msg(2, "Storing set %d", storing_set_no);
+            mr_msg(2, "Storing set %d", storing_set_no);
             while (!does_file_exist(storing_filelist_fname)
                    || !does_file_exist(storing_afioball_fname)) {
-                log_msg(2,
+                mr_msg(2,
                         "Warning - either %s or %s doesn't exist yet. I'll pause 5 secs.",
                         storing_filelist_fname, storing_afioball_fname);
@@ -1598 +1602 @@
 
     sprintf(tmp, "Your regular files have been archived ");
-    log_msg(2, "Joining background threads to foreground thread");
+    mr_msg(2, "Joining background threads to foreground thread");
     for (i = 0; i < noof_threads; i++) {
         pthread_join(archival_thread[i], pvp);
-        log_msg(3, "Thread %d of %d: closed OK", i + 1, noof_threads);
+        mr_msg(3, "Thread %d of %d: closed OK", i + 1, noof_threads);
     }
     del_semvalue();
-    log_msg(2, "Done.");
+    mr_msg(2, "Done.");
     if (retval) {
         strcat(tmp, "(with errors).");
@@ -1694 +1698 @@
        if (!does_file_exist(tmp))
        {
-       log_msg (2, "Silly bug in Mindi.pl; workaround in progress...");
+       mr_msg (2, "Silly bug in Mindi.pl; workaround in progress...");
        strcpy(fnam, call_program_and_get_last_line_of_output("locate isolinux.bin | tail -n1"));
        if (strlen(fnam)>0 && does_file_exist(fnam))
@@ -1707 +1711 @@
        if (res)
        {
-       log_msg (2, "Could not work around silly bug in Mindi.pl - sorry! Isolinux.bin missing");
+       mr_msg (2, "Could not work around silly bug in Mindi.pl - sorry! Isolinux.bin missing");
        }
        }
@@ -1717 +1721 @@
     }
 
-    log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s",
+    mr_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s",
             bkpinfo->scratchdir, destfile);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
@@ -1741 +1745 @@
 
     if (bkpinfo->call_make_iso[0] != '\0') {
-        log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
+        mr_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
         sprintf(tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
         sprintf(message_to_screen, "Making an ISO (%s #%d)",
@@ -1790 +1794 @@
                 sprintf(sz_blank_disk, "dvd+rw-format -force %s",
                         bkpinfo->media_device);
-                log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
+                mr_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
                 res =
                     run_external_binary_with_percentage_indicator_NEW
@@ -1843 +1847 @@
                 media_descriptor_string(bkpinfo->backup_media_type),
                 g_current_media_number);
-        log_msg(1, message_to_screen);
+        mr_msg(1, message_to_screen);
         sprintf(result_sz, "Call to mkisofs to make ISO (%s #%d) ",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 g_current_media_number);
         if (bkpinfo->nonbootable_backup) {
-            log_msg(1, "Making nonbootable backup");
+            mr_msg(1, "Making nonbootable backup");
             res =
                 eval_call_to_make_ISO(bkpinfo,
@@ -1855 +1859 @@
                                       MONDO_LOGFILE, message_to_screen);
         } else {
-            log_msg(1, "Making bootable backup");
+            mr_msg(1, "Making bootable backup");
 
 #ifdef __FreeBSD__
@@ -1862 +1866 @@
 
 
-            log_msg(1, "make_cd_use_lilo is actually %d",
+            mr_msg(1, "make_cd_use_lilo is actually %d",
                     bkpinfo->make_cd_use_lilo);
             if (bkpinfo->make_cd_use_lilo) {
-                log_msg(1, "make_cd_use_lilo = TRUE");
+                mr_msg(1, "make_cd_use_lilo = TRUE");
 // FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
 // and add ' .' at end
 #ifdef __IA64__
-                log_msg(1, "IA64 --> elilo");
+                mr_msg(1, "IA64 --> elilo");
                 res = eval_call_to_make_ISO(bkpinfo,
                                             //-b images/mindi-boot.2880.img
@@ -1882 +1886 @@
 // FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
 // and add ' .' at end
-                log_msg(1, "Non-ia64 --> lilo");
+                mr_msg(1, "Non-ia64 --> lilo");
                 res =
                     eval_call_to_make_ISO(bkpinfo,
@@ -1891 +1895 @@
 #endif
             } else {
-                log_msg(1, "make_cd_use_lilo = FALSE");
-                log_msg(1, "Isolinux");
+                mr_msg(1, "make_cd_use_lilo = FALSE");
+                mr_msg(1, "Isolinux");
                 res =
                     eval_call_to_make_ISO(bkpinfo,
@@ -1913 +1917 @@
         || bkpinfo->backup_media_type == cdrw) {
         if (is_this_device_mounted(bkpinfo->media_device)) {
-            log_msg(2,
+            mr_msg(2,
                     "Warning - %s mounted. I'm unmounting it before I burn to it.",
                     bkpinfo->media_device);
@@ -1922 +1926 @@
 
     if (bkpinfo->call_burn_iso[0] != '\0') {
-        log_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
+        mr_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
         sprintf(message_to_screen, "Burning %s #%d",
                 media_descriptor_string(bkpinfo->backup_media_type),
@@ -1959 +1963 @@
     chdir(old_pwd);
     if (retval) {
-        log_msg(1, "WARNING - make_iso_fs returned an error");
+        mr_msg(1, "WARNING - make_iso_fs returned an error");
     }
     mr_free(old_pwd);
@@ -1987 +1991 @@
             "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1",
             bigfile_fname);
-    log_msg(1, "command = '%s'", command);
+    mr_msg(1, "command = '%s'", command);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    log_msg(1, "--> tmp = '%s'", tmp);
+    mr_msg(1, "--> tmp = '%s'", tmp);
     if (strstr(tmp, "NTFS")) {
         iamhere("TRUE");
@@ -2050 +2054 @@
         size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
 
-    log_msg(1, "size of all biggiefiles = %ld",
+    mr_msg(1, "size of all biggiefiles = %ld",
             size_of_all_biggiefiles_K(bkpinfo));
-    log_msg(1, "estimated_total_noof_slices = %ld KB / %ld KB = %ld",
+    mr_msg(1, "estimated_total_noof_slices = %ld KB / %ld KB = %ld",
             size_of_all_biggiefiles_K(bkpinfo), bkpinfo->optimal_set_size,
             estimated_total_noof_slices);
 
     if (length_of_file(biggielist_fname) < 6) {
-        log_msg(1, "No biggiefiles; fair enough...");
+        mr_msg(1, "No biggiefiles; fair enough...");
         return (0);
     }
@@ -2088 +2092 @@
             // Call ntfsclone (formerly partimagehack) if it's a /dev entry 
             // (i.e. a partition to be imaged)
-            log_msg(2, "bigfile_fname = %s", bigfile_fname);
+            mr_msg(2, "bigfile_fname = %s", bigfile_fname);
             use_ntfsprog = FALSE;
             if (!strncmp(bigfile_fname, "/dev/", 5)
                 && is_dev_an_NTFS_dev(bigfile_fname)) {
                 use_ntfsprog = TRUE;
-                log_msg(2,
+                mr_msg(2,
                         "Calling ntfsclone in background because %s is an NTFS partition",
                         bigfile_fname);
@@ -2106 +2110 @@
                     fatal_error("Fork failure");
                 case 0:
-                    log_msg(2,
+                    mr_msg(2,
                             "CHILD - fip - calling feed_into_ntfsprog(%s, %s)",
                             bigfile_fname, sz_devfile);
@@ -2113 +2117 @@
                     break;
                 default:
-                    log_msg(2,
+                    mr_msg(2,
                             "feed_into_ntfsprog() called in background --- pid=%ld",
                             (long int) (pid));
@@ -2169 +2173 @@
 #endif
     }
-    log_msg(1, "Finished backing up bigfiles");
-    log_msg(1, "estimated slices = %ld; actual slices = %ld",
+    mr_msg(1, "Finished backing up bigfiles");
+    mr_msg(1, "estimated slices = %ld; actual slices = %ld",
             estimated_total_noof_slices, g_current_progress);
     close_progress_form();
@@ -2233 +2237 @@
                 bkpinfo->tmpdir, curr_set_no, bkpinfo->zip_suffix);
 
-        log_msg(1, "EXAT'g set %ld", curr_set_no);
+        mr_msg(1, "EXAT'g set %ld", curr_set_no);
         if (g_getfattr) {
             sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
@@ -2245 +2249 @@
         }
 
-        log_msg(1, "Archiving set %ld", curr_set_no);
+        mr_msg(1, "Archiving set %ld", curr_set_no);
         res =
             archive_this_fileset(bkpinfo, curr_filelist_fname,
@@ -2349 +2353 @@
                                      BLK_START_AFIOBALLS);
 #if __FreeBSD__ == 5
-        log_msg(1,
+        mr_msg(1,
                 "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
         res = make_afioballs_and_images_OLD(bkpinfo);
@@ -2364 +2368 @@
     if (res) {
         mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-        log_msg(1, "make_afioballs_and_images returned an error");
+        mr_msg(1, "make_afioballs_and_images returned an error");
     } else {
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -2415 +2419 @@
     paranoid_system(command);
     sprintf(blah, "biggielist = %s", biggielist);
-    log_msg(2, blah);
+    mr_msg(2, blah);
 
     if (!does_file_exist(biggielist)) {
-        log_msg(1, "BTW, the biggielist does not exist");
+        mr_msg(1, "BTW, the biggielist does not exist");
     }
 
@@ -2445 +2449 @@
     retval += res;
     if (res) {
-        log_msg(1, "make_slices_and_images returned an error");
+        mr_msg(1, "make_slices_and_images returned an error");
         mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
     } else {
@@ -2515 +2519 @@
         strcpy(curr_file, cf);
         if (!does_file_exist(curr_file)) {
-            log_msg(1,
+            mr_msg(1,
                     "Warning - you're trying to add a non-existent file - '%s' to the CD",
                     curr_file);
         } else {
-            log_msg(8, "Trying to add file %s to CD", curr_file);
+            mr_msg(8, "Trying to add file %s to CD", curr_file);
             would_occupy += length_of_file(curr_file) / 1024;
         }
@@ -2532 +2536 @@
         retval += res;
         if (res) {
-            log_msg(1, "WARNING - write_iso_and_go_on returned an error");
+            mr_msg(1, "WARNING - write_iso_and_go_on returned an error");
         }
     }
@@ -2548 +2552 @@
         retval += res;
         if (res) {
-            log_msg(1, "(move_files_to_cd) '%s' failed", tmp);
+            mr_msg(1, "(move_files_to_cd) '%s' failed", tmp);
         } else {
-            log_msg(8, "Moved %s to CD OK", tmp);
+            mr_msg(8, "Moved %s to CD OK", tmp);
         }
         //      unlink (curr_file);
@@ -2557 +2561 @@
 
     if (retval) {
-        log_msg(1,
+        mr_msg(1,
                 "Warning - errors occurred while I was adding files to CD dir");
     }
@@ -2627 +2631 @@
         sprintf(bootdisk_dev, "/dev/fd0H1722");
     } else {
-        log_msg(1, "Warning - can't find a 1.72MB floppy device *sigh*");
+        mr_msg(1, "Warning - can't find a 1.72MB floppy device *sigh*");
         strcpy(bootdisk_dev, DEFAULT_1722MB_DISK);
 //      return (1);
@@ -2633 +2637 @@
     strcpy(datadisk_dev, "/dev/fd0");
     if (!does_device_exist(datadisk_dev)) {
-        log_msg(1, "Warning - can't find a 1.44MB floppy device *sigh*");
+        mr_msg(1, "Warning - can't find a 1.44MB floppy device *sigh*");
         strcpy(datadisk_dev, "/dev/fd0");
 //      return (1);
@@ -2691 +2695 @@
                 }
                 sprintf(tmp, "cat %s > %s", rootdisk_file, datadisk_dev);
-                log_msg(1, "tmp = '%s'", tmp);
+                mr_msg(1, "tmp = '%s'", tmp);
                 res +=
                     run_external_binary_with_percentage_indicator_NEW
@@ -2707 +2711 @@
     for (i = 1; i < 99; i++) {
         sprintf(tmp, "%s/mindi-data-%d.img", imagesdir, i);
-        log_msg(3, tmp);
+        mr_msg(3, tmp);
         if (!does_file_exist(tmp)) {
-            log_msg(3, "...not found");
+            mr_msg(3, "...not found");
             break;
         }
@@ -2837 +2841 @@
         strcpy(curr_file, cf);
         if (!does_file_exist(curr_file)) {
-            log_msg(1,
+            mr_msg(1,
                     "Warning - you're trying to add a non-existent file - '%s' to the tape",
                     curr_file);
@@ -2864 +2868 @@
 
     if (retval) {
-        log_msg(1,
+        mr_msg(1,
                 "Warning - errors occurred while I was adding file to tape");
     }
@@ -2907 +2911 @@
         } else {
             cdrecord[0] = '\0';
-            log_msg(2, "Oh well. I guess I'll just pray then.");
+            mr_msg(2, "Oh well. I guess I'll just pray then.");
         }
         if (cdrecord[0]) {
@@ -2919 +2923 @@
                         ("Unable to examine CD. Are you sure this is a valid CD-R(W) CD?"))
                     {
-                        log_msg(1, "Well, he insisted...");
+                        mr_msg(1, "Well, he insisted...");
                         break;
                     }
@@ -2990 +2994 @@
     if (!find_cdrom_device(cdrom_dev, FALSE)) {
 /* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
-      log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
+      mr_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
       retract_CD_tray_and_defeat_autorun();
 */
@@ -3003 +3007 @@
         if ((attempt_to_mount_returned_this =
              run_program_and_log_output(tmp, 1))) {
-            log_msg(4, "Failed to mount %s at %s", cdrom_dev, mtpt);
+            mr_msg(4, "Failed to mount %s at %s", cdrom_dev, mtpt);
             log_to_screen("If there's a CD/DVD in the drive, it's blank.");
             /*
@@ -3031 +3035 @@
         }
         run_program_and_log_output(szunmount, 1);
-        log_msg(2, "paafcd: cd_number = %d", cd_number);
-        log_msg(2, "our serial str = %s; g_serial_string = %s",
+        mr_msg(2, "paafcd: cd_number = %d", cd_number);
+        mr_msg(2, "our serial str = %s; g_serial_string = %s",
                 our_serial_str, g_serial_string);
         if (cd_number > 0 && !strcmp(our_serial_str, g_serial_string)) {
-            log_msg(2, "This %s is part of this backup set!",
+            mr_msg(2, "This %s is part of this backup set!",
                     media_descriptor_string(g_backup_media_type));
             ok_go_ahead_burn_it = FALSE;
@@ -3051 +3055 @@
         }
     } else {
-        log_msg(2,
+        mr_msg(2,
                 "paafcd: Can't find CD-ROM drive. Perhaps it has a blank %s in it?",
                 media_descriptor_string(g_backup_media_type));
@@ -3079 +3083 @@
         goto gotos_make_me_puke;
     } else {
-        log_msg(2, "paafcd: OK, going ahead and burning it.");
-    }
-
-    log_msg(2,
+        mr_msg(2, "paafcd: OK, going ahead and burning it.");
+    }
+
+    mr_msg(2,
             "paafcd: OK, I assume I have a blank/reusable %s in the drive...",
             media_descriptor_string(g_backup_media_type));
@@ -3241 +3245 @@
         file_to_openin = ntfsprog_fifo;
         strcpy(checksum_line, "IGNORE");
-        log_msg(2,
+        mr_msg(2,
                 "Not calculating checksum for %s: it would take too long",
                 biggie_filename);
@@ -3283 +3287 @@
     paranoid_fclose(fout);
     length = totallength / optimal_set_size / 1024;
-    log_msg(1, "Opening in %s; slicing it and writing to CD/tape",
+    mr_msg(1, "Opening in %s; slicing it and writing to CD/tape",
             file_to_openin);
     if (!(fin = fopen(file_to_openin, "r"))) {
@@ -3340 +3344 @@
         {
             if (!does_file_exist(curr_slice_fname_uncompressed)) {
-                log_msg(2,
+                mr_msg(2,
                         "Warning - '%s' doesn't exist. How can I compress slice?",
                         curr_slice_fname_uncompressed);
@@ -3348 +3352 @@
                         bkpinfo->compression_level,
                         curr_slice_fname_uncompressed);
-                log_msg(2, command);
+                mr_msg(2, command);
                 if ((res = system(command))) {
                     log_OS_error(command);
@@ -3362 +3366 @@
             retval += res;
             if (res) {
-                log_msg(2, "Failed to compress the slice");
+                mr_msg(2, "Failed to compress the slice");
             }
             if (bkpinfo->use_lzo
@@ -3382 +3386 @@
                 newtRefresh();
             } else {
-                log_msg(2, tmp);
+                mr_msg(2, tmp);
             }
 #else
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
 #endif
             strcpy(file_to_archive, curr_slice_fname_compressed);
@@ -3424 +3428 @@
         strcat(tmp, "...OK!");
     }
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
     mr_free(tempblock);
     mr_free(tmp);
@@ -3474 +3478 @@
     sprintf(tmp, "rm -f %s/zero", dir);
     run_program_and_log_output(tmp, FALSE);
-    log_msg(1, "Wiped %s's archives", dir);
+    mr_msg(1, "Wiped %s's archives", dir);
     sprintf(tmp, "ls -l %s", dir);
     run_program_and_log_output(tmp, FALSE);
@@ -3511 +3515 @@
 
     sprintf(tmp, "Writing the final ISO");
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     center_string(tmp, 80);
 #ifndef _XWIN
@@ -3524 +3528 @@
     }
 #endif
-    log_msg(2, "Returning from writing final ISO (res=%d)", res);
+    mr_msg(2, "Returning from writing final ISO (res=%d)", res);
     mr_free(tmp);
     return (res);
@@ -3582 +3586 @@
         using_nfs = FALSE;
     }
-    log_msg(1, "OK, time to make %s #%d",
+    mr_msg(1, "OK, time to make %s #%d",
             media_descriptor_string(bkpinfo->backup_media_type),
             g_current_media_number);
@@ -3596 +3600 @@
             bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp, FALSE)) {
-        log_msg(2, "Warning - unable to copy autorun to scratchdir");
+        mr_msg(2, "Warning - unable to copy autorun to scratchdir");
     }
 
@@ -3603 +3607 @@
     if (last_cd) {
         unlink(lastcd_fname);
-        log_msg(2,
+        mr_msg(2,
                 "OK, you're telling me this is the last CD. Fair enough.");
     } else {
@@ -3636 +3640 @@
             if (find_cdrom_device(tmp, FALSE))  // make sure find_cdrom_device() finds, records CD-R's loc
             {
-                log_msg(3, "*Sigh* Mike, I hate your computer.");
+                mr_msg(3, "*Sigh* Mike, I hate your computer.");
                 bkpinfo->manual_cd_tray = TRUE;
             }                   // if it can't be found then force pausing
             else {
-                log_msg(3, "Great. Found Mike's CD-ROM drive.");
+                mr_msg(3, "Great. Found Mike's CD-ROM drive.");
             }
         }
@@ -3666 +3670 @@
                 }
             } else {
-                log_msg(2, "Retrying, at user's request...");
+                mr_msg(2, "Retrying, at user's request...");
                 res = 0;
             }
@@ -3687 +3691 @@
             bkpinfo->scratchdir, bkpinfo->scratchdir);
     if (system(tmp)) {
-        log_msg
+        mr_msg
             (2,
              "Error occurred when I tried to delete the redundant IMGs and GZs");
@@ -3693 +3697 @@
 
     if (last_cd) {
-        log_msg(2, "This was your last CD.");
+        mr_msg(2, "This was your last CD.");
     } else {
-        log_msg(2, "Continuing to backup your data...");
+        mr_msg(2, "Continuing to backup your data...");
     }
 
@@ -3742 +3746 @@
         //bkpinfo->backup_media_type == cdrw || bkpinfo->backup_media_type == cdr))
     {
-        log_msg(2,
+        mr_msg(2,
                 "Not verifying again. Per-CD/ISO verification already carried out.");
         paranoid_system
@@ -3754 +3758 @@
         for (cdno = 1; cdno < 99 && bkpinfo->verify_data; cdno++) {
             if (cdno != g_current_media_number) {
-                log_msg(2,
+                mr_msg(2,
                         "Warning - had to change g_current_media_number from %d to %d",
                         g_current_media_number, cdno);
@@ -3857 +3861 @@
     }
     sprintf(tmp, "maxblocks = %d; p=%s", maxblocks, p);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     /* copy data from image to floppy */
     if (!(fin = fopen(datafile, "r"))) {
@@ -3871 +3875 @@
         if (fread(blk, 1, 1024, fin) != 1024) {
             if (feof(fin)) {
-                log_msg(1,
+                mr_msg(1,
                         "img read err - img ended prematurely - non-fatal error");
                 sleep(3);