Changeset 1107 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

log_msg => mr_msg for common files

Location:

branches/stable/mondo/src/common

Files:

• libmondo-archive.c (modified) (102 diffs)
• libmondo-devices.c (modified) (61 diffs)
• libmondo-fifo.c (modified) (3 diffs)
• libmondo-filelist.c (modified) (49 diffs)
• libmondo-files.c (modified) (9 diffs)
• libmondo-fork.c (modified) (28 diffs)
• libmondo-mountlist.c (modified) (6 diffs)
• libmondo-raid.c (modified) (9 diffs)
• libmondo-stream.c (modified) (17 diffs)
• libmondo-tools.c (modified) (18 diffs)
• libmondo-verify.c (modified) (31 diffs)
• newt-specific.c (modified) (24 diffs)

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

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

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

@@ -108 +108 @@
     strcpy(tmp, where_is_root_mounted());
     sprintf(comment, "root is mounted at %s\n", tmp);
-    log_msg(0, comment);
-    log_msg(0,
+    mr_msg(0, comment);
+    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);
@@ -141 +141 @@
     mr_free(tmp);
     mr_free(comment);
-    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);
 }
@@ -226 +226 @@
 #endif
 
-    log_msg(3, "Ejecting %s", dev);
+    mr_msg(3, "Ejecting %s", dev);
     res2 = run_program_and_log_output(command, 1);
     mr_free(command);
@@ -483 +483 @@
     }
     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);
@@ -521 +521 @@
     if (g_cdrw_drive_is_here[0]) {
         strcpy(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);
         mr_free(comment);
         mr_free(tmp);
@@ -529 +529 @@
     }
     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?");
         mr_free(comment);
