Changeset 1086 in MondoRescue for trunk/mondo

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

Files:

• common/libmondo-archive.c (modified) (104 diffs)
• common/libmondo-devices.c (modified) (59 diffs)
• common/libmondo-fifo.c (modified) (4 diffs)
• common/libmondo-filelist.c (modified) (48 diffs)
• common/libmondo-files.c (modified) (9 diffs)
• common/libmondo-fork.c (modified) (28 diffs)
• common/libmondo-mountlist.c (modified) (6 diffs)
• common/libmondo-msg.c (modified) (1 diff)
• common/libmondo-raid.c (modified) (9 diffs)
• common/libmondo-stream.c (modified) (18 diffs)
• common/libmondo-tools.c (modified) (13 diffs)
• common/libmondo-verify.c (modified) (30 diffs)
• common/newt-specific.c (modified) (23 diffs)
• mondoarchive/main.c (modified) (9 diffs)
• mondoarchive/mondo-cli.c (modified) (18 diffs)
• mondorestore/mondo-prep.c (modified) (47 diffs)
• mondorestore/mondo-restore.c (modified) (102 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (13 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (72 diffs)

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

@@ -142 +142 @@
 
     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 +159 @@
     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 +177 @@
     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);
     }
@@ -237 +237 @@
     mr_free(command);
     command = tmp;
-    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);
         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;
         }
@@ -256 +256 @@
             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);
@@ -269 +269 @@
     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);
     }
@@ -348 +348 @@
         } else {
             mr_asprintf(&zipparams, " ");
-            log_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
+            mr_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
         }
         mr_free(tmp);
@@ -381 +381 @@
 
     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);
@@ -395 +395 @@
     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);
     }
@@ -410 +410 @@
             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) {
@@ -507 +507 @@
     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);
@@ -581 +581 @@
     mr_free(tmp);
     mr_asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     mr_free(tmp);
     mvaddstr_and_log_it(g_currentY, 0,
@@ -673 +673 @@
             mr_asprintf(&tmp, "User specified boot loader. It is '%c'.",
                      bkpinfo->boot_loader);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
             mr_free(tmp);
         } else {
@@ -681 +681 @@
             mr_asprintf(&tmp, "User specified boot device. It is '%s'.",
                      bkpinfo->boot_device);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
             mr_free(tmp);
             mr_free(bootdev);
@@ -759 +759 @@
     mr_asprintf(&tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, bkpinfo->boot_device)) {
-        log_msg(1, "%ld: Unable to write one-liner boot device", __LINE__);
+        mr_msg(1, "%ld: Unable to write one-liner boot device", __LINE__);
     }
     mr_free(tmp);
@@ -797 +797 @@
     if (write_one_liner_data_file(tmp, value)) {
         res++;
-        log_msg(1, "%ld: Unable to write one-liner backup-media-type",
+        mr_msg(1, "%ld: Unable to write one-liner backup-media-type",
                 __LINE__);
     }
@@ -806 +806 @@
     if (write_one_liner_data_file(tmp, bootldr_str)) {
         res++;
-        log_msg(1, "%ld: Unable to write one-liner bootloader.name",
+        mr_msg(1, "%ld: Unable to write one-liner bootloader.name",
                 __LINE__);
     }
@@ -822 +822 @@
         mr_asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
-            log_msg(1, "%ld: Unable to write one-liner XATTR",
+            mr_msg(1, "%ld: Unable to write one-liner XATTR",
                 __LINE__);
         }
@@ -830 +830 @@
         mr_asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
-            log_msg(1, "%ld: Unable to write one-liner ACL",
+            mr_msg(1, "%ld: Unable to write one-liner ACL",
                 __LINE__);
         }
@@ -857 +857 @@
     mr_free(tmp);
 
-    log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
+    mr_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
 
     if (bkpinfo->backup_media_type == usb) {
@@ -911 +911 @@
     mr_free(tmp2);
 
-    log_msg(2, command);
+    mr_msg(2, command);
 
     //  popup_and_OK("Pausing");
@@ -924 +924 @@
         log_to_screen("Boot+data disks were created OK");
         mr_asprintf(&command, "mkdir -p /var/cache/mindi/");
-        log_msg(2, command);
+        mr_msg(2, command);
         run_program_and_log_output(command, FALSE);
         mr_free(command);
@@ -931 +931 @@
                  "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);
         mr_free(command);
@@ -945 +945 @@
         mr_asprintf(&command, "cp -f %s/mindi-*oot*.img %s/images",
                  bkpinfo->tmpdir, bkpinfo->scratchdir);
-        log_msg(2, command);
+        mr_msg(2, command);
         run_program_and_log_output(command, FALSE);
         mr_free(command);
@@ -1047 +1047 @@
         }
         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");
         }
@@ -1064 +1064 @@
                  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,
@@ -1076 +1076 @@
                  archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
-            log_msg(4, "%s[%d:%d] - waiting for storer",
+            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());
+            mr_msg(4, "[%d] - continuing", getpid());
         }
         mr_free(tmp);
 
-        log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
+        mr_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
                 this_thread_no, archiving_set_no);
         if (g_getfattr) {
@@ -1100 +1100 @@
         }
 
-        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 = archive_this_fileset(bkpinfo, archiving_filelist_fname,
@@ -1129 +1129 @@
             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++;
@@ -1142 +1142 @@
         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);
@@ -1171 +1171 @@
                         "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 */
@@ -1180 +1180 @@
         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.");
@@ -1234 +1234 @@
     mr_free(g_serial_string);
     g_serial_string = tmp;
-    log_msg(2, "g_serial_string = '%s'", g_serial_string);
+    mr_msg(2, "g_serial_string = '%s'", g_serial_string);
 
     mr_asprintf(&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__);
     }
     mr_free(g_serial_string);
@@ -1253 +1253 @@
             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");
     }
     mr_free(data_disks_file);
@@ -1324 +1324 @@
     mr_asprintf(&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"))) {
@@ -1340 +1340 @@
         trackno = get_trackno_from_logfile(tempfile);
         if (trackno < 0 || trackno > 80) {
-            log_msg(1, "Weird track#");
+            mr_msg(1, "Weird track#");
             continue;
         }
@@ -1481 +1481 @@
     int misc_counter_that_is_not_important = 0;
 
-    log_msg(8, "here");
+    mr_msg(8, "here");
     assert(bkpinfo != NULL);
     /* BERLIOS: To be removed */
@@ -1501 +1501 @@
     *p_next_set_to_archive = 0;
     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."),
@@ -1508 +1508 @@
                        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());
@@ -1521 +1521 @@
     }                           // 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 =
@@ -1531 +1531 @@
     }
 
-    log_msg(8, "About to enter while() loop");
+    mr_msg(8, "About to enter while() loop");
     while (!done_storing) {
         if (g_exiting) {
@@ -1538 +1538 @@
         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);
@@ -1572 +1572 @@
             }
 
-            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);
@@ -1644 +1644 @@
     close_progress_form();
 
-    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) {
         mr_asprintf(&tmp,
@@ -1734 +1734 @@
     }
 
-    log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s",
+    mr_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s",
             bkpinfo->scratchdir, destfile);
     /* BERLIOS: Do not ignore getcwd result */
