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

Timestamp:

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

Author:

Bruno Cornec

Message:

log_msg => mr_msg in trunk

Location:

trunk/mondo/src/mondoarchive

Files:

• main.c (modified) (9 diffs)
• mondo-cli.c (modified) (18 diffs)

trunk/mondo/src/mondoarchive/main.c

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

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

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