@@ -621 +621 @@
     if (g_cdrom_drive_is_here[0] && !isdigit(g_cdrom_drive_is_here[0])) {
         strcpy(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);
         retval = 0;
         goto end_of_find_cdrom_device;
@@ -627 +627 @@
     if (the_last_place_i_found_it[0] != '\0' && !try_to_mount) {
         strcpy(output, the_last_place_i_found_it);
-        log_msg(3,
+        mr_msg(3,
                 "find_cdrom_device() --- returning last found location - '%s'",
                 output);
@@ -645 +645 @@
     if (!find_home_of_exe(cdr_exe)) {
         strcpy(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.");
             retval = 1;
             goto end_of_find_cdrom_device;
@@ -659 +659 @@
     fin = popen(command, "r");
     if (!fin) {
-        log_msg(4, "command=%s", command);
+        mr_msg(4, "command=%s", command);
         log_OS_error("Cannot popen command");
         return (1);
@@ -690 +690 @@
 #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 {
         sprintf(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 (fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
                  fgets(tmp, MAX_STR_LEN, fin)) {
-                log_msg(5, "--> '%s'", tmp);
+                mr_msg(5, "--> '%s'", tmp);
                 if (tmp[0] != ' ' && tmp[1] != ' ') {
                     p = strchr(tmp, ':');
@@ -706 +706 @@
                         if (strstr(tmp, "DVD")) {
                             sprintf(dvd_last_resort, "/dev/%s", tmp);
-                            log_msg(4,
+                            mr_msg(4,
                                     "Ignoring '%s' because it's a DVD drive",
                                     tmp);
@@ -723 +723 @@
 #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 (!
@@ -759 +759 @@
 #else
     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);
         strcpy(output, dvd_last_resort);
@@ -768 +768 @@
                 strrchr(output, '/') + 1);
         if (system(tmp) == 0) {
-            log_msg(4,
+            mr_msg(4,
                     "%s is not right. It's being SCSI-emulated. Continuing.",
                     output);
@@ -777 +777 @@
 
     if (found_it) {
-        log_msg(4, "(find_cdrom_device) --> '%s'", output);
+        mr_msg(4, "(find_cdrom_device) --> '%s'", output);
         if (!does_device_exist(output)) {
             found_it = FALSE;
-            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.");
         }
     }
 
     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"))) {
@@ -828 +828 @@
     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;
         } else {
             sprintf(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;
             } else {
                 sprintf(command, "umount %s", output);
                 paranoid_system(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);
             }
         }
@@ -846 +846 @@
     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.");
             return (1);
         }
-        log_msg(3, "(find_cdrom_device) --> '%s'", output);
+        mr_msg(3, "(find_cdrom_device) --> '%s'", output);
         strcpy(the_last_place_i_found_it, output);
         strcpy(g_cdrom_drive_is_here, output);
@@ -859 +859 @@
             "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2",
             cdr_exe, g_cdrw_drive_is_here);
-    log_msg(1, "command=%s", command);
+    mr_msg(1, "command=%s", command);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
     if (tmp[0]) {
         strcpy(output, tmp);
-        log_msg(4, "Finally found it at %s", output);
+        mr_msg(4, "Finally found it at %s", output);
         retval = 0;
         goto end_of_find_cdrom_device;
     } else {
-        log_msg(4, "Still couldn't find it.");
+        mr_msg(4, "Still couldn't find it.");
         retval = 1;
         goto end_of_find_cdrom_device;
@@ -897 +897 @@
     if (g_dvd_drive_is_here[0]) {
         strcpy(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 (0);
     }
@@ -904 +904 @@
             ("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])
         sprintf(tmp, call_program_and_get_last_line_of_output
@@ -916 +916 @@
         sprintf(output, "/dev/scd%d", devno);
         strcpy(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");
         retval = 1;
     }
 
     if (try_to_mount) {
-        log_msg(1, "Ignoring the fact that try_to_mount==TRUE");
+        mr_msg(1, "Ignoring the fact that try_to_mount==TRUE");
     }
     return (retval);
@@ -988 +988 @@
 
     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);
@@ -997 +997 @@
                     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));
@@ -1010 +1010 @@
             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");
         }
 /*  
@@ -1020 +1020 @@
       if (ioctl (fd, HDIO_GETGEO, &hdgeo) != -1)  {
       close (fd);
-      log_msg (2, "Geometry of drive %s is C:%d, H:%d, S%d, its size is %d MB", drive, hdgeo.cylinders, hdgeo.heads, hdgeo.sectors, (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors / 2 / 1024));
+      mr_msg (2, "Geometry of drive %s is C:%d, H:%d, S%d, its size is %d MB", drive, hdgeo.cylinders, hdgeo.heads, hdgeo.sectors, (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors / 2 / 1024));
       if ( hdgeo.cylinders && hdgeo.heads && hdgeo.sectors ) {
           outvalB = ((long) (hdgeo.cylinders * hdgeo.heads * hdgeo.sectors / 2 / 1024));
@@ -1034 +1034 @@
     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);
 
@@ -1077 +1077 @@
         close(fd);
     }
-    log_msg(4, "drive = %s, error = %s", drive, strerror(errno));
+    mr_msg(4, "drive = %s, error = %s", drive, strerror(errno));
     fatal_error("GPSOD: Unable to get size of drive");
 #else
@@ -1087 +1087 @@
         if (ioctl(fd, HDIO_GETGEO, &hdgeo) != -1) {
             close(fd);
-            log_msg(2,
+            mr_msg(2,
                     "Geometry of drive %s is C:%d, H:%d, S%d, its size is %d MB",
                     drive, hdgeo.cylinders, hdgeo.heads, hdgeo.sectors,
@@ -1161 +1161 @@
     }
     if (!(p = strstr(tmp, "GB")) && !(p = strstr(tmp, "MB"))) {
-        log_msg(3, "Cannot find %s's size: dmesg isn't helping either.",
+        mr_msg(3, "Cannot find %s's size: dmesg isn't helping either.",
                 drive);
         mr_free(tmp);
@@ -1280 +1280 @@
 //  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);
         sprintf(tmp, "/%s", device_raw);
@@ -1286 +1286 @@
         strcpy(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 (0);
@@ -1312 +1312 @@
     sprintf(tmp, "%s | grep -E \"^%s\" > /dev/null 2> /dev/null",
             SWAPLIST_COMMAND, device_with_space);
-    log_msg(4, "tmp (command) = '%s'", tmp);
+    mr_msg(4, "tmp (command) = '%s'", tmp);
     if (!system(tmp)) {
         retval = 1;
@@ -1434 +1434 @@
 
     }
-    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 *************************************************** */
@@ -1447 +1447 @@
 #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);
@@ -1491 +1491 @@
     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;
@@ -1504 +1504 @@
     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...
@@ -1520 +1520 @@
                     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);
@@ -1526 +1526 @@
             }
         }
-        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!");
@@ -1534 +1534 @@
     }
     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);
         sprintf(tmp, "Insisting on %s #%d",
@@ -1542 +1542 @@
                 media_descriptor_string(bkpinfo->backup_media_type),
                 cd_number_i_want);
-        log_msg(3, tmp);
+        mr_msg(3, tmp);
         while (what_number_cd_is_this(bkpinfo) != cd_number_i_want) {
             paranoid_system("sync");
@@ -1568 +1568 @@
             paranoid_system("sync");
         }
-        log_msg(1, "Thankyou. Proceeding...");
+        mr_msg(1, "Thankyou. Proceeding...");
         g_current_media_number = cd_number_i_want;
     }
@@ -1627 +1627 @@
         popup_and_OK("Please remove CD/floppy from drive(s)");
     }
-    log_msg(3, "media type = %s",
+    mr_msg(3, "media type = %s",
             bkptype_to_string(bkpinfo->backup_media_type));
     if (archiving_to_media) {
@@ -1664 +1664 @@
                 strcpy(tmp, "1");
                 sprintf(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);
@@ -1672 +1672 @@
                 strcpy(tmp, "4");
                 strcpy(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)) {
@@ -1699 +1699 @@
         if (bkpinfo->disaster_recovery) {
             strcpy(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
@@ -1706 +1706 @@
                 strcpy(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);
             if (bkpinfo->backup_media_type == dvd
                 || find_cdrom_device(bkpinfo->media_device, FALSE)) {
-                log_msg(1, "bkpinfo->media_device = %s",
+                mr_msg(1, "bkpinfo->media_device = %s",
                         bkpinfo->media_device);
                 sprintf(comment,
@@ -1723 +1723 @@
                 }
             }
-            log_msg(2, "%s device found at %s",
+            mr_msg(2, "%s device found at %s",
                     media_descriptor_string(bkpinfo->backup_media_type),
                     bkpinfo->media_device);
@@ -1773 +1773 @@
 
         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.");
             strcpy(bkpinfo->media_device, VANILLA_SCSI_TAPE);
             if ((fin = fopen(bkpinfo->media_device, "r"))) {
@@ -1816 +1816 @@
             finish(1);
         }
-        log_msg(4, "sz_size = %s", sz_size);
+        mr_msg(4, "sz_size = %s", sz_size);
         sz_size[0] = '\0';
 /*
@@ -1831 +1831 @@
                 friendly_sizestr_to_sizelong(sz_size) / 2 - 50;
         }
-        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;
@@ -1959 +1959 @@
             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;
 
@@ -2007 +2007 @@
             finish(1);
         }
-        log_msg(3, "prefix set to %s", bkpinfo->prefix);
+        mr_msg(3, "prefix set to %s", bkpinfo->prefix);
         break;
     default:
@@ -2146 +2146 @@
                 bkpinfo->nfs_mount);
 //      strcpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp));
-        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);
     }
@@ -2169 +2169 @@
             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;
         }
@@ -2354 +2354 @@
     }
 //  assert_string_is_neither_NULL_nor_zerolength(dev);
-    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);
     }
@@ -2365 +2365 @@
         && !run_program_and_log_output(command, FALSE)) {
         strcpy(output, dev);
-        log_msg(4, "Found it - %s", dev);
+        mr_msg(4, "Found it - %s", dev);
         return (TRUE);
     } else {
         output[0] = '\0';
-        log_msg(4, "It's not %s", dev);
+        mr_msg(4, "It's not %s", dev);
         return (FALSE);
     }
@@ -2646 +2646 @@
         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);
             sprintf(command, "file %s", curr_fname);
             strcpy(tmp, call_program_and_get_last_line_of_output(command));
@@ -2655 +2655 @@
             for (p = scratch; *p != '\0' && *p != '\''; p++);
             *p = '\0';
-            log_msg(0, "curr_fname %s --> '%s' --> %s", curr_fname, tmp,
+            mr_msg(0, "curr_fname %s --> '%s' --> %s", curr_fname, tmp,
                     scratch);
             if (scratch[0] == '/') {
@@ -2698 +2698 @@
     malloc_string(command);
     malloc_string(fdisk);
-    log_msg(0, "Looking for partition table format type");
+    mr_msg(0, "Looking for partition table format type");
     sprintf(fdisk, "/sbin/parted2fdisk");
-    log_msg(1, "Using %s", fdisk);
+    mr_msg(1, "Using %s", fdisk);
     sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
@@ -2708 +2708 @@
         strcpy(output, "GPT");
     }
-    log_msg(0, "Found %s partition table format type", output);
+    mr_msg(0, "Found %s partition table format type", output);
     mr_free(command);
     mr_free(tmp);

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

@@ -122 +122 @@
                 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);
     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);
     }
@@ -134 +134 @@
     sprintf(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.");
     }
     g_tape_buffer_size_MB = bufsize;
@@ -172 +172 @@
     sprintf(command,
             "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
-    log_msg(2, "kill_buffer() --- command = %s", command);
+    mr_msg(2, "kill_buffer() --- command = %s", command);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
     sprintf(command, "kill %s", tmp);
-    log_msg(2, "kill_buffer() --- command = %s", command);
+    mr_msg(2, "kill_buffer() --- command = %s", command);
     if (strlen(tmp) > 0) {
         run_program_and_log_output(command, TRUE);

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

@@ -165 +165 @@
     int retval = 0;
 
-    log_msg(1, "Sorting file %s", orig_fname);
+    mr_msg(1, "Sorting file %s", orig_fname);
     malloc_string(tmp_fname);
     malloc_string(command);
@@ -179 +179 @@
     retval = system(command);
     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);
         sprintf(command, "mv -f %s %s", tmp_fname, orig_fname);
         retval += run_program_and_log_output(command, 2);
         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);
     mr_free(command);
-    log_msg(1, "Finished sorting file %s", orig_fname);
+    mr_msg(1, "Finished sorting file %s", orig_fname);
     return (retval);
 }
@@ -289 +289 @@
         if (i > MAX_STR_LEN - 1) {
             incoming[MAX_STR_LEN - 30] = '\0';
-            log_msg(1, "Warning - truncating file %s's name", incoming);
+            mr_msg(1, "Warning - truncating file %s's name", incoming);
             err++;
         }
@@ -350 +350 @@
         sprintf(tmp, "Filelist divided into %ld sets", curr_set_no + 1);
     }
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
     close_evalcall_form();
     /* This is to work around an obscure bug in Newt; open a form, close it,
@@ -435 +435 @@
     pattr = popen(sys_call, "r");
     if (!pattr) {
-        log_msg(1, "Failed to open fattr() %s", sys_call);
+        mr_msg(1, "Failed to open fattr() %s", sys_call);
         return (1);
     }
     if (feof(pattr)) {
-        log_msg(1, "Failed to call fattr() %s", sys_call);
+        mr_msg(1, "Failed to call fattr() %s", sys_call);
         paranoid_pclose(pattr);
         return (2);
@@ -467 +467 @@
 
     if (!(fin = fopen(filelist, "r"))) {
-        log_msg(1, "Cannot openin filelist %s", filelist);
+        mr_msg(1, "Cannot openin filelist %s", filelist);
         return (1);
     }
@@ -473 +473 @@
     sprintf(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);
@@ -485 +485 @@
             file_to_analyze[i - 1] = '\0';
         }
-        log_msg(8, "Analyzing %s", file_to_analyze);
+        mr_msg(8, "Analyzing %s", file_to_analyze);
         asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
         asprintf(&sys_call, "%s 2>> /dev/null", strtmp);    // " MONDO_LOGFILE);
@@ -552 +552 @@
 
     malloc_string(command);
-    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.");
         sprintf(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);
@@ -589 +589 @@
             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) {
@@ -638 +638 @@
 
         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");
             fgets(current_subset_file, MAX_STR_LEN, faclin);
             continue;
@@ -653 +653 @@
         fgets(incoming, MAX_STR_LEN, 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); }
@@ -696 +696 @@
         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);
     }
@@ -708 +708 @@
         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);
     }
@@ -786 +786 @@
     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));
@@ -793 +793 @@
 /* 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);
@@ -801 +801 @@
 
     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);
     }
@@ -809 +809 @@
     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));
@@ -815 +815 @@
     } 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
@@ -826 +826 @@
     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;
@@ -843 +843 @@
         }
     }
-    log_msg(6, "Finally - added %s OK", original_string);
+    mr_msg(6, "Finally - added %s OK", original_string);
     return (0);
 }
@@ -886 +886 @@
     sprintf(command_to_open_fname, "gzip -dc %s", filelist_fname);
     sprintf(tmp, "zcat %s | wc -l", filelist_fname);
-    log_msg(6, "tmp = %s", tmp);
+    mr_msg(6, "tmp = %s", tmp);
     lines_in_filelist =
         atol(call_program_and_get_last_line_of_output(tmp));
@@ -949 +949 @@
 
     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);
@@ -962 +962 @@
 
     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;
@@ -1031 +1031 @@
     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)
@@ -1403 +1403 @@
 #endif
         mr_free(find_excludes);
-        log_msg(5, "find command = %s", strtmp);
+        mr_msg(5, "find command = %s", strtmp);
         system(strtmp);
         mr_free(strtmp);
@@ -1413 +1413 @@
         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
@@ -1420 +1420 @@
                 "grep -Fv \"%s\" %s > %s.new 2> /dev/null", dir,
                 g_skeleton_filelist, g_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",
                     g_skeleton_filelist, g_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);
@@ -1446 +1446 @@
     depth++;
 
-//  log_msg(0, "Cataloguing %s", dir);
+//  mr_msg(0, "Cataloguing %s", dir);
     if (sth[0] == ' ') {
         skip_these = sth;
@@ -1513 +1513 @@
         mr_free(find_skeleton_marker);
         unlink(g_skeleton_filelist);
-        log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
+        mr_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
     }
     mr_free(tmp);
@@ -1584 +1584 @@
     malloc_string(g_skeleton_filelist);
     exclude_paths = mr_malloc(1000);
-    log_msg(3, "Trying to write test string to exclude_paths");
+    mr_msg(3, "Trying to write test string to exclude_paths");
     strcpy(exclude_paths, "/blah /froo");
-    log_msg(3, "...Success!");
+    mr_msg(3, "...Success!");
     sprintf(sz_datefile, sz_datefile_wildcard, 0);
     if (!include_paths && !userdef_filelist) {
@@ -1613 +1613 @@
                                   ("date +%s"));
     } 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;
@@ -1619 +1619 @@
     } else {
         time_of_last_full_backup = statbuf.st_mtime;
-        log_msg(2, "Differential backup. Yay.");
+        mr_msg(2, "Differential backup. Yay.");
     }
 
 // 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);
@@ -1632 +1632 @@
         }
     } 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");
         sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media \
 /proc /sys /tmp /root/images/mondo /var/cache/mindi ", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
 
-        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");
         sprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
         make_hole_for_file(g_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");
@@ -1650 +1650 @@
         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);
@@ -1657 +1657 @@
             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);
@@ -1668 +1668 @@
         paranoid_fclose(fout);
     }
-    log_msg(2, "Copying new filelist to scratchdir");
+    mr_msg(2, "Copying new filelist to scratchdir");
     sprintf(command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
@@ -1675 +1675 @@
     sprintf(command, "mv -f %s %s", sz_filelist, tmpdir);
     paranoid_system(command);
-    log_msg(2, "Freeing variables");
+    mr_msg(2, "Freeing variables");
     mr_free(sz_filelist);
     mr_free(command);
@@ -1681 +1681 @@
     mr_free(tmp);
     mr_free(g_skeleton_filelist);
-    log_msg(2, "Exiting");
+    mr_msg(2, "Exiting");
     return (0);
 }
@@ -1720 +1720 @@
     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 */
@@ -1726 +1726 @@
     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));
@@ -1733 +1733 @@
 /* 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);
@@ -1741 +1741 @@
 
     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);
     }
@@ -1772 +1772 @@
     size_t len = 0;             // Scrub's patch doesn't work without that
 
-//  log_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE");
+//  mr_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE");
     malloc_string(fname);
     malloc_string(tmp);
-    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(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");
@@ -1808 +1808 @@
 */
 
-        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) {
@@ -1817 +1817 @@
                     strcpy(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);
@@ -1852 +1852 @@
 
     malloc_string(tmp);
-    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);
@@ -1866 +1866 @@
             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);
@@ -1879 +1879 @@
         if (nod && flag_em) {
             toggle_path_selection(filelist, tmp, TRUE);
-            log_msg(5, "Flagged '%s'", tmp);
+            mr_msg(5, "Flagged '%s'", tmp);
         }
     }

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

@@ -183 +183 @@
     //  assert_string_is_neither_NULL_nor_zerolength(filename);
     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);
     }
