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

Timestamp:

Jul 23, 2009, 2:53:30 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Replace sprintf by mr_asprintf in mondo-rstr-compare.c
• All mr_asprintf call should be on one line (for quality script) and use a string as second param
• Improve quality script

File:

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

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

@@ -273 +273 @@
         strcpy(cdr_exe, "dvdrecord");
     }
-    mr_asprintf(&command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l",
-            cdr_exe);
+    mr_asprintf(&command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l", cdr_exe);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -284 +283 @@
         return 1;
     }
-    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(&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);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -294 +291 @@
         return 1;
     }
-    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_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);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -475 +470 @@
     log_it("Insisting on tape #%d", tapeno);
     if (g_current_media_number != tapeno) {
-        mr_asprintf(&tmp,
-                "When the tape drive goes quiet, please insert volume %d in this series.",
-                tapeno);
+        mr_asprintf(&tmp, "When the tape drive goes quiet, please insert volume %d in this series.", tapeno);
         popup_and_OK(tmp);
         mr_free(tmp);
@@ -869 +862 @@
     (void) getcwd(old_cwd, MAX_STR_LEN);
     chdir(bkpinfo->tmpdir);
-    mr_asprintf(&tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null",
-            outfname);
+    mr_asprintf(&tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null", outfname);
     paranoid_system(tmp);
     mr_free(tmp);
@@ -1143 +1135 @@
     }
     if (strcmp(temp_cksum, actual_cksum)) {
-        mr_asprintf(&tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum,
-                temp_cksum);
+        mr_asprintf(&tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum, temp_cksum);
         log_to_screen(tmp);
         mr_free(tmp);
 
-        mr_asprintf(&tmp, "%s (%ld K) is corrupt on tape", temp_fname,
-                (long) orig_size >> 10);
+        mr_asprintf(&tmp, "%s (%ld K) is corrupt on tape", temp_fname, (long) orig_size >> 10);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1500 +1490 @@
     }
     if (bkpinfo->backup_media_type == cdstream) {
-        mr_asprintf(&command,
-                "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
-                bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE,
-                MONDO_LOGFILE);
+        mr_asprintf(&command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE, MONDO_LOGFILE);
         log_it("Opening OUT to next CD with the command");
         log_it(command);
@@ -1706 +1693 @@
         p++;
     }
-    mr_asprintf(&tmp, "Writing file '%s' to tape (%ld KB)", p,
-            (long) filesize >> 10);
+    mr_asprintf(&tmp, "Writing file '%s' to tape (%ld KB)", p, (long) filesize >> 10);
     log_it(tmp);
     mr_free(tmp);
@@ -1812 +1798 @@
         fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
                g_tape_stream) / 1024;
-    mr_asprintf(&tmp, "%s (fname=%s, size=%ld K)",
-            marker_to_string(control_char), p,
-            (long) length_of_incoming_file >> 10);
+    mr_asprintf(&tmp, "%s (fname=%s, size=%ld K)", marker_to_string(control_char), p, (long) length_of_incoming_file >> 10);
     log_msg(6, tmp);
     mr_free(tmp);