@@ -1759 +1759 @@
 
     if (bkpinfo->call_make_iso != NULL) {
-        log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
+        mr_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
         mr_asprintf(&tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
         mr_asprintf(&message_to_screen, "Making an ISO (%s #%d)",
@@ -1808 +1808 @@
                 mr_asprintf(&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
                     ("Blanking DVD disk", sz_blank_disk);
@@ -1862 +1862 @@
                  bkpinfo->backup_media_string,
                  g_current_media_number);
-        log_msg(1, message_to_screen);
+        mr_msg(1, message_to_screen);
         mr_asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ",
                  bkpinfo->backup_media_string,
                  g_current_media_number);
         if (bkpinfo->nonbootable_backup) {
-            log_msg(1, "Making nonbootable backup");
+            mr_msg(1, "Making nonbootable backup");
 // FIXME --- change mkisofs string to MONDO_MKISOFS_NONBOOTABLE and add ' .' at end
             res = eval_call_to_make_ISO(bkpinfo,
@@ -1874 +1874 @@
                                         MONDO_LOGFILE, message_to_screen);
         } else {
-            log_msg(1, "Making bootable backup");
+            mr_msg(1, "Making bootable backup");
 
 #ifdef __FreeBSD__
@@ -1881 +1881 @@
 
 
-            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");
                 mr_asprintf(&tmp2,"mkisofs -no-emul-boot -b images/mindi-bootroot.%s.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", bkpinfo->mrconf->mindi_ia64_boot_size);
                 res = eval_call_to_make_ISO(bkpinfo,
@@ -1900 +1900 @@
 // and add ' .' at end
                 mr_free(tmp2);
-                log_msg(1, "Non-ia64 --> lilo");
+                mr_msg(1, "Non-ia64 --> lilo");
                 res = eval_call_to_make_ISO(bkpinfo,
                                             "mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
@@ -1909 +1909 @@
 #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,
                                             "mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
@@ -1932 +1932 @@
         || 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);
@@ -1942 +1942 @@
 
     if (bkpinfo->call_burn_iso != NULL) {
-        log_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
+        mr_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
         mr_asprintf(&message_to_screen, "Burning %s #%d",
                  bkpinfo->backup_media_string,
@@ -1977 +1977 @@
     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);
@@ -1992 +1992 @@
              "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);
     tmp = call_program_and_get_last_line_of_output(command);
-    log_msg(1, "--> tmp = '%s'", tmp);
+    mr_msg(1, "--> tmp = '%s'", tmp);
     mr_free(command);
     if (strstr(tmp, "NTFS")) {
@@ -2055 +2055 @@
         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);
     }
@@ -2095 +2095 @@
             // 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);
@@ -2113 +2113 @@
                     fatal_error("Fork failure");
                 case 0:
-                    log_msg(2,
+                    mr_msg(2,
                             "CHILD - fip - calling feed_into_ntfsprog(%s, %s)",
                             bigfile_fname, sz_devfile);
@@ -2120 +2120 @@
                     break;
                 default:
-                    log_msg(2,
+                    mr_msg(2,
                             "feed_into_ntfsprog() called in background --- pid=%ld",
                             (long int) (pid));
@@ -2133 +2133 @@
 
             // Whether partition or biggiefile, just do your thang :-)
-            log_msg(2, "Bigfile #%ld is '%s' (%ld KB)",
+            mr_msg(2, "Bigfile #%ld is '%s' (%ld KB)",
                     biggie_file_number + 1, bigfile_fname,
                     (long) biggie_fsize >> 10);
@@ -2180 +2180 @@
     paranoid_fclose(fin);
 
-    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();
@@ -2229 +2229 @@
                  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) {
             mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
@@ -2241 +2241 @@
         }
 
-        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,
                                    curr_afioball_fname, curr_set_no);
@@ -2349 +2349 @@
                                      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 +2364 @@
     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.");
@@ -2413 +2413 @@
 
     mr_asprintf(&blah, "biggielist = %s", biggielist);
-    log_msg(2, blah);
+    mr_msg(2, blah);
     mr_free(blah);
 
     if (!does_file_exist(biggielist)) {
-        log_msg(1, "BTW, the biggielist does not exist");
+        mr_msg(1, "BTW, the biggielist does not exist");
     }
 
@@ -2457 +2457 @@
     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 {
@@ -2519 +2519 @@
         mr_asprintf(&curr_file, "%s", 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;
         }
@@ -2538 +2538 @@
         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");
         }
     }
@@ -2554 +2554 @@
         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);
         }
         mr_free(tmp);
@@ -2565 +2565 @@
 
     if (retval) {
-        log_msg(1,
+        mr_msg(1,
                 "Warning - errors occurred while I was adding files to CD dir");
     }
@@ -2621 +2621 @@
         mr_asprintf(&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*");
         mr_asprintf(&bootdisk_dev, DEFAULT_1722MB_DISK);
     }
     mr_asprintf(&datadisk_dev, "%s", "/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*");
         mr_free(datadisk_dev);
         mr_asprintf(&datadisk_dev, "%s", "/dev/fd0");
@@ -2686 +2686 @@
                 }
                 mr_asprintf(&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 +2707 @@
     for (i = 1; i < 99; i++) {
         mr_asprintf(&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;
         }
@@ -2830 +2830 @@
         mr_asprintf(&curr_file, "%s", 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);
@@ -2858 +2858 @@
 
     if (retval) {
-        log_msg(1,
+        mr_msg(1,
                 "Warning - errors occurred while I was adding file to tape");
     }
@@ -2890 +2890 @@
         } else {
             mr_asprintf(&cdrecord, " ");
-            log_msg(2, "Found no cdrecord nor dvdrecord in path.");
+            mr_msg(2, "Found no cdrecord nor dvdrecord in path.");
         }
         if (cdrecord[0]) {
@@ -2944 +2944 @@
     if (cdrom_dev != NULL) {
 /* 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();
 */
@@ -2957 +2957 @@
         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.");
             mr_asprintf(&our_serial_str, "%s", "");
@@ -2984 +2984 @@
         mr_free(szunmount);
 
-        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!",
                     g_backup_media_string);
             ok_go_ahead_burn_it = FALSE;
@@ -3005 +3005 @@
         mr_free(our_serial_str);
     } else {
-        log_msg(2,
+        mr_msg(2,
                 "paafcd: Can't find CD-ROM drive. Perhaps it has a blank %s in it?",
                 g_backup_media_string);
@@ -3028 +3028 @@
         goto gotos_make_me_puke;
     } else {
-        log_msg(2, "paafcd: OK, going ahead and burning it.");
+        mr_msg(2, "paafcd: OK, going ahead and burning it.");
     }
     mr_free(cdrom_dev);
 
-    log_msg(2,
+    mr_msg(2,
             "paafcd: OK, I assume I have a blank/reusable %s in the drive...",
             g_backup_media_string);
@@ -3161 +3161 @@
         file_to_openin = ntfsprog_fifo;
         mr_asprintf(&checksum_line, "IGNORE");
-        log_msg(2,
+        mr_msg(2,
                 "Not calculating checksum for %s: it would take too long",
                 biggie_filename);
@@ -3221 +3221 @@
     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"))) {
@@ -3279 +3279 @@
         {
             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);
@@ -3287 +3287 @@
                          bkpinfo->compression_level,
                          curr_slice_fname_uncompressed);
-                log_msg(2, command);
+                mr_msg(2, command);
                 if ((res = system(command))) {
                     log_OS_error(command);
@@ -3303 +3303 @@
             retval += res;
             if (res) {
-                log_msg(2, "Failed to compress the slice");
+                mr_msg(2, "Failed to compress the slice");
             }
             if (bkpinfo->use_lzo
@@ -3323 +3323 @@
                 newtRefresh();
             } else {
-                log_msg(2, tmp);
+                mr_msg(2, tmp);
             }
 #else
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
 #endif
             mr_free(tmp);
@@ -3373 +3373 @@
                  biggie_file_number + 1);
     }
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
     mr_free(tmp);
     return (retval);
@@ -3421 +3421 @@
     mr_free(tmp);
 
-    log_msg(1, "Wiped %s's archives", dir);
+    mr_msg(1, "Wiped %s's archives", dir);
     mr_asprintf(&tmp, "ls -l %s", dir);
     run_program_and_log_output(tmp, FALSE);
@@ -3457 +3457 @@
 
     mr_asprintf(&tmp, "Writing the final ISO");
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     /* BERLIOS: center_string is now broken
        center_string(tmp, 80);
@@ -3473 +3473 @@
     }
 #endif
-    log_msg(2, "Returning from writing final ISO (res=%d)", res);
+    mr_msg(2, "Returning from writing final ISO (res=%d)", res);
     return (res);
 }
@@ -3525 +3525 @@
         using_nfs = FALSE;
     }
-    log_msg(1, "OK, time to make %s #%d",
+    mr_msg(1, "OK, time to make %s #%d",
             bkpinfo->backup_media_string,
             g_current_media_number);
@@ -3541 +3541 @@
              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");
     }
     mr_free(tmp);
@@ -3550 +3550 @@
     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 {
@@ -3579 +3579 @@
             if ((tmp = find_cdrom_device(FALSE)) == NULL)   // 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.");
                 mr_free(tmp);
             }
@@ -3611 +3611 @@
                 }
             } else {
-                log_msg(2, "Retrying, at user's request...");
+                mr_msg(2, "Retrying, at user's request...");
                 res = 0;
             }
@@ -3634 +3634 @@
              bkpinfo->scratchdir, bkpinfo->scratchdir);
     if (system(tmp)) {
-        log_msg(2,
+        mr_msg(2,
                 "Error occurred when I tried to delete the redundant IMGs and GZs");
     }
@@ -3640 +3640 @@
 
     if (last_cd) {
-        log_msg(2, "This was your last CD.");
-    } else {
-        log_msg(2, "Continuing to backup your data...");
+        mr_msg(2, "This was your last CD.");
+    } else {
+        mr_msg(2, "Continuing to backup your data...");
     }
 
@@ -3682 +3682 @@
         //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
@@ -3694 +3694 @@
         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);
@@ -3787 +3787 @@
     }
     mr_asprintf(&tmp, "maxblocks = %d; p=%s", maxblocks, p);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     mr_free(tmp);
 
@@ -3803 +3803 @@
         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);

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

@@ -133 +133 @@
     }
 
-    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device,
+    mr_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device,
             mountpoint);
     /*@ end vars *************************************************** */
@@ -145 +145 @@
 #endif
 
-    log_msg(4, command);
+    mr_msg(4, command);
     if (strncmp(device, "/dev/", 5) == 0) {
         retract_CD_tray_and_defeat_autorun();
     }
     retval = system(command);
-    log_msg(1, "system(%s) returned %d", command, retval);
+    mr_msg(1, "system(%s) returned %d", command, retval);
     mr_free(command);
 
@@ -174 +174 @@
     mr_asprintf(&tmp, where_is_root_mounted());
     mr_asprintf(&comment, "root is mounted at %s\n", tmp);
-    log_msg(0, comment);
+    mr_msg(0, comment);
     mr_free(comment);
 
-    log_msg(0,
+    mr_msg(0,
             "No, Schlomo, that doesn't mean %s is the root partition. It's just a debugging message. Relax. It's part of am_I_in_disaster_recovery_mode().",
             tmp);
@@ -208 +208 @@
         is_this_a_ramdisk = TRUE;
     }
-    log_msg(1, "Is this a ramdisk? result = %d", is_this_a_ramdisk);
+    mr_msg(1, "Is this a ramdisk? result = %d", is_this_a_ramdisk);
     return (is_this_a_ramdisk);
 }
@@ -291 +291 @@
 #endif
 
-    log_msg(3, "Ejecting %s", dev);
+    mr_msg(3, "Ejecting %s", dev);
     res2 = run_program_and_log_output(command, 1);
     mr_free(command);
@@ -543 +543 @@
     }
     if (res) {
-        log_msg(1, _("mount failed"));
-    } else {
-        log_msg(1, _("mount succeeded with %s"), dev);
+        mr_msg(1, _("mount failed"));
+    } else {
+        mr_msg(1, _("mount succeeded with %s"), dev);
     }
     mr_free(dev);
@@ -568 +568 @@
     if (g_cdrw_drive_is_here != NULL) {
         mr_asprintf(&cdrw_device, g_cdrw_drive_is_here);
-        log_msg(3, "Been there, done that. Returning %s", cdrw_device);
+        mr_msg(3, "Been there, done that. Returning %s", cdrw_device);
         return(cdrw_device);
     }
     if (g_backup_media_type == dvd) {
-        log_msg(1,
+        mr_msg(1,
                 "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
         return(NULL);
@@ -652 +652 @@
     if ((g_cdrom_drive_is_here != NULL) && !isdigit(g_cdrom_drive_is_here[0])) {
         mr_asprintf(&output, g_cdrom_drive_is_here);
-        log_msg(3, "Been there, done that. Returning %s", output);
+        mr_msg(3, "Been there, done that. Returning %s", output);
         return(output);
     }
     if ((the_last_place_i_found_it != NULL) && !try_to_mount) {
         mr_asprintf(&output, the_last_place_i_found_it);
-        log_msg(3,
+        mr_msg(3,
                 "find_cdrom_device() --- returning last found location - '%s'",
                 output);
@@ -674 +674 @@
     if (!tmp) {
         mr_asprintf(&output, "/dev/cdrom");
-        log_msg(4, "Can't find cdrecord; assuming %s", output);
+        mr_msg(4, "Can't find cdrecord; assuming %s", output);
         if (!does_device_exist(output)) {
-            log_msg(4, "That didn't work. Sorry.");
+            mr_msg(4, "That didn't work. Sorry.");
             mr_free(cdr_exe);
             mr_free(output);
@@ -690 +690 @@
     fin = popen(command, "r");
     if (!fin) {
-        log_msg(4, "command=%s", command);
+        mr_msg(4, "command=%s", command);
         log_OS_error("Cannot popen command");
         mr_free(cdr_exe);
@@ -730 +730 @@
 #ifndef __FreeBSD__
     if (strlen(phrase_two) == 0) {
-        log_msg(4, "Not running phase two. String is empty.");
+        mr_msg(4, "Not running phase two. String is empty.");
     } else {
         mr_asprintf(&command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
         fin = popen(command, "r");
         if (!fin) {
-            log_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
+            mr_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
         } else {
             for (mr_getline(&tmp, &n, fin); !feof(fin);
                  mr_getline(&tmp, &n, fin)) {
-                log_msg(5, "--> '%s'", tmp);
+                mr_msg(5, "--> '%s'", tmp);
                 if (tmp[0] != ' ' && tmp[1] != ' ') {
                     p = strchr(tmp, ':');
@@ -747 +747 @@
                             mr_free(dvd_last_resort);
                             mr_asprintf(&dvd_last_resort, "/dev/%s", tmp);
-                            log_msg(4,
+                            mr_msg(4,
                                     "Ignoring '%s' because it's a DVD drive",
                                     tmp);
@@ -767 +767 @@
 #ifdef __FreeBSD__
     if (!found_it) {
-        log_msg(4, "OK, approach 2");
+        mr_msg(4, "OK, approach 2");
         if (!(found_it = set_dev_to_this_if_rx_OK(output, "/dev/cdrom"))) {
             if (!
@@ -804 +804 @@
     if (dvd_last_resort != NULL) {
         if (!found_it && strlen(dvd_last_resort) > 0) {
-            log_msg(4, "Well, I'll use the DVD - %s - as a last resort",
+            mr_msg(4, "Well, I'll use the DVD - %s - as a last resort",
                     dvd_last_resort);
             mr_free(output);
@@ -817 +817 @@
                 strrchr(output, '/') + 1);
         if (system(tmp) == 0) {
-            log_msg(4,
+            mr_msg(4,
                     "%s is not right. It's being SCSI-emulated. Continuing.",
                     output);
@@ -827 +827 @@
 
     if (found_it) {
-        log_msg(4, "(find_cdrom_device) --> '%s'", output);
+        mr_msg(4, "(find_cdrom_device) --> '%s'", output);
         if (!does_device_exist(output)) {
-            log_msg(4, "OK, I was wrong, I haven't found it... yet.");
+            mr_msg(4, "OK, I was wrong, I haven't found it... yet.");
             found_it = FALSE;
             mr_free(output);
@@ -836 +836 @@
 
     if (!found_it) {
-        log_msg(4, "OK, approach 2");
+        mr_msg(4, "OK, approach 2");
         if (!(found_it = set_dev_to_this_if_rx_OK(output, "/dev/scd0"))) {
             if (!(found_it = set_dev_to_this_if_rx_OK(output, "/dev/sr0"))) {
@@ -882 +882 @@
     if (found_it && try_to_mount) {
         if (! mount_CDROM_here(output, mountpoint)) {
-            log_msg(4, "[Cardigans] I've changed my mind");
+            mr_msg(4, "[Cardigans] I've changed my mind");
             found_it = FALSE;
             mr_free(output);
@@ -888 +888 @@
             mr_asprintf(&tmp, "%s/archives", mountpoint);
             if (!does_file_exist(tmp)) {
-                log_msg(4, "[Cardigans] I'll take it back");
+                mr_msg(4, "[Cardigans] I'll take it back");
                 found_it = FALSE;
                 mr_free(output);
@@ -895 +895 @@
                 paranoid_system(command);
                 mr_free(command);
-                log_msg(4, "I'm confident the Mondo CD is in %s", output);
+                mr_msg(4, "I'm confident the Mondo CD is in %s", output);
             }
             mr_free(tmp);
@@ -905 +905 @@
     if (found_it) {
         if (!does_file_exist(output)) {
-            log_msg(3, "I still haven't found it.");
+            mr_msg(3, "I still haven't found it.");
             mr_free(output);
             return(NULL);
         }
-        log_msg(3, "(find_cdrom_device) --> '%s'", output);
+        mr_msg(3, "(find_cdrom_device) --> '%s'", output);
         mr_asprintf(&the_last_place_i_found_it, output);
         mr_free(g_cdrom_drive_is_here);
@@ -921 +921 @@
     mr_free(cdr_exe);
 
-    log_msg(1, "command=%s", command);
+    mr_msg(1, "command=%s", command);
     mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -927 +927 @@
     if (tmp[0]) {
         output = tmp;
-        log_msg(4, "Finally found it at %s", output);
+        mr_msg(4, "Finally found it at %s", output);
     } else {
         mr_free(tmp);
         mr_free(output);
-        log_msg(4, "Still couldn't find it.");
+        mr_msg(4, "Still couldn't find it.");
     }
     return(output);
@@ -945 +945 @@
     if (g_dvd_drive_is_here != NULL) {
         mr_asprintf(&output, g_dvd_drive_is_here);
-        log_msg(3, "Been there, done that. Returning %s", output);
+        mr_msg(3, "Been there, done that. Returning %s", output);
         return (output);
     }
@@ -952 +952 @@
             ("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
         );
-    log_msg(5, "tmp = '%s'", tmp);
+    mr_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0]) {
         mr_free(tmp);
@@ -969 +969 @@
         mr_free(g_dvd_drive_is_here);
         mr_asprintf(&g_dvd_drive_is_here, output);
-        log_msg(2, "I think DVD is at %s", output);
-    } else {
-        log_msg(2, "I cannot find DVD");
+        mr_msg(2, "I think DVD is at %s", output);
+    } else {
+        mr_msg(2, "I cannot find DVD");
     }
 
@@ -1032 +1032 @@
 
     if (outvalB <= 0) {
-        log_msg(1, "Error getting size of %s: %s", drive, strerror(errno));
+        mr_msg(1, "Error getting size of %s: %s", drive, strerror(errno));
 #if linux
     fileid = open(drive, O_RDONLY);
@@ -1041 +1041 @@
                 cylindersize = hdgeo.heads * hdgeo.sectors / 2;
                 outvalA = cylindersize * cylinders / 1024;
-                log_msg(2, "Got Harddisk geometry, C:%d, H:%d, S:%d",
+                mr_msg(2, "Got Harddisk geometry, C:%d, H:%d, S:%d",
                         hdgeo.cylinders, hdgeo.heads, hdgeo.sectors);
                 gotgeo = 1;
             } else {
-                log_msg(1, "Harddisk geometry wrong");
+                mr_msg(1, "Harddisk geometry wrong");
             }
         } else {
-            log_msg(1,
+            mr_msg(1,
                     "Error in ioctl() getting new hard disk geometry (%s), resizing in unsafe mode",
                     strerror(errno));
@@ -1054 +1054 @@
         close(fileid);
     } else {
-        log_msg(1, "Failed to open %s for reading: %s", drive,
+        mr_msg(1, "Failed to open %s for reading: %s", drive,
                 strerror(errno));
     }
     if (!gotgeo) {
-        log_msg(1, "Failed to get harddisk geometry, using old mode");
+        mr_msg(1, "Failed to get harddisk geometry, using old mode");
     }
 #endif
@@ -1067 +1067 @@
     outvalC = (outvalA > outvalB) ? outvalA : outvalB;
 
-//  log_msg (5, "drive = %s, error = %s", drive, strerror (errno));
+//  mr_msg (5, "drive = %s, error = %s", drive, strerror (errno));
 //  fatal_error ("GPSOD: Unable to get size of drive");
-    log_msg(1, "%s --> %ld or %ld --> %ld", drive, outvalA, outvalB,
+    mr_msg(1, "%s --> %ld or %ld --> %ld", drive, outvalA, outvalB,
             outvalC);
 
@@ -1164 +1164 @@
 //  assert_string_is_neither_NULL_nor_zerolength(device_raw);
     if (device_raw[0] != '/' && !strstr(device_raw, ":/")) {
-        log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
+        mr_msg(1, "%s needs to have a '/' prefixed - I'll do it",
                 device_raw);
         mr_asprintf(&tmp, "/%s", device_raw);
@@ -1170 +1170 @@
         mr_asprintf(&tmp, device_raw);
     }
-    log_msg(1, "Is %s mounted?", tmp);
+    mr_msg(1, "Is %s mounted?", tmp);
     if (!strcmp(tmp, "/proc") || !strcmp(tmp, "proc")) {
-        log_msg(1,
+        mr_msg(1,
                 "I don't know how the heck /proc made it into the mountlist. I'll ignore it.");
         return (FALSE);
@@ -1201 +1201 @@
     mr_free(device_with_space);
 
-    log_msg(4, "tmp (command) = '%s'", tmp);
+    mr_msg(4, "tmp (command) = '%s'", tmp);
     if (!system(tmp)) {
         mr_free(tmp);
@@ -1321 +1321 @@
     assert(cd_number_i_want > 0);
 
-//  log_msg(3, "Insisting on CD number %d", cd_number_i_want);
+//  mr_msg(3, "Insisting on CD number %d", cd_number_i_want);
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        log_msg(3,
+        mr_msg(3,
                 "No need to insist_on_this_cd_number when the backup type isn't CD-R(W) or NFS or ISO");
         return;
@@ -1335 +1335 @@
     if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso
         || bkpinfo->backup_media_type == nfs) {
-        log_msg(3, "Remounting CD");
+        mr_msg(3, "Remounting CD");
         g_ISO_restore_mode = TRUE;
 // FIXME --- I'm tempted to do something about this...
@@ -1352 +1352 @@
                     cd_number_i_want);
             if (does_file_exist(tmp)) {
-                log_msg(1,
+                mr_msg(1,
                         "FIXME - hacking bkpinfo->isodir from '%s' to /tmp/isodir",
                         bkpinfo->isodir);
@@ -1358 +1358 @@
             }
         }
-        log_msg(3, "Mounting %s at %s", tmp, MNT_CDROM);
+        mr_msg(3, "Mounting %s at %s", tmp, MNT_CDROM);
         if (! mount_CDROM_here(tmp, MNT_CDROM)) {
             fatal_error("Mommy!");
@@ -1365 +1365 @@
     }
     if ((res = what_number_cd_is_this(bkpinfo)) != cd_number_i_want) {
-        log_msg(3, "Currently, we hold %d but we want %d", res,
+        mr_msg(3, "Currently, we hold %d but we want %d", res,
                 cd_number_i_want);
         mr_asprintf(&tmp, "Insisting on %s #%d",
@@ -1373 +1373 @@
                 bkpinfo->backup_media_string,
                 cd_number_i_want);
-        log_msg(3, tmp);
+        mr_msg(3, tmp);
         mr_free(tmp);
 
@@ -1403 +1403 @@
         mr_free(request);
 
-        log_msg(1, "Thankyou. Proceeding...");
+        mr_msg(1, "Thankyou. Proceeding...");
         g_current_media_number = cd_number_i_want;
     }
@@ -1452 +1452 @@
     }
     bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
-    log_msg(3, "media type = %s",bkpinfo->backup_media_string);
+    mr_msg(3, "media type = %s",bkpinfo->backup_media_string);
 
     if (archiving_to_media) {
@@ -1490 +1490 @@
                 mr_asprintf(&tmp, "1");
                 mr_asprintf(&sz_size, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4582 MB
-                log_msg(1, "Setting to DVD defaults");
+                mr_msg(1, "Setting to DVD defaults");
             } else if (bkpinfo->backup_media_type == usb) {
                 strcpy(bkpinfo->media_device, VANILLA_USB_DEVICE);
@@ -1498 +1498 @@
                 mr_asprintf(&tmp, "4");
                 mr_asprintf(&sz_size, "650");
-                log_msg(1, "Setting to CD defaults");
+                mr_msg(1, "Setting to CD defaults");
             }
             if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
@@ -1534 +1534 @@
         if (bkpinfo->disaster_recovery) {
             mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
-            log_msg(2, "CD-ROM device assumed to be at %s",
+            mr_msg(2, "CD-ROM device assumed to be at %s",
                     bkpinfo->media_device);
         } else if (bkpinfo->restore_data
@@ -1541 +1541 @@
                 mr_asprintf(&bkpinfo->media_device, "/dev/cdrom");
             }                   // just for the heck of it :)
-            log_msg(1, "bkpinfo->media_device = %s",
+            mr_msg(1, "bkpinfo->media_device = %s",
                     bkpinfo->media_device);
             tmp = find_cdrom_device(FALSE);
@@ -1547 +1547 @@
                 || (tmp != NULL)) {
                 mr_allocstr(bkpinfo->media_device, tmp);
-                log_msg(1, "bkpinfo->media_device = %s",
+                mr_msg(1, "bkpinfo->media_device = %s",
                         bkpinfo->media_device);
                 mr_asprintf(&comment,
@@ -1561 +1561 @@
             mr_free(tmp);
 
-            log_msg(2, "%s device found at %s",
+            mr_msg(2, "%s device found at %s",
                     bkpinfo->backup_media_string,
                     bkpinfo->media_device);
@@ -1607 +1607 @@
         mr_free(bkpinfo->media_device);
         if (find_tape_device_and_size(bkpinfo->media_device, sz_size)) {
-            log_msg(3, _("Ok, using vanilla scsi tape."));
+            mr_msg(3, _("Ok, using vanilla scsi tape."));
             mr_allocstr(bkpinfo->media_device,VANILLA_SCSI_TAPE"0" );
             if ((fin = fopen(bkpinfo->media_device, "r"))) {
@@ -1647 +1647 @@
         }
         mr_free(tmp);
-        log_msg(4, "sz_size = %s", sz_size);
+        mr_msg(4, "sz_size = %s", sz_size);
         mr_free(sz_size);
         bkpinfo->media_size[0] = 0;
-        log_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]);
+        mr_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]);
         if (bkpinfo->media_size[0] <= 0) {
             bkpinfo->media_size[0] = 0;
@@ -1781 +1781 @@
             finish(1);
         }
-        log_msg(3, "prefix set to %s", bkpinfo->prefix);
+        mr_msg(3, "prefix set to %s", bkpinfo->prefix);
 
         for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
             bkpinfo->media_size[i] = 650;
         }
-        log_msg(3, "Just set nfs_remote_dir to %s",
+        mr_msg(3, "Just set nfs_remote_dir to %s",
                 bkpinfo->nfs_remote_dir);
-        log_msg(3, "isodir is still %s", bkpinfo->isodir);
+        mr_msg(3, "isodir is still %s", bkpinfo->isodir);
         break;
 
@@ -1828 +1828 @@
             finish(1);
         }
-        log_msg(3, "prefix set to %s", bkpinfo->prefix);
+        mr_msg(3, "prefix set to %s", bkpinfo->prefix);
         break;
     default:
@@ -1974 +1974 @@
 #else
     if (bkpinfo->backup_media_type == nfs) {
-        log_msg(3, "I think the NFS mount is mounted at %s",
+        mr_msg(3, "I think the NFS mount is mounted at %s",
                 bkpinfo->isodir);
     }
@@ -1997 +1997 @@
             fatal_error("Media size is less than zero.");
         } else {
-            log_msg(2, "Warning - media size is less than zero.");
+            mr_msg(2, "Warning - media size is less than zero.");
             bkpinfo->media_size[0] = 0;
         }
@@ -2092 +2092 @@
         return (FALSE);
     }
-    log_msg(10, "Injecting %s", dev);
+    mr_msg(10, "Injecting %s", dev);
     inject_device(dev);
     if (!does_file_exist(dev)) {
-        log_msg(10, "%s doesn't exist. Returning FALSE.", dev);
+        mr_msg(10, "%s doesn't exist. Returning FALSE.", dev);
         return (FALSE);
     }
@@ -2103 +2103 @@
         && !run_program_and_log_output(command, FALSE)) {
         mr_asprintf(&output, dev);
-        log_msg(4, "Found it - %s", dev);
+        mr_msg(4, "Found it - %s", dev);
         mr_free(command);
         return (TRUE);
     } else {
-        log_msg(4, "It's not %s", dev);
+        mr_msg(4, "It's not %s", dev);
         mr_free(command);
         return (FALSE);
@@ -2365 +2365 @@
         lstat(curr_fname, &statbuf);
         while (S_ISLNK(statbuf.st_mode)) {
-            log_msg(1, "curr_fname = %s", curr_fname);
+            mr_msg(1, "curr_fname = %s", curr_fname);
             mr_asprintf(&command, "file %s", curr_fname);
             tmp = call_program_and_get_last_line_of_output(command);
@@ -2376 +2376 @@
             for (p = scratch; *p != '\0' && *p != '\''; p++);
             *p = '\0';
-            log_msg(0, "curr_fname %s --> '%s' --> %s", curr_fname, tmp, scratch);
+            mr_msg(0, "curr_fname %s --> '%s' --> %s", curr_fname, tmp, scratch);
             mr_free(tmp);
 
@@ -2419 +2419 @@
     char *fdisk = NULL;
 
-    log_msg(0, "Looking for partition table format type");
+    mr_msg(0, "Looking for partition table format type");
     mr_asprintf(&fdisk, "/sbin/parted2fdisk");
-    log_msg(1, "Using %s", fdisk);
+    mr_msg(1, "Using %s", fdisk);
     mr_asprintf(&command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
     mr_free(fdisk);
@@ -2434 +2434 @@
     }
     mr_free(tmp);
-    log_msg(0, "Found %s partition table format type", output);
+    mr_msg(0, "Found %s partition table format type", output);
     return (output);
 }

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

@@ -120 +120 @@
                  internal_tape_block_size, keych, device);
     }
-    log_msg(2, "Calling buffer --- command = '%s'", g_sz_call_to_buffer);
+    mr_msg(2, "Calling buffer --- command = '%s'", g_sz_call_to_buffer);
     fres = popen(g_sz_call_to_buffer, sz_dir);
     mr_free(sz_dir);
     if (fres) {
-        log_msg(2, "Successfully opened ('%c') tape device %s", direction,
+        mr_msg(2, "Successfully opened ('%c') tape device %s", direction,
                 device);
     } else {
-        log_msg(2, "Failed to open ('%c') tape device %s", direction,
+        mr_msg(2, "Failed to open ('%c') tape device %s", direction,
                 device);
     }
@@ -133 +133 @@
     mr_asprintf(&tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
     if (run_program_and_log_output(tmp, 2)) {
-        log_msg(2, "Warning - I think I failed to open tape, actually.");
+        mr_msg(2, "Warning - I think I failed to open tape, actually.");
     }
     mr_free(tmp);
@@ -168 +168 @@
             "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
     mr_free(g_sz_call_to_buffer);
-    log_msg(2, "kill_buffer() --- command = %s", command);
+    mr_msg(2, "kill_buffer() --- command = %s", command);
 
     tmp = call_program_and_get_last_line_of_output(command);
@@ -174 +174 @@
 
     mr_asprintf(&command, "kill %s", tmp);
-    log_msg(2, "kill_buffer() --- command = %s", command);
+    mr_msg(2, "kill_buffer() --- command = %s", command);
 
     if (strlen(tmp) > 0) {

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

@@ -150 +150 @@
     int retval = 0;
 
-    log_msg(1, "Sorting file %s", orig_fname);
+    mr_msg(1, "Sorting file %s", orig_fname);
     mr_asprintf(&tmp_fname, "/tmp/sort.%d.%d.%d", (int) (random() % 32768),
              (int) (random() % 32768), (int) (random() % 32768));
@@ -164 +164 @@
 
     if (retval) {
-        log_msg(2, "Failed to sort %s - oh dear", orig_fname);
+        mr_msg(2, "Failed to sort %s - oh dear", orig_fname);
     } else {
-        log_msg(2, "Sorted %s --> %s OK. Copying it back to %s now",
+        mr_msg(2, "Sorted %s --> %s OK. Copying it back to %s now",
                 orig_fname, tmp_fname, orig_fname);
         mr_asprintf(&command, "mv -f %s %s", tmp_fname, orig_fname);
@@ -173 +173 @@
 
         if (retval) {
-            log_msg(2, "Failed to copy %s back to %s - oh dear", tmp_fname,
+            mr_msg(2, "Failed to copy %s back to %s - oh dear", tmp_fname,
                     orig_fname);
         } else {
-            log_msg(2, "%s was sorted OK.", orig_fname);
+            mr_msg(2, "%s was sorted OK.", orig_fname);
         }
     }
     mr_free(tmp_fname);
-    log_msg(1, "Finished sorting file %s", orig_fname);
+    mr_msg(1, "Finished sorting file %s", orig_fname);
     return (retval);
 }
@@ -325 +325 @@
         mr_asprintf(&tmp, "Filelist divided into %ld sets", curr_set_no + 1);
     }
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
     mr_free(tmp);
     close_evalcall_form();
@@ -403 +403 @@
     pattr = popen(syscall, "r");
     if (!pattr) {
-        log_msg(1, "Failed to open fattr() %s", syscall);
+        mr_msg(1, "Failed to open fattr() %s", syscall);
         return (1);
     }
     if (feof(pattr)) {
-        log_msg(1, "Failed to call fattr() %s", syscall);
+        mr_msg(1, "Failed to call fattr() %s", syscall);
         paranoid_pclose(pattr);
         return (2);
@@ -433 +433 @@
 
     if (!(fin = fopen(filelist, "r"))) {
-        log_msg(1, "Cannot openin filelist %s", filelist);
+        mr_msg(1, "Cannot openin filelist %s", filelist);
         return (1);
     }
     mr_asprintf(&pout_command, "gzip -c1 > %s", auxlist_fname);
     if (!(pout = popen(pout_command, "w"))) {
-        log_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname);
+        mr_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname);
         fclose(fin);
         mr_free(pout_command);
@@ -451 +451 @@
             file_to_analyze[i - 1] = '\0';
         }
-        log_msg(8, "Analyzing %s", file_to_analyze);
+        mr_msg(8, "Analyzing %s", file_to_analyze);
         /* BERLIOS : to be checked */
         mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
@@ -520 +520 @@
     FILE *pin, *pout, *faclin;
 
-    log_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist,
+    mr_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist,
             original_exat_fname, executable);
     if (!orig_msklist || !orig_msklist[0]
         || !does_file_exist(orig_msklist)) {
-        log_msg(1,
+        mr_msg(1,
                 "No masklist provided. I shall therefore set ALL attributes.");
         mr_asprintf(&command, "gzip -dc %s | %s --restore - 2>> %s",
                  original_exat_fname, executable, MONDO_LOGFILE);
-        log_msg(1, "command = %s", command);
+        mr_msg(1, "command = %s", command);
         retval = system(command);
         mr_free(command);
-        log_msg(1, "Returning w/ retval=%d", retval);
+        mr_msg(1, "Returning w/ retval=%d", retval);
         return (retval);
     }
     if (length_of_file(original_exat_fname) <= 0) {
-        log_msg(1,
+        mr_msg(1,
                 "original_exat_fname %s is empty or missing, so no need to set EXAT list",
                 original_exat_fname);
@@ -551 +551 @@
              MONDO_LOGFILE);
 
-    log_msg(1, "syscall_pin = %s", syscall_pin);
-    log_msg(1, "syscall_pout = %s", syscall_pout);
+    mr_msg(1, "syscall_pin = %s", syscall_pin);
+    mr_msg(1, "syscall_pout = %s", syscall_pout);
     pout = popen(syscall_pout, "w");
     if (!pout) {
@@ -604 +604 @@
 
         i = strcmp(p, q);
-        log_msg(my_depth, "'%s' v '%s' --> %d\n", p, q, i);
+        mr_msg(my_depth, "'%s' v '%s' --> %d\n", p, q, i);
 
 //      printf("%s v %s --> %d\n", p, q, i);
 
         if (i < 0) {            // read another subset file in.
-            log_msg(my_depth, "Reading next subset line in\n\n");
+            mr_msg(my_depth, "Reading next subset line in\n\n");
             mr_getline(&current_subset_file, &n, faclin);
             continue;
@@ -619 +619 @@
         mr_getline(&incoming, &n, pin);
         if (!i) {
-            log_msg(my_depth, "Copying master %s", q);
+            mr_msg(my_depth, "Copying master %s", q);
         }
 //      if (!i) { printf("Match --- %s\n", q); }
@@ -661 +661 @@
         return (set_EXAT_list(masklist, fattr_fname, "setfattr"));
     } else {
-        log_msg(1, "ERROR: set_EXAT_list: setfattr doesn't exist");
+        mr_msg(1, "ERROR: set_EXAT_list: setfattr doesn't exist");
         return(0);
     }
@@ -673 +673 @@
         return (set_EXAT_list(masklist, acl_fname, "setfacl"));
     } else {
-        log_msg(1, "ERROR: set_EXAT_list: setfacl doesn't exist");
+        mr_msg(1, "ERROR: set_EXAT_list: setfacl doesn't exist");
         return(0);
     }
@@ -748 +748 @@
     char_to_add = string_to_add[0];
     if (node->right != NULL && node->ch < char_to_add) {
-        log_msg(7, "depth=%d --- going RIGHT ... %c-->%c", depth,
+        mr_msg(7, "depth=%d --- going RIGHT ... %c-->%c", depth,
                 char_to_add, node->ch, (node->right)->ch);
         return (add_string_at_node(node->right, string_to_add));
@@ -754 +754 @@
     // walk down tree if appropriate
     if (node->down != NULL && node->ch == char_to_add) {
-        log_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_add);
+        mr_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_add);
         depth++;
         res = add_string_at_node(node->down, string_to_add + 1);
@@ -762 +762 @@
 
     if (char_to_add == '\0' && node->ch == '\0') {
-        log_msg(6, "%s already in tree", original_string);
+        mr_msg(6, "%s already in tree", original_string);
         return (1);
     }
@@ -769 +769 @@
     if (char_to_add < node->ch) // add to the left of node
     {
-        log_msg(7, "depth=%d char=%c --- adding (left)", depth,
+        mr_msg(7, "depth=%d char=%c --- adding (left)", depth,
                 char_to_add);
         memcpy((void *) newnode, (void *) node, sizeof(struct s_node));
@@ -775 +775 @@
     } else if (char_to_add > node->ch)  // add to the right of node
     {
-        log_msg(7, "depth=%d char=%c --- adding (right)", depth,
+        mr_msg(7, "depth=%d char=%c --- adding (right)", depth,
                 char_to_add);
         newnode->right = node->right;   // newnode is to the RIGHT of node
@@ -786 +786 @@
     node->expanded = node->selected = FALSE;
     if (char_to_add == '\0') {
-        log_msg(6, "Added %s OK", original_string);
+        mr_msg(6, "Added %s OK", original_string);
         return (0);
     }
     // add the rest
-    log_msg(6, "Adding remaining chars ('%s')", string_to_add + 1);
+    mr_msg(6, "Adding remaining chars ('%s')", string_to_add + 1);
     for (i = 1; i < noof_chars; i++) {
         node->down = (struct s_node *) mr_malloc(sizeof(struct s_node));
         node = node->down;
         char_to_add = string_to_add[i];
-        log_msg(6, "Adding '%c'", char_to_add);
+        mr_msg(6, "Adding '%c'", char_to_add);
         node->ch = char_to_add;
         node->right = node->down = NULL;
@@ -803 +803 @@
         }
     }
-    log_msg(6, "Finally - added %s OK", original_string);
+    mr_msg(6, "Finally - added %s OK", original_string);
     return (0);
 }
@@ -838 +838 @@
     mr_asprintf(&command_to_open_fname, "gzip -dc %s", filelist_fname);
     mr_asprintf(&tmp, "zcat %s | wc -l", filelist_fname);
-    log_msg(6, "tmp = %s", tmp);
+    mr_msg(6, "tmp = %s", tmp);
     tmp1 = call_program_and_get_last_line_of_output(tmp);
     mr_free(tmp);
@@ -907 +907 @@
 
     if (depth == 0) {
-        log_msg(0, "----------------show filelist--------------");
+        mr_msg(0, "----------------show filelist--------------");
     }
     current_string[depth] = node->ch;
 
-    log_msg(3, "depth=%d", depth);
+    mr_msg(3, "depth=%d", depth);
     if (node->down) {
-        log_msg(3, "moving down");
+        mr_msg(3, "moving down");
         depth++;
         show_filelist(node->down);
@@ -920 +920 @@
 
     if (!node->ch) {
-        log_msg(0, "%s\n", current_string);
+        mr_msg(0, "%s\n", current_string);
     }
 
     if (node->right) {
-        log_msg(3, "moving right");
+        mr_msg(3, "moving right");
         show_filelist(node->right);
     }
     if (depth == 0) {
-        log_msg(0, "----------------show filelist--------------");
+        mr_msg(0, "----------------show filelist--------------");
     }
     return;
@@ -986 +986 @@
     for (node = filelist; node != NULL; node = node->right) {
         str[depth] = node->ch;
-        log_msg(5, "depth=%d ch=%c", depth, node->ch);
+        mr_msg(5, "depth=%d ch=%c", depth, node->ch);
         if (!node->ch) {
 //    if (node->selected)
@@ -1340 +1340 @@
 #endif
         mr_free(find_excludes);
-        log_msg(5, "find command = %s", strtmp);
+        mr_msg(5, "find command = %s", strtmp);
         system(strtmp);
         mr_free(strtmp);
@@ -1356 +1356 @@
         find_skeleton_marker[0] = '\0';
         skeleton_lino = 1;
-        log_msg(5, "entries = %ld", g_skeleton_entries);
+        mr_msg(5, "entries = %ld", g_skeleton_entries);
         percentage = 0;
     } else if (depth <= MAX_SKEL_DEPTH) // update evalcall form if appropriate
@@ -1363 +1363 @@
                 "grep -Fv \"%s\" %s > %s.new 2> /dev/null", dir,
                 skeleton_filelist, skeleton_filelist);
-//    log_msg(0, "fsm = %s", find_skeleton_marker);
+//    mr_msg(0, "fsm = %s", find_skeleton_marker);
         if (!system(find_skeleton_marker)) {
             percentage = (int) (skeleton_lino * 100 / g_skeleton_entries);
             skeleton_lino++;
-//        log_msg(5, "Found %s", dir);
-//        log_msg(2, "Incrementing skeleton_lino; now %ld/%ld (%d%%)", skeleton_lino, g_skeleton_entries, percentage);
+//        mr_msg(5, "Found %s", dir);
+//        mr_msg(2, "Incrementing skeleton_lino; now %ld/%ld (%d%%)", skeleton_lino, g_skeleton_entries, percentage);
             sprintf(find_skeleton_marker, "mv -f %s.new %s",
                     skeleton_filelist, skeleton_filelist);
-//        log_msg(6, "fsm = %s", find_skeleton_marker);
+//        mr_msg(6, "fsm = %s", find_skeleton_marker);
             run_program_and_log_output(find_skeleton_marker, 8);
             time(&this_time);
@@ -1390 +1390 @@
     depth++;
 
-//  log_msg(0, "Cataloguing %s", dir);
+//  mr_msg(0, "Cataloguing %s", dir);
     if (sth[0] == ' ') {
         mr_asprintf(&skip_these, "%s", sth);
@@ -1466 +1466 @@
         mr_free(find_skeleton_marker);
         unlink(skeleton_filelist);
-        log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
+        mr_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
     }
     return (0);
@@ -1565 +1565 @@
         mr_free(tmp);
     } else if (lstat(sz_datefile, &statbuf)) {
-        log_msg(2,
+        mr_msg(2,
                 "Warning - unable to find date of previous backup. Full backup instead.");
         differential = 0;
@@ -1571 +1571 @@
     } else {
         time_of_last_full_backup = statbuf.st_mtime;
-        log_msg(2, "Differential backup. Yay.");
+        mr_msg(2, "Differential backup. Yay.");
     }
     mr_free(sz_datefile);
@@ -1577 +1577 @@
 // use user-specified filelist (if specified)
     if (userdef_filelist) {
-        log_msg(1,
+        mr_msg(1,
                 "Using the user-specified filelist - %s - instead of calculating one",
                 userdef_filelist);
@@ -1586 +1586 @@
         mr_free(command);
     } else {
-        log_msg(2, "include_paths = '%s'", include_paths);
-        log_msg(1, "Calculating filelist");
+        mr_msg(2, "include_paths = '%s'", include_paths);
+        mr_msg(1, "Calculating filelist");
         tmp = call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null");
         tmp1 = call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null");
@@ -1598 +1598 @@
         mr_free(tmp2);
 
-        log_msg(2, "Excluding paths = '%s'", exclude_paths);
-        log_msg(2,
+        mr_msg(2, "Excluding paths = '%s'", exclude_paths);
+        mr_msg(2,
                 "Generating skeleton filelist so that we can track our progress");
         mr_asprintf(&skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
         make_hole_for_file(skeleton_filelist);
 
-        log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
-        log_msg(2, "Opening out filelist to %s", sz_filelist);
+        mr_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
+        mr_msg(2, "Opening out filelist to %s", sz_filelist);
         if (!(fout = fopen(sz_filelist, "w"))) {
             fatal_error("Cannot openout to sz_filelist");
@@ -1611 +1611 @@
         i = 0;
         if (strlen(include_paths) == 0) {
-            log_msg(1, "Including only '/' in %s", sz_filelist);
+            mr_msg(1, "Including only '/' in %s", sz_filelist);
             open_and_list_dir("/", exclude_paths, fout,
                               time_of_last_full_backup, skeleton_filelist);
@@ -1618 +1618 @@
             while (*p) {
                 q = next_entry(p);
-                log_msg(1, "Including %s in filelist %s", q, sz_filelist);
+                mr_msg(1, "Including %s in filelist %s", q, sz_filelist);
                 open_and_list_dir(q, exclude_paths, fout,
                                   time_of_last_full_backup,
@@ -1632 +1632 @@
         mr_free(exclude_paths);
     }
-    log_msg(2, "Copying new filelist to scratchdir");
+    mr_msg(2, "Copying new filelist to scratchdir");
     mr_asprintf(&command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
@@ -1646 +1646 @@
     mr_free(sz_filelist);
 
-    log_msg(2, "Exiting");
+    mr_msg(2, "Exiting");
     return (0);
 }
@@ -1683 +1683 @@
     noof_chars = strlen(string_to_find) + 1;    /* we include the '\0' */
 
-    log_msg(7, "starting --- str=%s", string_to_find);
+    mr_msg(7, "starting --- str=%s", string_to_find);
 
 /* walk across tree if necessary */
@@ -1689 +1689 @@
     char_to_find = string_to_find[0];
     if (node->right != NULL && node->ch < char_to_find) {
-        log_msg(7, "depth=%d --- going RIGHT ... %c-->%c", depth,
+        mr_msg(7, "depth=%d --- going RIGHT ... %c-->%c", depth,
                 char_to_find, node->ch, (node->right)->ch);
         return (find_string_at_node(node->right, string_to_find));
@@ -1696 +1696 @@
 /* walk down tree if appropriate */
     if (node->down != NULL && node->ch == char_to_find) {
-        log_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_find);
+        mr_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_find);
         depth++;
         node = find_string_at_node(node->down, string_to_find + 1);
@@ -1704 +1704 @@
 
     if (char_to_find == '\0' && node->ch == '\0') {
-        log_msg(7, "%s is in tree", original_string);
+        mr_msg(7, "%s is in tree", original_string);
         return (node);
     } else {
-        log_msg(7, "%s is NOT in tree", original_string);
+        mr_msg(7, "%s is NOT in tree", original_string);
         return (NULL);
     }
@@ -1734 +1734 @@
     size_t len = 0;             // Scrub's patch doesn't work without that
 
-//  log_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE");
-    log_msg(5, "starting");
-    log_msg(5, "needles_list_fname = %s", needles_list_fname);
-    log_msg(5, "matches_list_fname = %s", matches_list_fname);
+//  mr_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE");
+    mr_msg(5, "starting");
+    mr_msg(5, "needles_list_fname = %s", needles_list_fname);
+    mr_msg(5, "matches_list_fname = %s", matches_list_fname);
     if (!(fin = fopen(needles_list_fname, "r"))) {
         fatal_error("Cannot openin needles_list_fname");
@@ -1759 +1759 @@
         }
 
-        log_msg(5, "Looking for '%s'", fname);
+        mr_msg(5, "Looking for '%s'", fname);
         found_node = find_string_at_node(filelist, fname);
         if (found_node) {
@@ -1768 +1768 @@
                     fname = tmp;
                 }
-                log_msg(5, "Found '%s'", fname);
+                mr_msg(5, "Found '%s'", fname);
                 turn_wildcard_chars_into_literal_chars(tmp, fname);
                 fprintf(fout, "%s\n", tmp);
@@ -1799 +1799 @@
     struct s_node *nod;
 
-    log_msg(3, "Adding %s to filelist", list_of_files_fname);
+    mr_msg(3, "Adding %s to filelist", list_of_files_fname);
     if (!(fin = fopen(list_of_files_fname, "r"))) {
         iamhere(list_of_files_fname);
@@ -1812 +1812 @@
             tmp[strlen(tmp) - 1] = '\0';
         }
-        log_msg(2, "tmp = '%s'", tmp);
+        mr_msg(2, "tmp = '%s'", tmp);
         if (!tmp[0]) {
             continue;
         }
         if ((nod = find_string_at_node(filelist, tmp))) {
-            log_msg(5, "Found '%s' in filelist already. Cool.", tmp);
+            mr_msg(5, "Found '%s' in filelist already. Cool.", tmp);
         } else {
             add_string_at_node(filelist, tmp);
@@ -1825 +1825 @@
         if (nod && flag_em) {
             toggle_path_selection(filelist, tmp, TRUE);
-            log_msg(5, "Flagged '%s'", tmp);
+            mr_msg(5, "Flagged '%s'", tmp);
         }
     }

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

@@ -155 +155 @@
 
     if (lstat(filename, &buf)) {
-        log_msg(20, "%s does not exist", filename);
+        mr_msg(20, "%s does not exist", filename);
         return (FALSE);
     } else {
-        log_msg(20, "%s exists", filename);
+        mr_msg(20, "%s exists", filename);
         return (TRUE);
     }
@@ -331 +331 @@
 
     if (output != NULL && does_file_exist(output)) {
-        log_msg(4, "find_home_of_exe () --- Found %s at %s", fname, output);
+        mr_msg(4, "find_home_of_exe () --- Found %s at %s", fname, output);
     } else {
         mr_free(output);
-        log_msg(4, "find_home_of_exe() --- Could not find %s", fname);
+        mr_msg(4, "find_home_of_exe() --- Could not find %s", fname);
     }
     return (output);
@@ -662 +662 @@
     sz_res = call_program_and_get_last_line_of_output(command);
     file_len_K = atol(sz_res);
-    log_msg(4, "%s --> %s --> %ld", command, sz_res, file_len_K);
+    mr_msg(4, "%s --> %s --> %ld", command, sz_res, file_len_K);
     mr_free(command);
     mr_free(sz_res);
@@ -699 +699 @@
             ("Cannot open biggielist. OK, so estimate is based on filesets only.");
     } else {
-        log_msg(4, "Reading it...");
+        mr_msg(4, "Reading it...");
         for (mr_getline(&fname, &n, fin); !feof(fin);
              mr_getline(&fname, &n, fin)) {
@@ -730 +730 @@
             if (file_len_K > 0) {
                 scratchL += file_len_K;
-                log_msg(4, "%s --> %ld K", fname, file_len_K);
+                mr_msg(4, "%s --> %ld K", fname, file_len_K);
             }
             mr_asprintf(&comment,
                     "After adding %s, scratchL+%ld now equals %ld", fname,
                     file_len_K, scratchL);
-            log_msg(4, comment);
+            mr_msg(4, comment);
             mr_free(comment);
 
@@ -948 +948 @@
 
     /* BERLIOS: Why do we need to do it here as well ? */
-    log_msg(4, "g_mondo_home='%s'", g_mondo_home);
+    mr_msg(4, "g_mondo_home='%s'", g_mondo_home);
     if ((g_mondo_home == NULL) || strlen(g_mondo_home) < 2) {
         mr_free(g_mondo_home);
@@ -956 +956 @@
             bkpinfo->scratchdir);
 
-    log_msg(4, "command = %s", command);
+    mr_msg(4, "command = %s", command);
     if (run_program_and_log_output(command, 1)) {
         fatal_error("Failed to copy Mondo's stuff to scratchdir");
@@ -966 +966 @@
     /* i18n */
     mr_asprintf(&command, CP_BIN " --parents /usr/share/locale/*/LC_MESSAGES/mondo.mo %s",bkpinfo->scratchdir);
-    log_msg(4, "command = %s", command);
+    mr_msg(4, "command = %s", command);
     run_program_and_log_output(command, 1);
     mr_free(command);
@@ -1298 +1298 @@
                 "#!/bin/sh\n\nmount /boot > /dev/null 2> /dev/null\ngrub-install $@\nres=$?\nsync;sync;sync\nexit $res\n");
         paranoid_fclose(fout);
-        log_msg(2, "Created %s", outfile);
+        mr_msg(2, "Created %s", outfile);
         mr_asprintf(&tmp, "chmod +x %s", outfile);
         paranoid_system(tmp);

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

@@ -75 +75 @@
 /*@***********   End Variables ***************************************/
 
-    log_msg(3, "Starting");
+    mr_msg(3, "Starting");
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
@@ -90 +90 @@
 
     resolve_naff_tokens(ultimate_call, tmp, MONDO_LOGFILE, "_ERR_");
-    log_msg(4, "basic call = '%s'", basic_call);
-    log_msg(4, "midway_call = '%s'", midway_call);
-    log_msg(4, "tmp = '%s'", tmp);
-    log_msg(4, "ultimate call = '%s'", ultimate_call);
+    mr_msg(4, "basic call = '%s'", basic_call);
+    mr_msg(4, "midway_call = '%s'", midway_call);
+    mr_msg(4, "tmp = '%s'", tmp);
+    mr_msg(4, "ultimate call = '%s'", ultimate_call);
     mr_asprintf(&command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
 
     log_to_screen
         (_("Please be patient. Do not be alarmed by on-screen inactivity."));
-    log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
+    mr_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
             what_i_am_doing);
     if (bkpinfo->manual_cd_tray) {
@@ -113 +113 @@
         }
 #endif
-        log_msg(1, "command = '%s'", command);
+        mr_msg(1, "command = '%s'", command);
         retval += system(command);
         if (!g_text_mode) {
@@ -119 +119 @@
         }
         if (retval) {
-            log_msg(2, "Basic call '%s' returned an error.", basic_call);
+            mr_msg(2, "Basic call '%s' returned an error.", basic_call);
             popup_and_OK(_("Press ENTER to continue."));
             popup_and_OK
@@ -127 +127 @@
     /* if text mode then do the above & RETURN; if not text mode, do this... */
     else {
-        log_msg(3, "command = '%s'", command);
+        mr_msg(3, "command = '%s'", command);
 //      yes_this_is_a_goto:
         retval =
@@ -168 +168 @@
     assert(program != NULL);
     if (!program[0]) {
-        log_msg(2, "Warning - asked to run zerolength program");
+        mr_msg(2, "Warning - asked to run zerolength program");
         return (1);
     }
@@ -189 +189 @@
     res = system(callstr);
     if (((res == 0) && log_if_success) || ((res != 0) && log_if_failure)) {
-        log_msg(0, "running: %s", callstr);
-        log_msg(0,
+        mr_msg(0, "running: %s", callstr);
+        mr_msg(0,
                 "--------------------------------start of output-----------------------------");
     }
@@ -219 +219 @@
             if ((res == 0 && log_if_success)
                 || (res != 0 && log_if_failure)) {
-                log_msg(0, incoming);
+                mr_msg(0, incoming);
             }
         }
@@ -227 +227 @@
     unlink("/tmp/mondo-run-prog-thing.tmp");
     if ((res == 0 && log_if_success) || (res != 0 && log_if_failure)) {
-        log_msg(0,
+        mr_msg(0,
                 "--------------------------------end of output------------------------------");
         if (res) {
-            log_msg(0, "...ran with res=%d", res);
+            mr_msg(0, "...ran with res=%d", res);
         } else {
-            log_msg(0, "...ran just fine. :-)");
+            mr_msg(0, "...ran just fine. :-)");
         }
     }
 //  else
-//    { log_msg (0, "-------------------------------ran w/ res=%d------------------------------", res); }
+//    { mr_msg (0, "-------------------------------ran w/ res=%d------------------------------", res); }
     return (res);
 }
@@ -275 +275 @@
     open_evalcall_form(what_i_am_doing);
     mr_asprintf(&tmp, "Executing %s", basic_call);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     mr_free(tmp);
 
@@ -292 +292 @@
         log_to_screen(_("Waiting for external binary to start"));
         for (i = 0; i < 60 && !does_file_exist(lockfile); sleep(1), i++) {
-            log_msg(3, "Waiting for lockfile %s to exist", lockfile);
+            mr_msg(3, "Waiting for lockfile %s to exist", lockfile);
         }
     }
@@ -305 +305 @@
     /* Log actual pclose errors. */
     if (errno)
-        log_msg(5, "pclose err: %d", errno);
+        mr_msg(5, "pclose err: %d", errno);
     /* Check if we have a valid status. If we do, extract the called program's exit code. */
     /* If we don't, highlight this fact by returning -1. */
@@ -343 +343 @@
     FILE *ftmp = NULL;
 
-    log_msg(5, "Opening.");
+    mr_msg(5, "Opening.");
     bufcap = 256L * 1024L;
     buf = mr_malloc(bufcap);
@@ -367 +367 @@
             mr_free(tmp);
 
-            log_msg(7,
+            mr_msg(7,
                     "subslice #%ld --- I have read %ld of %ld bytes in from f_orig",
                     subsliceno, bytes_read_in, bytes_to_be_read);
@@ -377 +377 @@
             mr_free(tmp);
 
-            log_msg(7, "Subslice #%d written OK", subsliceno);
+            mr_msg(7, "Subslice #%d written OK", subsliceno);
             subsliceno++;
         }
@@ -393 +393 @@
             fatal_error("Cannot read the introductory block");
         }
-        log_msg(5, "tmp is %s", tmp);
+        mr_msg(5, "tmp is %s", tmp);
         if (!strstr(tmp, PIMP_START_SZ)) {
             fatal_error("Can't find intro blk");
@@ -402 +402 @@
         bytes_to_be_read = atol(tmp);
         while (bytes_to_be_read > 0) {
-            log_msg(7, "subslice#%ld, bytes=%ld", subsliceno,
+            mr_msg(7, "subslice#%ld, bytes=%ld", subsliceno,
                     bytes_to_be_read);
             bytes_read_in = fread(buf, 1, bytes_to_be_read, fin);
@@ -414 +414 @@
             }
             if (atol(tmp) != subsliceno) {
-                log_msg(1, "Wanted subslice %ld but got %ld ('%s')",
+                mr_msg(1, "Wanted subslice %ld but got %ld ('%s')",
                         subsliceno, atol(tmp), tmp);
             }
-            log_msg(7, "Subslice #%ld read OK", subsliceno);
+            mr_msg(7, "Subslice #%ld read OK", subsliceno);
             subsliceno++;
             if (fread(tmp, 1, 64L, fin) != 64L) {
@@ -426 +426 @@
     }
 
-//  log_msg(4, "Written %ld of %ld bytes", bytes_written_out, bytes_read_in);
+//  mr_msg(4, "Written %ld of %ld bytes", bytes_written_out, bytes_read_in);
 
     if (direction == 'w') {
@@ -436 +436 @@
         mr_free(tmp);
     } else {
-        log_msg(1, "tmpA is %s", tmp);
+        mr_msg(1, "tmpA is %s", tmp);
         if (!strstr(tmp, PIMP_END_SZ)) {
             if (fread(tmp, 1, 64L, fin) != 64L) {
                 fatal_error("Can't read the final block");
             }
-            log_msg(5, "tmpB is %s", tmp);
+            mr_msg(5, "tmpB is %s", tmp);
             if (!strstr(tmp, PIMP_END_SZ)) {
                 ftmp = fopen("/tmp/out.leftover", "w");
                 bytes_read_in = fread(tmp, 1, 64L, fin);
-                log_msg(1, "bytes_read_in = %ld", bytes_read_in);
+                mr_msg(1, "bytes_read_in = %ld", bytes_read_in);
 //      if (bytes_read_in!=128+64) { fatal_error("Can't read the terminating block"); }
                 fwrite(tmp, 1, bytes_read_in, ftmp);
@@ -455 +455 @@
                 /* BERLIOS : strange ???
                 s-printf(tmp, "I am here - %llu", ftello(fin));
-                log_msg(0, tmp);
+                mr_msg(0, tmp);
                 */
                 fread(tmp, 1, 512, fin);
-                log_msg(0, "tmp = '%s'", tmp);
+                mr_msg(0, "tmp = '%s'", tmp);
                 fwrite(tmp, 1, 512, ftmp);
                 fclose(ftmp);
@@ -468 +468 @@
 
     mr_free(buf);
-    log_msg(3, "Successfully copied %ld bytes", bytes_written_out);
+    mr_msg(3, "Successfully copied %ld bytes", bytes_written_out);
     return (retval);
 }
@@ -521 +521 @@
     mr_asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
             tempfile);
-    log_msg(3, command);
+    mr_msg(3, command);
     open_evalcall_form(tt);
 
@@ -537 +537 @@
         pcno = grab_percentage_from_last_line_of_file(MONDO_LOGFILE);
         if (pcno < 0 || pcno > 100) {
-            log_msg(5, "Weird pc#");
+            mr_msg(5, "Weird pc#");
             continue;
         }
@@ -567 +567 @@
     res = 999;
     sz_command = (char *) info;
-    log_msg(4, "sz_command = '%s'", sz_command);
+    mr_msg(4, "sz_command = '%s'", sz_command);
     res = system(sz_command);
     if (res > 256 && res != 4444) {
         res = res / 256;
     }
-    log_msg(4, "child res = %d", res);
+    mr_msg(4, "child res = %d", res);
     sz_command[0] = '\0';
     pthread_exit((void *) (&res));
@@ -602 +602 @@
 
     mr_asprintf(&command, "%s 2>> %s", cmd, MONDO_LOGFILE);
-    log_msg(3, "command = '%s'", command);
+    mr_msg(3, "command = '%s'", command);
     if ((res =
          pthread_create(&childthread, NULL, run_prog_in_bkgd_then_exit,
@@ -609 +609 @@
     }
 
-    log_msg(8, "Parent running");
+    mr_msg(8, "Parent running");
     open_evalcall_form(tt);
     for (sleep(1); command[0] != '\0'; sleep(1)) {
         pcno = grab_percentage_from_last_line_of_file(MONDO_LOGFILE);
         if (pcno <= 0 || pcno > 100) {
-            log_msg(8, "Weird pc#");
+            mr_msg(8, "Weird pc#");
             continue;
         }
@@ -639 +639 @@
         res = 666;
     }
-    log_msg(3, "Parent res = %d", res);
+    mr_msg(3, "Parent res = %d", res);
     return (res);
 }

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

@@ -536 +536 @@
         flaws_str = tmp1;
         res++;
-        log_msg(1, tmp);
+        mr_msg(1, tmp);
         mr_free(tmp);
         return (FALSE);
@@ -902 +902 @@
                      "Not putting %s in list of drives: it's a virtual drive",
                      drive);
-            log_msg(8, tmp);
+            mr_msg(8, tmp);
             mr_free(tmp);
             continue;
@@ -912 +912 @@
                      "Not putting %s in list of drives: it has zero size (maybe an LVM volume)",
                      drive);
-            log_msg(8, tmp);
+            mr_msg(8, tmp);
             mr_free(tmp);
             continue;
@@ -931 +931 @@
                  "Putting %s with size %lli in list of drives",
                  drive, size);
-        log_msg(8, tmp);
+        mr_msg(8, tmp);
         mr_free(tmp);
 
@@ -946 +946 @@
     }
     drivelist->entries = noof_drives;
-    log_msg(8, "Made list of drives");
+    mr_msg(8, "Made list of drives");
 
     return (noof_drives);
@@ -1090 +1090 @@
             !strcmp(mountlist->el[items].device, "devpts")
             ) {
-            log_msg(1,
+            mr_msg(1,
                     "Ignoring %s in mountlist - not loading that line :) ",
                     mountlist->el[items].device);

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

@@ -17 +17 @@
 
 /**
- * The standard log_debug_msg() (log_msg() also due to a macro). Writes some describing
+ * The standard log_debug_msg() (mr_msg() also due to a macro). Writes some describing
  * information to the logfile.
  */

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

@@ -599 +599 @@
     get_next_raidtab_line(fin, label, value);
     while (!feof(fin)) {
-        log_msg(1, "Looking for raid record #%d", items);
+        mr_msg(1, "Looking for raid record #%d", items);
         initialize_raidrec(&raidlist->el[items]);
         v = 0;
@@ -611 +611 @@
         raidlist->el[items].additional_vars.entries = v;
         if (feof(fin)) {
-            log_msg(1, "No more records.");
+            mr_msg(1, "No more records.");
             continue;
         }
-        log_msg(2, "Record #%d (%s) found", items, value);
+        mr_msg(2, "Record #%d (%s) found", items, value);
         raidlist->el[items].raid_device = value;
         for (get_next_raidtab_line(fin, label, value);
@@ -625 +625 @@
     paranoid_fclose(fin);
     raidlist->entries = items;
-    log_msg(1, "Raidtab loaded successfully.");
-    log_msg(1, "%d RAID devices in raidtab", items);
+    mr_msg(1, "Raidtab loaded successfully.");
+    mr_msg(1, "%d RAID devices in raidtab", items);
     return (0);
 }
@@ -686 +686 @@
             raidrec->parity = 3;
         } else {
-            log_msg(1, "Unknown RAID parity algorithm '%s'\n.", value);
+            mr_msg(1, "Unknown RAID parity algorithm '%s'\n.", value);
         }
     } else if (!strcmp(label, "device")) {
@@ -946 +946 @@
   // open file
   if (!(fin = fopen(MDSTAT_FILE, "r"))) {
-    log_msg(1, "Could not open %s.\n", MDSTAT_FILE);
+    mr_msg(1, "Could not open %s.\n", MDSTAT_FILE);
     return 1;
   }
@@ -990 +990 @@
     token = mr_strtok (string, delims, &lastpos);
     if (!strcmp(token, "inactive")) {
-      log_msg(1, "RAID device '%s' inactive.\n",
+      mr_msg(1, "RAID device '%s' inactive.\n",
          raidlist->el[raidlist->entries].raid_device);
       mr_free(string);
@@ -1017 +1017 @@
       raidlist->el[raidlist->entries].raid_level = 10;
     } else {
-      log_msg(1, "Unknown RAID level '%s'.\n", token);
+      mr_msg(1, "Unknown RAID level '%s'.\n", token);
       mr_free(string);
       mr_free(token);
@@ -1061 +1061 @@
         break;
       default: // error
-        log_msg(1, "Unknown device type '%c'\n", type);
+        mr_msg(1, "Unknown device type '%c'\n", type);
         mr_free(string);
         mr_free(token);
@@ -1153 +1153 @@
     break;
       default: // error
-    log_msg(1, "Row %d should not occur in record!\n", row);
+    mr_msg(1, "Row %d should not occur in record!\n", row);
     break;
       }

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

@@ -363 +363 @@
             wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
         }
-        log_msg(1, "Got xattr");
+        mr_msg(1, "Got xattr");
     }
     mr_free(fname);
@@ -390 +390 @@
             wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr);
         }
-        log_msg(1, "Got acl");
+        mr_msg(1, "Got acl");
     }
     mr_free(fname);
@@ -408 +408 @@
     // tarball itself
     res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-    log_msg(1, "now looking for afioball");
+    mr_msg(1, "now looking for afioball");
     return (retval);
 }
@@ -580 +580 @@
 
     if (strncmp(tapedev, "/dev/", 5)) {
-        log_msg(1,
+        mr_msg(1,
                 "Not using 'mt setblk'. This isn't an actual /dev entry.");
         return (0);
@@ -910 +910 @@
 //    crctt=crc16=0;
             where_I_was_before_tape_change = size;
-            log_msg(4, "where_I_was_... = %lld",
+            mr_msg(4, "where_I_was_... = %lld",
                     where_I_was_before_tape_change);
             start_to_read_from_next_tape(bkpinfo);
-            log_msg(4, "Started reading from next tape.");
+            mr_msg(4, "Started reading from next tape.");
             skip_incoming_files_until_we_find_this_one(temp_fname);
-            log_msg(4, "Skipped irrelevant files OK.");
+            mr_msg(4, "Skipped irrelevant files OK.");
             for (size = orig_size; size > where_I_was_before_tape_change;
                  size -= bytes_to_write) {
@@ -921 +921 @@
                     fread(datablock, 1, bytes_to_read, g_tape_stream);
             }
-            log_msg(4, "'size' is now %lld (should be %lld)", size,
+            mr_msg(4, "'size' is now %lld (should be %lld)", size,
                     where_I_was_before_tape_change);
             log_to_screen("Successfully re-sync'd tape");
@@ -938 +938 @@
 #endif
     }
-    log_msg(6, "Total read from tape for this file = %lld",
+    mr_msg(6, "Total read from tape for this file = %lld",
             total_read_from_tape_for_this_file);
-    log_msg(6, ".......................... Should be %lld", orig_size);
+    mr_msg(6, ".......................... Should be %lld", orig_size);
     g_tape_posK += total_read_from_tape_for_this_file / 1024;
     mr_asprintf(&actual_cksum, "%04x%04x", crc16, crctt);
@@ -1027 +1027 @@
     }
     tempblock[i] = '\0';
-    log_msg(6, "%s (fname=%s, size=%ld K)",
+    mr_msg(6, "%s (fname=%s, size=%ld K)",
             marker_to_string(*pcontrol_char), tempblock + 1000,
             (long) (*plen) >> 10);
@@ -1141 +1141 @@
         pB = the_file_I_was_reading;
     }
-    log_msg(1, "skip_incoming_..(%s)", pB);
-    log_msg(2, "Looking for initial START_AN_AFIO_OR_SLICE");
+    mr_msg(1, "skip_incoming_..(%s)", pB);
+    mr_msg(2, "Looking for initial START_AN_AFIO_OR_SLICE");
     ctrl_chr = -1;
     while (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
@@ -1151 +1151 @@
             break;
         }
-        log_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);
+        mr_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);
         wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
-        log_msg(3, "Still trying to re-sync w/ tape");
+        mr_msg(3, "Still trying to re-sync w/ tape");
         mr_free(temp_fname);
         temp_fname = (char *)&res;
@@ -1164 +1164 @@
             break;
         }
-        log_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);
+        mr_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);
         wrong_marker(BLK_START_FILE, ctrl_chr);
-        log_msg(3, "Still trying to re-sync w/ tape");
+        mr_msg(3, "Still trying to re-sync w/ tape");
         /* Do not desallocate when the while condition is met */
         if (ctrl_chr != BLK_START_FILE) {
@@ -1186 +1186 @@
     }
     while (strcmp(pA, pB)) {
-        log_msg(6, "Skipping %s (it's not %s)", temp_fname,
+        mr_msg(6, "Skipping %s (it's not %s)", temp_fname,
                 the_file_I_was_reading);
         for (size = temp_size; size > 0; size -= bytes_to_write) {
@@ -1230 +1230 @@
          */
     }
-    log_msg(2, "Reading %s (it matches %s)", temp_fname,
+    mr_msg(2, "Reading %s (it matches %s)", temp_fname,
             the_file_I_was_reading);
     mr_free(temp_fname);
@@ -1275 +1275 @@
         wrong_marker(BLK_START_OF_BACKUP, ctrlchr);
     } else {
-        log_msg(3, "Next tape opened OK. Whoopee!");
+        mr_msg(3, "Next tape opened OK. Whoopee!");
     }
     return (res);
@@ -1350 +1350 @@
     char *fname;
 
-    log_msg(2, "I am now writing back catalog to tape");
+    mr_msg(2, "I am now writing back catalog to tape");
     last = g_tapecatalog->entries - 1;
     for (i = 0; i <= last; i++) {
@@ -1356 +1356 @@
                  g_tapecatalog->el[i].fname);
         if (!does_file_exist(fname)) {
-            log_msg(6, "Can't write %s - it doesn't exist.", fname);
+            mr_msg(6, "Can't write %s - it doesn't exist.", fname);
         } else {
             write_header_block_to_stream(length_of_file(fname),
                                          "start-backcatalog-afio-or-slice",
                                          BLK_START_AN_AFIO_OR_SLICE);
-            log_msg(2, "Writing %s", fname);
+            mr_msg(2, "Writing %s", fname);
             if (write_file_to_stream_from_file(bkpinfo, fname)) {
                 res++;
-                log_msg(2, "%s failed", fname);
+                mr_msg(2, "%s failed", fname);
             }
             if (i != last) {
@@ -1374 +1374 @@
         mr_free(fname);
     }
-    log_msg(2, "Finished writing back catalog to tape");
+    mr_msg(2, "Finished writing back catalog to tape");
     return (res);
 }
@@ -1606 +1606 @@
              marker_to_string(control_char), p,
              (long) length_of_incoming_file >> 10);
-    log_msg(6, tmp);
+    mr_msg(6, tmp);
     mr_free(tmp);
     return (0);

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

@@ -232 +232 @@
         }
     }
-//  log_msg(1, "tmp = '%s'", tmp);
+//  mr_msg(1, "tmp = '%s'", tmp);
     d = atof(tmp);
 #endif
-    log_msg(1, "g_kernel_version = %f", d);
+    mr_msg(1, "g_kernel_version = %f", d);
     return (d);
 }
@@ -368 +368 @@
         1024;
 
-    log_msg(1, "Foo");
+    mr_msg(1, "Foo");
     if (bkpinfo->backup_media_type == tape) {
-        log_msg(1, "Bar");
+        mr_msg(1, "Bar");
         mr_asprintf(&tmp, "mt -f %s status", bkpinfo->media_device);
-        log_msg(1, "tmp = '%s'", tmp);
+        mr_msg(1, "tmp = '%s'", tmp);
         if (run_program_and_log_output(tmp, 3)) {
             fatal_error
@@ -496 +496 @@
             mr_free(command);
         }
-        log_msg(2, "call_make_iso (DVD res) is ... %s",
+        mr_msg(2, "call_make_iso (DVD res) is ... %s",
                 bkpinfo->call_make_iso);
     }                           // end of DVD code
@@ -739 +739 @@
     int i = 0;
 
-    log_msg(1, "Hi");
+    mr_msg(1, "Hi");
 
     assert(bkpinfo != NULL);
@@ -1058 +1058 @@
          else if (strstr(value, "/dev/") && strstr(value, "t0")
                && !strcmp(label, "media-dev")) {
-        log_msg(2, "FYI, I shan't read new value for %s - already got %s",
+        mr_msg(2, "FYI, I shan't read new value for %s - already got %s",
                 label, value);
         return (0);
@@ -1114 +1114 @@
     char *command;
 
-    log_msg(1, "Started sub");
-    log_msg(4, "Setting command to something");
+    mr_msg(1, "Started sub");
+    mr_msg(4, "Setting command to something");
     mr_asprintf(&command,
              "grep -v ':' /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
-    log_msg(4, "Cool. Command = '%s'", command);
+    mr_msg(4, "Cool. Command = '%s'", command);
     tmp = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
-    log_msg(4, "tmp = '%s'", tmp);
+    mr_msg(4, "tmp = '%s'", tmp);
     if (tmp) {
         log_it("/boot is at %s according to /etc/fstab", tmp);
@@ -1129 +1129 @@
                 mr_free(g_boot_mountpt);
                 mr_asprintf(&g_boot_mountpt, "/boot");
-                log_msg(1, "Mounted /boot");
+                mr_msg(1, "Mounted /boot");
             } else {
                 log_it("...ignored cos it's a label :-)");
@@ -1135 +1135 @@
         } else {
             mr_asprintf(&command, "mount | grep -E '^%s'", tmp);
-            log_msg(3, "command = %s", command);
+            mr_msg(3, "command = %s", command);
             if (run_program_and_log_output(command, 5)) {
                 mr_free(g_boot_mountpt);
@@ -1151 +1151 @@
                     mr_asprintf(&g_boot_mountpt, " ");
                     */
-                    log_msg(1, "Plan B");
+                    mr_msg(1, "Plan B");
                     if (!run_program_and_log_output("mount /boot", 5)) {
                         mr_free(g_boot_mountpt);
                         mr_asprintf(&g_boot_mountpt, "/boot");
-                        log_msg(1, "Plan B worked");
+                        mr_msg(1, "Plan B worked");
                     } else {
-                        log_msg(1,
+                        mr_msg(1,
                                 "Plan B failed. Unable to mount /boot for backup purposes. This probably means /boot is mounted already, or doesn't have its own partition.");
                     }
@@ -1167 +1167 @@
     }
     mr_free(tmp);
-    log_msg(1, "Ended sub");
+    mr_msg(1, "Ended sub");
 }
 
@@ -1178 +1178 @@
     char *tmp;
 
-    log_msg(3, "starting");
+    mr_msg(3, "starting");
     if (g_boot_mountpt != NULL) {
         mr_asprintf(&tmp, "umount %s", g_boot_mountpt);
@@ -1186 +1186 @@
         mr_free(tmp);
     }
-    log_msg(3, "leaving");
+    mr_msg(3, "leaving");
 }
 
@@ -1291 +1291 @@
            ("ps ax | grep -w magicdev | grep -v grep | tr -s '\t' ' '| cut -d' ' -f6-99");
     if (g_magicdev_command) {
-        log_msg(1, "g_magicdev_command = '%s'", g_magicdev_command);
+        mr_msg(1, "g_magicdev_command = '%s'", g_magicdev_command);
         paranoid_system("killall magicdev");
     }

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

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

trunk/mondo/src/common/newt-specific.c

@@ -199 +199 @@
         usleep(500000);
         if (g_text_mode) {
-            log_msg(2, "Closing evalcall form");
+            mr_msg(2, "Closing evalcall form");
             return;
         }
@@ -219 +219 @@
         }
         if (g_current_progress == -999) {
-            log_msg(2,
+            mr_msg(2,
                     "Trying to close the progress form when it ain't open!");
             return;
@@ -227 +227 @@
         sleep(1);
         if (g_text_mode) {
-            log_msg(2, "Closing progress form");
+            mr_msg(2, "Closing progress form");
             return;
         }
@@ -270 +270 @@
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
-        log_msg(1, "%s - '%s'", fatalstr, error_string);
+        mr_msg(1, "%s - '%s'", fatalstr, error_string);
         printf("%s - %s\n", fatalstr, error_string);
         if (getpid() == g_mastermind_pid) {
-            log_msg(2, "mastermind %d is exiting", (int) getpid());
+            mr_msg(2, "mastermind %d is exiting", (int) getpid());
             kill(g_main_pid, SIGTERM);
             finish(1);
@@ -280 +280 @@
         if (getpid() != g_main_pid) {
             if (g_mastermind_pid != 0 && getpid() != g_mastermind_pid) {
-                log_msg(2, "non-m/m %d is exiting", (int) getpid());
+                mr_msg(2, "non-m/m %d is exiting", (int) getpid());
                 kill(g_main_pid, SIGTERM);
                 finish(1);
@@ -286 +286 @@
         }
 
-        log_msg(3, "OK, I think I'm the main PID.");
+        mr_msg(3, "OK, I think I'm the main PID.");
         if (already_exiting) {
-            log_msg(3, "...I'm already exiting. Give me time, Julian!");
+            mr_msg(3, "...I'm already exiting. Give me time, Julian!");
             finish(1);
         }
 
         already_exiting = TRUE;
-        log_msg(2, "I'm going to do some cleaning up now.");
+        mr_msg(2, "I'm going to do some cleaning up now.");
         paranoid_system("killall mindi 2> /dev/null");
         kill_anything_like_this("/mondo/do-not");
@@ -303 +303 @@
             chdir("/");
             for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
-                log_msg(2, "Waiting for child processes to terminate");
+                mr_msg(2, "Waiting for child processes to terminate");
                 sleep(1);
                 run_program_and_log_output(tmp, 5);
@@ -323 +323 @@
 
         if (!g_text_mode) {
-            log_msg(0, fatalstr);
-            log_msg(0, error_string);
+            mr_msg(0, fatalstr);
+            mr_msg(0, error_string);
             newtFinished();
         }
@@ -337 +337 @@
         register_pid(0, "mondo");   // finish() does this too, FYI
         if (!g_main_pid) {
-            log_msg(3, "FYI - g_main_pid is blank");
+            mr_msg(3, "FYI - g_main_pid is blank");
         }
         finish(254);
@@ -371 +371 @@
         if (!g_text_mode) {
             if (does_file_exist("/THIS-IS-A-RAMDISK")) {
-                log_msg(1, "Calling newtFinished()");
+                mr_msg(1, "Calling newtFinished()");
                 newtFinished();
             } else {
-                log_msg(1, "Calling newtSuspend()");
+                mr_msg(1, "Calling newtSuspend()");
                 newtSuspend();
             }
@@ -465 +465 @@
         va_start(args, fmt);
         mr_asprintf(&output, fmt, args);
-        log_msg(0, output);
+        mr_msg(0, output);
         if (strlen(output) > 80) {
             output[80] = '\0';
@@ -508 +508 @@
      mvaddstr_and_log_it(int y, int x, char *output) {
         assert_string_is_neither_NULL_nor_zerolength(output);
-        log_msg(0, output);
+        mr_msg(0, output);
         if (g_text_mode) {
             printf("%s\n", output);
@@ -541 +541 @@
         //  center_string (title, 80);
         if (g_text_mode) {
-            log_msg(0, title);
+            mr_msg(0, title);
         } else {
             mr_asprintf(&tmp, title);
@@ -553 +553 @@
         g_isoform_starttime = get_time();
         if (g_text_mode) {
-            log_msg(0, g_isoform_header_str);
+            mr_msg(0, g_isoform_header_str);
         } else {
             g_isoform_header = newtLabel(1, 1, g_isoform_header_str);
@@ -618 +618 @@
         mr_asprintf(&g_blurb_str_3, blurb2);
         if (g_text_mode) {
-            log_msg(0, blurb1);
-            log_msg(0, blurb2);
-            log_msg(0, blurb3);
+            mr_msg(0, blurb1);
+            mr_msg(0, blurb2);
+            mr_msg(0, blurb3);
         } else {
             g_blurb1 = newtLabel(2, 1, blurb1);
@@ -654 +654 @@
         assert_string_is_neither_NULL_nor_zerolength(prompt);
 
-        log_msg(0, prompt);
+        mr_msg(0, prompt);
         if (g_text_mode) {
             printf
@@ -1054 +1054 @@
         char *p;
 
-//  log_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);
+//  mr_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);
         if (!g_text_mode) {
             assert(blurb1 != NULL);
@@ -1072 +1072 @@
                          blurb1, blurb2, blurb3, g_current_progress,
                          g_maximum_progress);
-                log_msg(0, tmp);
+                mr_msg(0, tmp);
                 mr_free(tmp);
                 g_current_progress = g_maximum_progress;
@@ -1123 +1123 @@
 
             if (percentage > 100) {
-                log_msg(2, _("percentage = %d"), percentage);
+                mr_msg(2, _("percentage = %d"), percentage);
             }
             mr_asprintf(&taskprogress,
@@ -1340 +1340 @@
         if (!(fin = fopen(source_file, "r"))) {
             log_OS_error(source_file);
-            log_msg(2, "Can't open %s; therefore, cannot popup list",
+            mr_msg(2, "Can't open %s; therefore, cannot popup list",
                     source_file);
             return (1);
         }
-        log_msg(2, "Loading %s", source_file);
+        mr_msg(2, "Loading %s", source_file);
         for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM;
              filelist->entries++) {
@@ -1404 +1404 @@
                            (void *) &dummy_fle,
                            sizeof(struct s_filelist_entry));
-                    log_msg(2, "Swapping %s and %s",
+                    mr_msg(2, "Swapping %s and %s",
                             filelist->el[i].filename,
                             filelist->el[i + 1].filename);
@@ -1478 +1478 @@
         assert_string_is_neither_NULL_nor_zerolength(source_file);
         if (g_text_mode) {
-            log_msg(2, "Text mode. Therefore, no popup list.");
+            mr_msg(2, "Text mode. Therefore, no popup list.");
             return;
         }
-        log_msg(2, "Examining file %s", source_file);
+        mr_msg(2, "Examining file %s", source_file);
 
         lng = count_lines_in_file(source_file);
         if (lng < 1) {
-            log_msg(2, "No lines in file. Therefore, no popup list.");
+            mr_msg(2, "No lines in file. Therefore, no popup list.");
             return;
         } else if (lng >= ARBITRARY_MAXIMUM) {
-            log_msg(2, "Too many files differ for me to list.");
+            mr_msg(2, "Too many files differ for me to list.");
             return;
         }
@@ -1498 +1498 @@
 
         if (load_filelist_into_array(filelist, source_file)) {
-            log_msg(2, "Can't open %s; therefore, cannot popup list",
+            mr_msg(2, "Can't open %s; therefore, cannot popup list",
                     source_file);
             return;
         }
-        log_msg(2, "%d files loaded into filelist array",
+        mr_msg(2, "%d files loaded into filelist array",
                 filelist->entries);
         for (i = 0; i < filelist->entries; i++) {

trunk/mondo/src/mondoarchive/main.c

@@ -53 +53 @@
 void welcome_to_mondoarchive()
 {
-    log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
+    mr_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
             PACKAGE_VERSION);
-    log_msg(0, "running on %s architecture", get_architecture());
-    log_msg(0,
+    mr_msg(0, "running on %s architecture", get_architecture());
+    mr_msg(0,
             "-----------------------------------------------------------");
-    log_msg(0,
+    mr_msg(0,
             "NB: Mondo logs almost everything, so don't panic if you see");
-    log_msg(0,
+    mr_msg(0,
             "some error messages.  Please read them carefully before you");
-    log_msg(0,
+    mr_msg(0,
             "decide to break out in a cold sweat.    Despite (or perhaps");
-    log_msg(0,
+    mr_msg(0,
             "because of) the wealth of messages. some users are inclined");
-    log_msg(0,
+    mr_msg(0,
             "to stop reading this log. If Mondo stopped for some reason,");
-    log_msg(0,
+    mr_msg(0,
             "chances are it's detailed here.  More than likely there's a");
-    log_msg(0,
+    mr_msg(0,
             "message at the very end of this log that will tell you what");
-    log_msg(0,
+    mr_msg(0,
             "is wrong. Please read it!                          -Devteam");
-    log_msg(0,
+    mr_msg(0,
             "-----------------------------------------------------------");
 
-    log_msg(0, "Zero...");
-    log_msg(1, "One...");
-    log_msg(2, "Two...");
-    log_msg(3, "Three...");
-    log_msg(4, "Four...");
-    log_msg(5, "Five...");
-    log_msg(6, "Six...");
-    log_msg(7, "Seven...");
-    log_msg(8, "Eight...");
+    mr_msg(0, "Zero...");
+    mr_msg(1, "One...");
+    mr_msg(2, "Two...");
+    mr_msg(3, "Three...");
+    mr_msg(4, "Four...");
+    mr_msg(5, "Five...");
+    mr_msg(6, "Six...");
+    mr_msg(7, "Seven...");
+    mr_msg(8, "Eight...");
     printf("See %s for details of backup run.\n", MONDO_LOGFILE);
 }
@@ -96 +96 @@
 void distro_specific_kludges_at_start_of_mondoarchive()
 {
-    log_msg(2, "Unmounting old ramdisks if necessary");
+    mr_msg(2, "Unmounting old ramdisks if necessary");
     stop_magicdev_if_necessary();   // for RH+Gnome users
     run_program_and_log_output
@@ -111 +111 @@
 void distro_specific_kludges_at_end_of_mondoarchive()
 {
-    log_msg(2, "Restarting magicdev if necessary");
+    mr_msg(2, "Restarting magicdev if necessary");
     sync();
     restart_magicdev_if_necessary();    // for RH+Gnome users
 
-    log_msg(2, "Restarting supermounts if necessary");
+    mr_msg(2, "Restarting supermounts if necessary");
     sync();
     remount_supermounts_if_necessary(); // for Mandrake users
 
-    log_msg(2, "Unmounting /boot if necessary");
+    mr_msg(2, "Unmounting /boot if necessary");
     sync();
     unmount_boot_if_necessary();    // for Gentoo users
@@ -181 +181 @@
     /* initialize log file with time stamp */
     unlink(MONDO_LOGFILE);
-    log_msg(0, "Time started: %s", mr_date());
+    mr_msg_init(MONDO_LOGFILE,4);
+    mr_msg(0, "Time started: %s", mr_date());
 
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
@@ -196 +197 @@
     /* Configure the bkpinfo structure, global file paths, etc. */
     g_main_pid = getpid();
-    log_msg(9, "This");
+    mr_msg(9, "This");
 
     register_pid(g_main_pid, "mondo");
@@ -203 +204 @@
     run_program_and_log_output("dmesg -n1", TRUE);
 
-    log_msg(9, "Next");
+    mr_msg(9, "Next");
     welcome_to_mondoarchive();
     distro_specific_kludges_at_start_of_mondoarchive();
@@ -324 +325 @@
                 (_("Errors were detected in the command line you supplied.\n"));
             printf(_("Please review the log file - %s \n"),MONDO_LOGFILE);
-            log_msg(1, "Mondoarchive will now exit.");
+            mr_msg(1, "Mondoarchive will now exit.");
             finish(1);
         }
@@ -388 +389 @@
                 (_("Type 'less /tmp/changed.files' to see which files don't match the archives"));
         } else {
-            log_msg(1,
+            mr_msg(1,
                     _("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()");
         }
     } else {
@@ -431 +432 @@
 
     /* finalize log file with time stamp */
-    log_msg(0, "Time finished: %s", mr_date());
+    mr_msg(0, "Time finished: %s", mr_date());
 
     if (!g_text_mode) {

trunk/mondo/src/mondoarchive/mondo-cli.c

@@ -92 +92 @@
     {
 */
-    log_msg(3, "Switches:-");
+    mr_msg(3, "Switches:-");
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
             mr_asprintf(&tmp, "-%c %s", i, flag_val[i]);
-            log_msg(3, tmp);
+            mr_msg(3, tmp);
             mr_free(tmp);
         }
@@ -162 +162 @@
         mr_asprintf(&comment, "media_size[%d] = %ld", j,
                 bkpinfo->media_size[j]);
-        log_msg(3, comment);
+        mr_msg(3, comment);
         mr_free(comment);
     }
@@ -170 +170 @@
     for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
         if (bkpinfo->media_size[j] <= 0) {
-            log_msg(1, "You gave media #%d an invalid size\n", j);
+            mr_msg(1, "You gave media #%d an invalid size\n", j);
             return (-1);
         }
@@ -252 +252 @@
         if (tmp1) {
             flag_set['R'] = TRUE;
-            log_msg(1, "Using star instead of afio");
+            mr_msg(1, "Using star instead of afio");
         } else {
             fatal_error
@@ -286 +286 @@
     if (flag_set['I']) {
         if (!strcmp(bkpinfo->include_paths, "/")) {
-            log_msg(2, "'/' is pleonastic.");
+            mr_msg(2, "'/' is pleonastic.");
             bkpinfo->include_paths = NULL;
         }
@@ -299 +299 @@
                 *q = '\0';
                 if (stat(p, &buf) != 0) {
-                    log_msg(1, "ERROR ! %s doesn't exist", p);
+                    mr_msg(1, "ERROR ! %s doesn't exist", p);
                     fatal_error("ERROR ! You specified a directory to include which doesn't exist");
                 }
@@ -305 +305 @@
             } else {
                 if (stat(p, &buf) != 0) {
-                    log_msg(1, "ERROR ! %s doesn't exist", p);
+                    mr_msg(1, "ERROR ! %s doesn't exist", p);
                     fatal_error("ERROR ! You specified a directory to include which doesn't exist");
                 }
@@ -321 +321 @@
         mr_free(tmp1);
 
-        log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
+        mr_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
         if (bkpinfo->include_paths[0] == '-') {
             retval++;
@@ -373 +373 @@
             }
         } else {
-            log_msg(3, "flag_val['c'] = %s", flag_val['c']);
-            log_msg(3, "flag_val['w'] = %s", flag_val['w']);
+            mr_msg(3, "flag_val['c'] = %s", flag_val['c']);
+            mr_msg(3, "flag_val['w'] = %s", flag_val['w']);
             if (flag_set['c']) {
                 bkpinfo->cdrw_speed = atoi(flag_val['c']);
@@ -492 +492 @@
             log_to_screen(_("NFS share is not mounted. Please mount it.\n"));
         }
-        log_msg(3, "mount = %s", bkpinfo->nfs_mount);
-        log_msg(3, "isodir= %s", bkpinfo->isodir);
+        mr_msg(3, "mount = %s", bkpinfo->nfs_mount);
+        mr_msg(3, "isodir= %s", bkpinfo->isodir);
     }
 
@@ -556 +556 @@
                 /* End of bug fix */
                 if (stat(p, &buf) != 0) {
-                    log_msg(1, "WARNING ! %s doesn't exist", p);
+                    mr_msg(1, "WARNING ! %s doesn't exist", p);
                 }
                 p = q+1 ;
             } else {
                 if (stat(p, &buf) != 0) {
-                    log_msg(1, "WARNING ! %s doesn't exist", p);
+                    mr_msg(1, "WARNING ! %s doesn't exist", p);
                 }
                 p = NULL;
@@ -593 +593 @@
         mr_free(tmp1);
 
-        log_msg(3, "-N means we're now excluding %s",
+        mr_msg(3, "-N means we're now excluding %s",
                 bkpinfo->exclude_paths);
     }
@@ -599 +599 @@
     if (flag_set['b']) {
         mr_asprintf(&psz, flag_val['b']);
-        log_msg(1, "psz = '%s'", psz);
+        mr_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
             psz[strlen(psz) - 1] = '\0';
@@ -608 +608 @@
         mr_free(psz);
 
-        log_msg(1, "'%s' --> %ld", flag_val['b'], itbs);
-        log_msg(1, "Internal tape block size is now %ld bytes", itbs);
+        mr_msg(1, "'%s' --> %ld", flag_val['b'], itbs);
+        mr_msg(1, "Internal tape block size is now %ld bytes", itbs);
         if (itbs % 512 != 0 || itbs < 256 || itbs > 1024L * 1024) {
             fatal_error
@@ -776 +776 @@
             (BOOT_LOADER_CHARS,
              (bkpinfo->boot_loader = flag_val['l'][0]))) {
-            log_msg(1, "%c? What is %c? I need G, L, E or R.",
+            mr_msg(1, "%c? What is %c? I need G, L, E or R.",
                     bkpinfo->boot_loader, bkpinfo->boot_loader);
             fatal_error
@@ -795 +795 @@
         }
         i = which_boot_loader(tmp);
-        log_msg(3, "boot loader is %c, residing at %s", i, tmp);
+        mr_msg(3, "boot loader is %c, residing at %s", i, tmp);
         printf(_("boot loader is %c, residing at %s\n"), i, tmp);
         mr_free(tmp);
@@ -973 +973 @@
 void help_screen()
 {
-    log_msg(1, "Type 'man mondo-archive' for more information\n");
+    mr_msg(1, "Type 'man mondo-archive' for more information\n");
     exit(1);
 }
@@ -1065 +1065 @@
 void termination_in_progress(int sig)
 {
-    log_msg(1, "Termination in progress");
+    mr_msg(1, "Termination in progress");
     usleep(1000);
     pthread_exit(0);

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);