@@ -355 +355 @@
     strcpy(output, incoming);
     if (output[0] != '\0' && does_file_exist(output)) {
-        log_msg(4, "find_home_of_exe () --- Found %s at %s", fname,
+        mr_msg(4, "find_home_of_exe () --- Found %s at %s", fname,
                 incoming);
     } else {
         output[0] = '\0';
-        log_msg(4, "find_home_of_exe() --- Could not find %s", fname);
+        mr_msg(4, "find_home_of_exe() --- Could not find %s", fname);
     }
     mr_free(incoming);
@@ -462 +462 @@
         *p = '\0';
     }
-//  log_msg(2, "lastline='%s', ", p, lastline);
+//  mr_msg(2, "lastline='%s', ", p, lastline);
     if (!p) {
         return (0);
@@ -789 +789 @@
     strcpy(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);
     return (file_len_K);
 }
@@ -828 +828 @@
             ("Cannot open biggielist. OK, so estimate is based on filesets only.");
     } else {
-        log_msg(4, "Reading it...");
+        mr_msg(4, "Reading it...");
         for (fgets(fname, MAX_STR_LEN, fin); !feof(fin);
              fgets(fname, MAX_STR_LEN, fin)) {
@@ -853 +853 @@
             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);
             }
             sprintf(comment,
                     "After adding %s, scratchL+%ld now equals %ld", fname,
                     file_len_K, scratchL);
