Changeset 900 in MondoRescue for trunk/mondo/src/common/libmondo-fifo.c

Timestamp:

Oct 24, 2006, 8:49:18 AM (17 years ago)

Author:

Bruno Cornec

Message:

Huge patch to introduce low level functions that will bw used everywhere (mr_free, mr_asprintf, ...)
Nearly linking now due to that.

File:

• trunk/mondo/src/common/libmondo-fifo.c (modified) (8 diffs)

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

@@ -28 +28 @@
 #include "mondostructures.h"
 #include "libmondo.h"
+#include "mr_mem.h"
 
 /**
@@ -82 +83 @@
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert(direction == 'w' || direction == 'r');
-    asprintf(&sz_dir, "%c", direction);
+    mr_asprintf(&sz_dir, "%c", direction);
     wise_upper_limit = (am_I_in_disaster_recovery_mode()? 8 : 32);
     wise_lower_limit = 1;       // wise_upper_limit/2 + 1;
@@ -88 +89 @@
     for (bufsize = wise_upper_limit, res = -1;
          res != 0 && bufsize >= wise_lower_limit; bufsize--) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "dd if=/dev/zero bs=1024 count=16k 2> /dev/null | buffer -o /dev/null -s %ld -m %d%c",
                  internal_tape_block_size, bufsize, 'm');
         res = run_program_and_log_output(tmp, 2);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     if (!res) {
         bufsize++;
-        asprintf(&tmp, _("Negotiated max buffer of %d MB "), bufsize);
+        mr_asprintf(&tmp, _("Negotiated max buffer of %d MB "), bufsize);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         bufsize = 0;
@@ -111 +112 @@
     }
     if (bufsize) {
-        asprintf(&g_sz_call_to_buffer,
+        mr_asprintf(&g_sz_call_to_buffer,
                  "buffer -m %d%c -p%d -B -s%ld -%c %s 2>> %s", bufsize,
                  'm', (direction == 'r') ? 20 : 75,
                  internal_tape_block_size, keych, device, MONDO_LOGFILE);
     } else {
-        asprintf(&g_sz_call_to_buffer, "dd bs=%ld %cf=%s",
+        mr_asprintf(&g_sz_call_to_buffer, "dd bs=%ld %cf=%s",
                  internal_tape_block_size, keych, device);
     }
     log_msg(2, "Calling buffer --- command = '%s'", g_sz_call_to_buffer);
     fres = popen(g_sz_call_to_buffer, sz_dir);
-    paranoid_free(sz_dir);
+    mr_free(sz_dir);
     if (fres) {
         log_msg(2, "Successfully opened ('%c') tape device %s", direction,
@@ -130 +131 @@
     }
     sleep(2);
-    asprintf(&tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
+    mr_asprintf(&tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
     if (run_program_and_log_output(tmp, 2)) {
         log_msg(2, "Warning - I think I failed to open tape, actually.");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     g_tape_buffer_size_MB = bufsize;
-    asprintf(&tmp, "ps %s | grep buffer | grep -v grep", ps_options);
+    mr_asprintf(&tmp, "ps %s | grep buffer | grep -v grep", ps_options);
     if (run_program_and_log_output(tmp, 1)) {
         fres = NULL;
@@ -143 +144 @@
         log_to_screen(_("Buffer successfully started."));
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (fres);
 }
@@ -157 +158 @@
 
     sync();
-    asprintf(&command,
+    mr_asprintf(&command,
             "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
             g_sz_call_to_buffer);
-    paranoid_free(g_sz_call_to_buffer);
+    mr_free(g_sz_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);
 
     tmp = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
+    mr_free(command);
 
-    asprintf(&command, "kill %s", tmp);
+    mr_asprintf(&command, "kill %s", tmp);
     log_msg(2, "kill_buffer() --- command = %s", command);
 
@@ -172 +173 @@
         run_program_and_log_output(command, TRUE);
     }
-    paranoid_free(tmp);
-    paranoid_free(command);
+    mr_free(tmp);
+    mr_free(command);
 }