Changeset 1086 in MondoRescue for trunk/mondo/src/common/libmondo-fork.c

Timestamp:

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

Author:

Bruno Cornec

Message:

log_msg => mr_msg in trunk

File:

• trunk/mondo/src/common/libmondo-fork.c (modified) (28 diffs)

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

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