-            log_msg(4, comment);
+            mr_msg(4, comment);
             if (feof(fin)) {
                 break;
@@ -1074 +1074 @@
                         "Copying Mondo's core files to the scratch directory");
 
-    log_msg(4, "g_mondo_home='%s'", g_mondo_home);
+    mr_msg(4, "g_mondo_home='%s'", g_mondo_home);
     if (strlen(g_mondo_home) < 2) {
         find_and_store_mondoarchives_home(g_mondo_home);
@@ -1081 +1081 @@
             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");
@@ -1393 +1393 @@
                 "#!/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);
         sprintf(tmp, "chmod +x %s", outfile);
         paranoid_system(tmp);

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

@@ -102 +102 @@
 /*@***********   End Variables ***************************************/
 
-    log_msg(3, "Starting");
+    mr_msg(3, "Starting");
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
@@ -122 +122 @@
     resolve_naff_tokens(tmp, midway_call, cd_number_str, "_CD#_");
     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);
     sprintf(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);
     strcpy(tmp, command);
@@ -150 +150 @@
         }
 #endif
-        log_msg(1, "command = '%s'", command);
+        mr_msg(1, "command = '%s'", command);
         retval += system(command);
         if (!g_text_mode) {
@@ -156 +156 @@
         }
         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
@@ -164 +164 @@
     /* 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 =
@@ -181 +181 @@
   if (bkpinfo->backup_media_type == dvd && !bkpinfo->please_dont_eject_when_restoring)
     {
-      log_msg(3, "Ejecting DVD device");
+      mr_msg(3, "Ejecting DVD device");
       eject_device(bkpinfo->media_device);
     }
@@ -220 +220 @@
     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);
     }
@@ -256 +256 @@
     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-----------------------------");
     }
@@ -284 +284 @@
             if ((res == 0 && log_if_success)
                 || (res != 0 && log_if_failure)) {
-                log_msg(0, incoming);
+                mr_msg(0, incoming);
             }
         }
@@ -291 +291 @@
     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);
 }
@@ -340 +340 @@
     open_evalcall_form(what_i_am_doing);
     sprintf(tmp, "Executing %s", basic_call);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
@@ -350 +350 @@
         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);
         }
     }
@@ -375 +375 @@
     res = pclose(fin);
     /* Log actual pclose errors. */
