Changeset 2519 in MondoRescue

Timestamp:

Jan 4, 2010, 7:42:23 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3229@localhost (orig r2263): bruno | 2009-07-12 02:04:33 +0200

r3204@localhost: bruno | 2009-07-06 19:26:34 +0200

• Replace sprintf by mr_asprintf in libmondo-fifo.c

File:

• branches/2.2.9/mondo/src/common/libmondo-fifo.c (modified) (6 diffs)

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

@@ -71 +71 @@
                              long internal_tape_block_size)
 {
-    char sz_dir[32];
     char keych;
-    char *tmp;
-    char *command;
+    char *sz_dir = NULL;
+    char *tmp = NULL;
+    char *command = NULL;
     FILE *fres;
     int bufsize;                // in megabytes
@@ -81 +81 @@
     int wise_lower_limit;
 
-    malloc_string(tmp);
-    malloc_string(command);
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert(direction == 'w' || direction == 'r');
-    sprintf(sz_dir, "%c", direction);
     wise_upper_limit = (am_I_in_disaster_recovery_mode()? 8 : 32);
     wise_lower_limit = 1;       // wise_upper_limit/2 + 1;
@@ -91 +88 @@
     for (bufsize = wise_upper_limit, res = -1;
          res != 0 && bufsize >= wise_lower_limit; bufsize--) {
-        sprintf(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);
+        mr_free(tmp);
     }
     if (!res) {
         bufsize++;
-        sprintf(tmp, "Negotiated max buffer of %d MB ", bufsize);
+        mr_asprintf(&tmp, "Negotiated max buffer of %d MB ", bufsize);
         log_to_screen(tmp);
+        mr_free(tmp);
     } else {
         bufsize = 0;
@@ -121 +120 @@
     }
     log_msg(2, "Calling buffer --- command = '%s'", g_sz_call_to_buffer);
+    mr_asprintf(&sz_dir, "%c", direction);
     fres = popen(g_sz_call_to_buffer, sz_dir);
+    mr_free(sz_dir);
+
     if (fres) {
         log_msg(2, "Successfully opened ('%c') tape device %s", direction,
@@ -130 +132 @@
     }
     sleep(2);
-    sprintf(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.");
     }
+    mr_free(tmp);
     g_tape_buffer_size_MB = bufsize;
-    tmp[30] = '\0';
-    sprintf(command, "ps %s | grep buffer | grep -v grep", ps_options);
+    mr_asprintf(&command, "ps %s | grep buffer | grep -v grep", ps_options);
     if (run_program_and_log_output(command, 1)) {
         fres = NULL;
@@ -143 +145 @@
         log_to_screen("Buffer successfully started.");
     }
+    mr_free(command);
 
-    paranoid_free(command);
-    paranoid_free(tmp);
     return (fres);
 }