Changeset 1109 in MondoRescue

Timestamp:

Feb 8, 2007, 12:37:50 AM (18 years ago)

Author:

Bruno Cornec

Message:

Improve memory management for libmondo-fifo.c (trunk merge begining)

File:

• branches/stable/mondo/src/common/libmondo-fifo.c (modified) (11 diffs)

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

@@ -11 +11 @@
 #include <unistd.h>
 #include <stdio.h>
+#ifndef S_SPLINT_S
 #include <signal.h>
+#endif
 #include <fcntl.h>
-#include <stdio.h>
 
 #include <errno.h>
@@ -22 +23 @@
 #include <sys/sem.h>
 #include <sys/wait.h>
+#ifndef S_SPLINT_S
 #include <pthread.h>
+#endif
 
 #include "my-stuff.h"
 #include "mondostructures.h"
 #include "libmondo.h"
+#include "mr_mem.h"
 
 /**
@@ -41 +45 @@
  */
 pid_t g_mastermind_pid = 0;
-
-
 
 /**
@@ -73 +75 @@
                              long internal_tape_block_size)
 {
-    char sz_dir[32];
+    char *sz_dir;
     char keych;
     char *tmp;
-    char *command;
     FILE *fres;
     int bufsize;                // in megabytes
@@ -83 +84 @@
     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);
+    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;
-    paranoid_system("sync");
+    sync();
     for (bufsize = wise_upper_limit, res = -1;
          res != 0 && bufsize >= wise_lower_limit; bufsize--) {
-        sprintf(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');
+        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;
         res = 0;
         log_to_screen
-            ("Cannot negotiate a buffer of ANY size. Using dd instead.");
+            (_("Cannot negotiate a buffer of ANY size. Using dd instead."));
     }
     if (direction == 'r') {
@@ -124 +125 @@
     mr_msg(2, "Calling buffer --- command = '%s'", g_sz_call_to_buffer);
     fres = popen(g_sz_call_to_buffer, sz_dir);
+    mr_free(sz_dir);
     if (fres) {
         mr_msg(2, "Successfully opened ('%c') tape device %s", direction,
@@ -132 +134 @@
     }
     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)) {
         mr_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);
-    if (run_program_and_log_output(command, 1)) {
+    mr_asprintf(&tmp, "ps %s | grep buffer | grep -v grep", ps_options);
+    if (run_program_and_log_output(tmp, 1)) {
         fres = NULL;
-        log_to_screen("Failed to open tape streamer. Buffer error.");
-    } else {
-        log_to_screen("Buffer successfully started.");
-    }
-
-    mr_free(command);
+        log_to_screen(_("Failed to open tape streamer. Buffer error."));
+    } else {
+        log_to_screen(_("Buffer successfully started."));
+    }
     mr_free(tmp);
     return (fres);
@@ -161 +161 @@
     char *command;
 
+    malloc_string(tmp);
+    sync();
     if (g_sz_call_to_buffer == NULL) {
         return;
@@ -167 +169 @@
         return;
     }
-    malloc_string(tmp);
-    malloc_string(command);
-    paranoid_system("sync");
-    sprintf(command,
+    mr_asprintf(&command,
             "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
     mr_msg(2, "kill_buffer() --- command = %s", command);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    sprintf(command, "kill %s", tmp);
+    mr_free(command);
+
+    mr_asprintf(&command, "kill %s", tmp);
     mr_msg(2, "kill_buffer() --- command = %s", command);
     if (strlen(tmp) > 0) {
@@ -182 +183 @@
     mr_free(command);
 }
-
-
-
 
 
@@ -198 +196 @@
 /* @} - end of fifoGroup */
 
-int
-extract_config_file_from_ramdisk(struct s_bkpinfo *bkpinfo,
-                                 char *ramdisk_fname,
-                                 char *output_cfg_file,
-                                 char *output_mountlist_file);
+/* BERLIOS: useless ?
+int 
+extract_config_file_from_ramdisk( struct s_bkpinfo *bkpinfo, 
+                  char *ramdisk_fname, 
+                  char *output_cfg_file, 
+                  char *output_mountlist_file);
+*/