-    if (errno) log_msg(5, "pclose err: %d", errno);
+    if (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. */
@@ -413 +413 @@
     FILE *ftmp;
 
-    log_msg(5, "Opening.");
+    mr_msg(5, "Opening.");
     malloc_string(tmp);
     tmp[0] = '\0';
@@ -435 +435 @@
                 fatal_error("Cannot write introductory block");
             }
-            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);
@@ -443 +443 @@
                 fatal_error("Cannot write post-thingy block");
             }
-            log_msg(7, "Subslice #%d written OK", subsliceno);
+            mr_msg(7, "Subslice #%d written OK", subsliceno);
             subsliceno++;
         }
@@ -456 +456 @@
             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");
@@ -465 +465 @@
         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);
@@ -477 +477 @@
             }
             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, 64, fin) != 64) {
@@ -489 +489 @@
     }
 
-//  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') {
@@ -497 +497 @@
         }
     } 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, 64, fin) != 64) {
                 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, 64, 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);
                 sprintf(tmp, "I am here - %lld", (long long)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);
@@ -522 +522 @@
     mr_free(buf);
     mr_free(tmp);
-    log_msg(3, "Successfully copied %ld bytes", bytes_written_out);
+    mr_msg(3, "Successfully copied %ld bytes", bytes_written_out);
     return (retval);
 }
@@ -588 +588 @@
     sprintf(command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
             tempfile);
-    log_msg(3, command);
+    mr_msg(3, command);
     open_evalcall_form(title);
     if (!(pin = popen(command, "r"))) {
@@ -599 +599 @@
         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;
         }
@@ -634 +634 @@
     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));
@@ -675 +675 @@
     strcpy(title, tt);
     sprintf(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,
@@ -682 +682 @@
     }
 
-    log_msg(8, "Parent running");
+    mr_msg(8, "Parent running");
     open_evalcall_form(title);
     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;
         }
@@ -711 +711 @@
         res = 666;
     }
-    log_msg(3, "Parent res = %d", res);
+    mr_msg(3, "Parent res = %d", res);
     mr_free(command);
     mr_free(title);

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

@@ -382 +382 @@
         strcat(flaws_str, tmp);
         res++;
