Changeset 2331 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-stream.c

Timestamp:

Aug 18, 2009, 3:25:29 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3342@localhost: bruno | 2009-08-14 00:46:51 +0200

• Another round of strcpy suppressions
• find_home_of_exe() now allocates memory which has to be freed by the caller
• Supress useless sz_last_suffix()
• mr_getline now has the same interface as the other mr_mem functions
• valgrind and compiler warnings fixes

File:

• branches/2.2.10/mondo/src/common/libmondo-stream.c (modified) (8 diffs)

branches/2.2.10/mondo/src/common/libmondo-stream.c

@@ -256 +256 @@
 
     log_to_screen("I am looking for your tape streamer. Please wait.");
-    if (find_home_of_exe("cdrecord")) {
-        mr_asprintf(&cdr_exe, "cdrecord");
-    } else {
-        mr_asprintf(&cdr_exe, "dvdrecord");
-    }
+    tmp = find_home_of_exe("cdrecord");
+    if (tmp) {
+        mr_asprintf(cdr_exe, "cdrecord");
+    } else {
+        mr_asprintf(cdr_exe, "dvdrecord");
+    }
+    mr_free(tmp);
+
     mr_asprintf(command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l", cdr_exe);
-    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
@@ -269 +272 @@
         mr_asprintf(&dev, "%s", VANILLA_SCSI_TAPE);
         mr_free(tmp);
+        mr_free(tmp);
         return(dev);
     }
@@ -274 +278 @@
 
     mr_asprintf(command, "%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);
-    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
@@ -280 +284 @@
         log_it("Could not find tape device");
         mr_free(tmp);
-        return(dev);
+        return(NULL);
     }
     mr_free(tmp);
+
     mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f3 | cut -d')' -f1 | head -n1", cdr_exe);
     mr_free(cdr_exe);
 
-    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
-
 
     mr_asprintf(dev, "%s", "/dev/st");
     mr_strcat(dev, tmp);            // e.g. '/dev/st0' becomes '/dev/stN'
     mr_free(tmp);
+
     res = 0;
     if (!mt_says_tape_exists(dev)) {
@@ -321 +326 @@
     }
 
-    mr_asprintf(&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;};};};'"));
+    mr_asprintf(tmp, "%s", 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;};};};'"));
 
     if (mt_says_tape_exists(dev)) {
@@ -328 +333 @@
         log_it("Turning %s", dev);
         mr_free(tmp);
-        mr_asprintf(&tmp, (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
+        mr_asprintf(tmp, "%s", (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
         mr_free(dev);
         mr_asprintf(&dev, "/dev/os%s", tmp);
@@ -342 +347 @@
     log_it("res=%d; dev=%s", res, dev);
 
-    if (res) {
+    if (dev) {
+        log_it("At this new point, dev = %s and res = %d", dev, res);
+    } else {
+        log_it("At this new point, dev is NULL and res = %d", dev, res);
         mr_free(tmp);
-        return (dev);
+        return(NULL);
     }
 
@@ -351 +359 @@
     }
     mr_free(tmp);
-    return (NULL);
+    return(dev);
 }