Changeset 688 in MondoRescue for trunk/mondo/mondo/common/libmondo-stream.c

Timestamp:

Jul 17, 2006, 3:44:46 PM (18 years ago)

Author:

bcornec

Message:

Huge memory management patch.
Still not finished but a lot as been done.
What remains is around some functions returning strings, and some structure members.
(Could not finish due to laptop failure !)

File:

• trunk/mondo/mondo/common/libmondo-stream.c (modified) (13 diffs)

trunk/mondo/mondo/common/libmondo-stream.c

@@ -9 +9 @@
  * Functions for writing data to/reading data from streams (tape, CD stream, etc.)
  */
+
+#include <unistd.h>
 
 #include "my-stuff.h"
@@ -23 +25 @@
 #define EXTRA_TAPE_CHECKSUMS
 
-/*@unused@*/
-//static char cvsid[] = "$Id$";
 extern bool g_sigpipe;
 extern int g_tape_buffer_size_MB;
@@ -119 +119 @@
     }
     sleep(1);
-    paranoid_system("sync");
+    sync();
     sleep(1);
     paranoid_pclose(g_tape_stream);
@@ -152 +152 @@
 
     sleep(1);
-    paranoid_system("sync");
+    sync();
     sleep(1);
     log_it("closeout_tape() -- entering");
@@ -213 +213 @@
 int find_tape_device_and_size(char *dev, char *siz)
 {
-    char *tmp;
-    char *command;
-    char *cdr_exe;
-    int res;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *command = NULL;
+    char *cdr_exe = NULL;
+    int res = 0;
 
     log_to_screen("I am looking for your tape streamer. Please wait.");
-    dev[0] = '\0';
+    dev = NULL;
     siz = NULL;
     if (find_home_of_exe("cdrecord")) {
@@ -228 +229 @@
     asprintf(&command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l",
              cdr_exe);
-    asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+    tmp = call_program_and_get_last_line_of_output(command);
     paranoid_free(command);
 
@@ -234 +235 @@
         log_it
             ("Either too few or too many tape streamers for me to detect...");
-        strcpy(dev, VANILLA_SCSI_TAPE);
+        asprintf(&dev, VANILLA_SCSI_TAPE"0");
         paranoid_free(tmp);
         paranoid_free(cdr_exe);
@@ -244 +245 @@
              "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f2 | head -n1",
              cdr_exe);
-    asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+    tmp = call_program_and_get_last_line_of_output(command);
     paranoid_free(command);
     if (strlen(tmp) < 2) {
@@ -259 +260 @@
     paranoid_free(cdr_exe);
 
-    asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+    tmp = call_program_and_get_last_line_of_output(command);
     paranoid_free(command);
-    strcpy(dev, VANILLA_SCSI_TAPE);
-    dev[strlen(dev) - 1] = '\0';
-    strcat(dev, tmp);           // e.g. '/dev/st0' becomes '/dev/stN'
+
+    asprintf(&dev, VANILLA_SCSI_TAPE"%s", tmp);
     paranoid_free(tmp);
 
-    res = 0;
     if (!mt_says_tape_exists(dev)) {
-        strcpy(dev, ALT_TAPE);
+        paranoid_free(dev); 
+
+        asprintf(&dev, ALT_TAPE"%s", tmp);
         if (!mt_says_tape_exists(dev)) {
             log_it("Cannot openin %s", dev);
-            strcpy(dev, "/dev/st0");
+            paranoid_free(dev); 
+
+            asprintf(&dev, VANILLA_SCSI_TAPE"0");
             if (!mt_says_tape_exists(dev)) {
                 log_it("Cannot openin %s", dev);
-                strcpy(dev, "/dev/osst0");
+                paranoid_free(dev); 
+
+                asprintf(&dev, "/dev/osst0");
                 if (!mt_says_tape_exists(dev)) {
                     res++;
@@ -286 +291 @@
     log_it("At this point, dev = %s and res = %d", dev, res);
 
-    asprintf(&tmp, call_program_and_get_last_line_of_output("\
+    tmp = call_program_and_get_last_line_of_output("\
 cdrecord -scanbus 2> /dev/null | tr -s '\t' ' ' | \
 grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | \
-awk '{for(i=1; i<NF; i++) { if (index($i, \"GB\")>0) { print $i;};};};'"));
+awk '{for(i=1; i<NF; i++) { if (index($i, \"GB\")>0) { print $i;};};};'");
 
     if (mt_says_tape_exists(dev)) {
@@ -296 +301 @@
         log_it("Turning %s", dev);
         paranoid_free(tmp);
-        asprintf(&tmp,
+        asprintf(&tmp1,
                  (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
-        sprintf(dev, "/dev/os%s", tmp);
+        paranoid_free(dev);
+        asprintf(&dev, "/dev/os%s", tmp1);
+        paranoid_free(tmp1);
+
         log_it("...into %s", dev);
         if (mt_says_tape_exists(dev)) {
@@ -1228 +1236 @@
 
     paranoid_pclose(g_tape_stream);
-    system("sync");
-    system("sync");
-    system("sync");
+    sync();
+    sync();
+    sync();
     log_it("Next tape requested.");
     insist_on_this_tape_number(g_current_media_number + 1); // will increment it, too
@@ -1269 +1277 @@
 
     paranoid_pclose(g_tape_stream);
-    system("sync");
-    system("sync");
-    system("sync");
+    sync();
+    sync();
+    sync();
     log_it("New tape requested.");
     insist_on_this_tape_number(g_current_media_number + 1); // will increment g_current_media, too