-        log_msg(1, tmp);
+        mr_msg(1, tmp);
         goto endoffunc;
     } else {
@@ -744 +744 @@
                     "Not putting %s in list of drives: it's a virtual drive",
                     drive);
-            log_msg(8, tmp);
+            mr_msg(8, tmp);
             continue;
         }
@@ -753 +753 @@
                     "Not putting %s in list of drives: it has zero size (maybe an LVM volume)",
                     drive);
-            log_msg(8, tmp);
+            mr_msg(8, tmp);
             continue;
         }
@@ -771 +771 @@
                 "Putting %s with size %lli in list of drives",
                 drive, size);
-        log_msg(8, tmp);
+        mr_msg(8, tmp);
 
         (void) truncate_to_drive_name(drive);
@@ -783 +783 @@
     }
     drivelist->entries = noof_drives;
-    log_msg(8, "Made list of drives");
+    mr_msg(8, "Made list of drives");
     mr_free(drive);
     mr_free(tmp);
@@ -944 +944 @@
             !strcmp(mountlist->el[items].device, "devpts")
             ) {
-            log_msg(1,
+            mr_msg(1,
                     "Ignoring %s in mountlist - not loading that line :) ",
                     mountlist->el[items].device);

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

@@ -633 +633 @@
     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;
@@ -646 +646 @@
         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);
         strcpy(raidlist->el[items].raid_device, value);
         for (get_next_raidtab_line(fin, label, value);
@@ -660 +660 @@
     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);
     mr_free(tmp);
     mr_free(label);
@@ -732 +732 @@
             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")) {
@@ -991 +991 @@
   // 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;
   }
@@ -1037 +1037 @@
     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);
@@ -1064 +1064 @@
       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);
@@ -1108 +1108 @@
         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);
@@ -1200 +1200 @@
     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;
       }

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

@@ -376 +376 @@
             wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
         }
-        log_msg(1, "Got xattr");
+        mr_msg(1, "Got xattr");
     }
 // acl
@@ -396 +396 @@
             wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr);
         }
-        log_msg(1, "Got acl");
+        mr_msg(1, "Got acl");
     }
 // 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);
 }
@@ -590 +590 @@
 
     if (strncmp(tapedev, "/dev/", 5)) {
-        log_msg(1,
+        mr_msg(1,
                 "Not using 'mt setblk'. This isn't an actual /dev entry.");
         return (0);
@@ -933 +933 @@
 //    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) {
@@ -944 +944 @@
                     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");
@@ -961 +961 @@
 #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;
     sprintf(actual_cksum, "%04x%04x", crc16, crctt);
@@ -1054 +1054 @@
     }
     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);
@@ -1172 +1172 @@
         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) {
@@ -1182 +1182 @@
             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");
     }
     while (ctrl_chr != BLK_START_FILE) {
@@ -1193 +1193 @@
             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");
     }
     pA = strrchr(temp_fname, '/');
@@ -1210 +1210 @@
     }
     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) {
@@ -1255 +1255 @@
         }
     }
-    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);
@@ -1303 +1303 @@
         wrong_marker(BLK_START_OF_BACKUP, ctrlchr);
     } else {
-        log_msg(3, "Next tape opened OK. Whoopee!");
+        mr_msg(3, "Next tape opened OK. Whoopee!");
     }
     mr_free(sz_msg);
@@ -1381 +1381 @@
     char *fname;
 
-    log_msg(2, "I am now writing back catalog to tape");
+    mr_msg(2, "I am now writing back catalog to tape");
     malloc_string(fname);
     last = g_tapecatalog->entries - 1;
@@ -1388 +1388 @@
                 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) {
@@ -1406 +1406 @@
     }
     mr_free(fname);
-    log_msg(2, "Finished writing back catalog to tape");
+    mr_msg(2, "Finished writing back catalog to tape");
     return (res);
 }
@@ -1646 +1646 @@
             marker_to_string(control_char), p,
             (long) length_of_incoming_file >> 10);
-    log_msg(6, tmp);
+    mr_msg(6, tmp);
 /*  log_tape_pos(); */
     return (0);

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

@@ -229 +229 @@
         }
     }
-//  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);
 }
@@ -430 +430 @@
         1024;
 
-    log_msg(1, "Foo");
+    mr_msg(1, "Foo");
     if (bkpinfo->backup_media_type == tape) {
-        log_msg(1, "Bar");
+        mr_msg(1, "Bar");
         sprintf(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
@@ -548 +548 @@
             }       
         }
-        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
@@ -791 +791 @@
     int i;
 
-    log_msg(1, "Hi");
+    mr_msg(1, "Hi");
     assert(bkpinfo != NULL);
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
@@ -1102 +1102 @@
     } 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);
