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

Timestamp:

Sep 10, 2009, 2:55:51 AM (15 years ago)

Author:

Bruno Cornec

Message:

call_program_and_get_last_line_of_output is now allocating memory and returning that string

File:

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

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

@@ -265 +265 @@
 
     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));
+    tmp = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
@@ -277 +277 @@
 
     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));
+    tmp = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
@@ -289 +289 @@
     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));
+    tmp = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
@@ -324 +324 @@
     }
 
-    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;};};};'"));
+    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;};};};'");
 
     if (mt_says_tape_exists(dev)) {