@@ -1184 +1184 @@
 
     if (!g_autofs_exe[0]) {
-        log_msg(3, "No autofs detected.");
+        mr_msg(3, "No autofs detected.");
     } else {
-        log_msg(3, "%s --- autofs detected", g_autofs_exe);
+        mr_msg(3, "%s --- autofs detected", g_autofs_exe);
 // FIXME -- only disable it if it's running ---  sprintf(tmp, "%s status", autofs_exe);
         sprintf(tmp, "%s stop", g_autofs_exe);
@@ -1206 +1206 @@
 
     if (!g_autofs_stopped || !g_autofs_exe[0]) {
-        log_msg(3, "No autofs detected.");
+        mr_msg(3, "No autofs detected.");
         return;
     }
@@ -1227 +1227 @@
     char command[MAX_STR_LEN];
 
-    log_msg(1, "Started sub");
-    log_msg(4, "About to set g_boot_mountpt[0] to '\\0'");
+    mr_msg(1, "Started sub");
+    mr_msg(4, "About to set g_boot_mountpt[0] to '\\0'");
     g_boot_mountpt[0] = '\0';
-    log_msg(4, "Done. Great. Seeting command to something");
+    mr_msg(4, "Done. Great. Seeting command to something");
     strcpy(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);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    log_msg(4, "tmp = '%s'", tmp);
+    mr_msg(4, "tmp = '%s'", tmp);
     if (tmp[0]) {
         log_it("/boot is at %s according to /etc/fstab", tmp);
@@ -1241 +1241 @@
             if (!run_program_and_log_output("mount /boot", 5)) {
                 strcpy(g_boot_mountpt, "/boot");
-                log_msg(1, "Mounted /boot");
+                mr_msg(1, "Mounted /boot");
             } else {
                 log_it("...ignored cos it's a label :-)");
@@ -1247 +1247 @@
         } else {
             sprintf(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)) {
                 strcpy(g_boot_mountpt, tmp);
@@ -1257 +1257 @@
                 if (run_program_and_log_output(tmp, 5)) {
                     g_boot_mountpt[0] = '\0';
-                    log_msg(1, "Plan B");
+                    mr_msg(1, "Plan B");
                     if (!run_program_and_log_output("mount /boot", 5)) {
                         strcpy(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.");
                     }
@@ -1269 +1269 @@
         }
     }
-    log_msg(1, "Ended sub");
+    mr_msg(1, "Ended sub");
 }
 
@@ -1280 +1280 @@
     char tmp[MAX_STR_LEN];
 
-    log_msg(3, "starting");
+    mr_msg(3, "starting");
     if (g_boot_mountpt[0]) {
         sprintf(tmp, "umount %s", g_boot_mountpt);
@@ -1287 +1287 @@
         }
     }
-    log_msg(3, "leaving");
+    mr_msg(3, "leaving");
 }
 
@@ -1336 +1336 @@
 
 /**
- * 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.
  */
@@ -1444 +1444 @@
        for(i=0;list_of_arrays[i];i++)
        {
-       log_msg(5, "Allocating %d", i);
+       mr_msg(5, "Allocating %d", i);
        ppcurr = list_of_arrays[i];
        if (mal)
@@ -1456 +1456 @@
        }
        }
-       log_msg(5, "Returning");
+       mr_msg(5, "Returning");
      */
 }
@@ -1490 +1490 @@
            ("ps ax | grep -w magicdev | grep -v grep | tr -s '\t' ' '| cut -d' ' -f6-99"));
     if (g_magicdev_command[0]) {
-        log_msg(1, "g_magicdev_command = '%s'", g_magicdev_command);
+        mr_msg(1, "g_magicdev_command = '%s'", g_magicdev_command);
         paranoid_system("killall magicdev");
     }

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

@@ -74 +74 @@
 */
 
-    log_msg(1, "Now scanning log file for 'afio: ' stuff");
+    mr_msg(1, "Now scanning log file for 'afio: ' stuff");
     sprintf(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);
     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");
     sprintf(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);
     if (res) {
-        log_msg(2, "Warning - failed to think");
+        mr_msg(2, "Warning - failed to think");
     }
 //  exclude_nonexistent_files (afio_found_changes);
@@ -99 +99 @@
             ignorefiles_fname, afio_found_changes, afio_found_changes,
             changedfiles_fname);
-    log_msg(2, command);
+    mr_msg(2, command);
     paranoid_system(command);
     mr_free(command);
@@ -146 +146 @@
     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,
@@ -276 +276 @@
 // 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 (!
@@ -282 +282 @@
                  fopen(slice_fname(bigfile_num, slice_num, mountpoint, ""),
                        "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);
@@ -293 +293 @@
             sprintf(tmp, "%s/%s", bkpinfo->restore_path,
                     biggiestruct.filename);
-            log_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp);
+            mr_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp);
             if (!(forig = fopen(tmp, "r"))) {
-                log_msg(2, "Failed to open bigfile. Darn.");
+                mr_msg(2, "Failed to open bigfile. Darn.");
                 retval++;
             }
@@ -301 +301 @@
         } else if (does_file_exist
                    (slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
-            log_msg(2, "ISO=%d  bigfile=%ld ---END---",
+            mr_msg(2, "ISO=%d  bigfile=%ld ---END---",
                     g_current_media_number, bigfile_num);
             bigfile_num++;
@@ -307 +307 @@
             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) {
@@ -341 +341 @@
                 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);
@@ -350 +350 @@
                 }
                 if (res) {
-                    log_msg(0,
+                    mr_msg(0,
                             "afio: \"%s\": Corrupt biggie file, says libmondo-archive.c",
                             biggiestruct.filename);
@@ -422 +422 @@
     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.");
         strcpy(bkpinfo->zip_exe, "lzop");
         strcpy(bkpinfo->zip_suffix, "lzo");
@@ -430 +430 @@
     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");
@@ -438 +438 @@
     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.");
         strcpy(bkpinfo->zip_exe, "bzip2");
         strcpy(bkpinfo->zip_suffix, "bz2");
@@ -458 +458 @@
                 bkpinfo->zip_exe, tarball_fname, outlog, outlog);
     }
-    log_msg(6, "command=%s", command);
+    mr_msg(6, "command=%s", command);
     paranoid_system(command);
     if (length_of_file(outlog) < 10) {
@@ -477 +477 @@
                         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++;
@@ -487 +487 @@
                 } 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++;
                 }
@@ -533 +533 @@
     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");
@@ -589 +589 @@
         sprintf(tmp,
                 "Afioball '%s' no longer matches your live filesystem", p);
-        log_msg(0, tmp);
+        mr_msg(0, tmp);
         retval++;
     }
@@ -664 +664 @@
                                           &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);
         }
@@ -676 +676 @@
             sprintf(tmp, "orig cksum=%s; curr cksum=%s", biggie_cksum,
                     orig_cksum);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
             sprintf(tmp, "%s has changed on live filesystem",
                     biggie_fname);
@@ -793 +793 @@
         }
     }
-    log_msg(1, "All done with afioballs");
+    mr_msg(1, "All done with afioballs");
     close_progress_form();
     mr_free(tmp);
@@ -868 +868 @@
     }
     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.", "",
@@ -960 +960 @@
                 "%s not found; assuming you backed up to CD; verifying CD...",
                 fname);
-        log_msg(2, tmp);
+        mr_msg(2, tmp);
         if (bkpinfo->manual_cd_tray) {
             popup_and_OK("Please push CD tray closed.");
@@ -992 +992 @@
         }
     }
-    log_msg(2, "OK, I've mounted the ISO/CD\n");
+    mr_msg(2, "OK, I've mounted the ISO/CD\n");
     sprintf(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.");
@@ -1024 +1024 @@
         retval++;
     } else {
-        log_msg(2, "OK, I've unmounted the ISO file\n");
+        mr_msg(2, "OK, I've unmounted the ISO file\n");
     }
     if (!does_file_exist(fname)) {
@@ -1031 +1031 @@
         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");
         }
     }
@@ -1063 +1063 @@
     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);
@@ -1083 +1083 @@
             (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)
@@ -1106 +1106 @@
                 "%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);
         log_to_screen
             ("See /tmp/changed.files for a list of nonmatching files.");

branches/stable/mondo/src/common/newt-specific.c

@@ -213 +213 @@
         usleep(500000);
         if (g_text_mode) {
-            log_msg(2, "Closing evalcall form");
+            mr_msg(2, "Closing evalcall form");
             return;
         }
@@ -233 +233 @@
         }
         if (g_current_progress == -999) {
-            log_msg(2,
+            mr_msg(2,
                     "Trying to close the progress form when it ain't open!");
             return;
@@ -241 +241 @@
         sleep(1);
         if (g_text_mode) {
-            log_msg(2, "Closing progress form");
+            mr_msg(2, "Closing progress form");
             return;
         }
@@ -285 +285 @@
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
-        log_msg(1, "Fatal error received - '%s'", error_string);
+        mr_msg(1, "Fatal error received - '%s'", error_string);
         printf("Fatal error... %s\n", 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);
             mr_free(tmp);
@@ -296 +296 @@
         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);
                 mr_free(tmp);
@@ -303 +303 @@
         }
 
-        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!");
             mr_free(tmp);
             finish(1);
@@ -311 +311 @@
 
         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");
@@ -320 +320 @@
         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);
@@ -337 +337 @@
 
         if (!g_text_mode) {
-            log_msg(0, fatalstr);
-            log_msg(0, error_string);
+            mr_msg(0, fatalstr);
+            mr_msg(0, error_string);
             //      popup_and_OK (error_string);
             newtFinished();
@@ -359 +359 @@
         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");
         }
         mr_free(tmp);
@@ -402 +402 @@
         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();
             }
@@ -504 +504 @@
         va_start(args, fmt);
         vsprintf(output, fmt, args);
-        log_msg(0, output);
+        mr_msg(0, output);
         output[80] = '\0';
         va_end(args);
@@ -549 +549 @@
      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);
@@ -583 +583 @@
 //  center_string (title, 80);
         if (g_text_mode) {
-            log_msg(0, title);
+            mr_msg(0, title);
         } else {
             strcpy(tmp, title);
@@ -592 +592 @@
         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);
@@ -661 +661 @@
         strcpy(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);
@@ -697 +697 @@
         assert_string_is_neither_NULL_nor_zerolength(prompt);
 
-        log_msg(0, prompt);
+        mr_msg(0, prompt);
         if (g_text_mode) {
             printf
@@ -1104 +1104 @@
         char *tmp;
 
-//  log_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);
+//  mr_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);
         percentline_str = mr_malloc(MAX_NEWT_COMMENT_LEN);
         timeline_str = mr_malloc(MAX_NEWT_COMMENT_LEN);
@@ -1128 +1128 @@
                         blurb1, blurb2, blurb3, g_current_progress,
                         g_maximum_progress);
-                log_msg(0, tmp);
+                mr_msg(0, tmp);
                 g_current_progress = g_maximum_progress;
             }
@@ -1169 +1169 @@
             }
             if (percentage > 100) {
-                log_msg(2, "percentage = %d", percentage);
+                mr_msg(2, "percentage = %d", percentage);
             }
             sprintf(taskprogress + strlen(taskprogress),
@@ -1402 +1402 @@
         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);
             mr_free(tmp);
             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++) {
@@ -1459 +1459 @@
                            (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);
@@ -1544 +1544 @@
         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.");
             goto free_to_go;
         }
-        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.");
             mr_free(reason);
             goto free_to_go;
         } 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.");
             goto free_to_go;
         }
@@ -1565 +1565 @@
 
         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);
             mr_free(reason);
             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++) {