Changeset 3185 in MondoRescue for branches/3.0/mondo/src/common/libmondo-stream.c

Timestamp:

Sep 20, 2013, 2:29:57 PM (11 years ago)

Author:

Bruno Cornec

Message:

Simplify the interface of mr_getline and mr_asprintf. With 3.1 compatibility now will allow backports from this branch into 3.0

File:

• branches/3.0/mondo/src/common/libmondo-stream.c (modified) (28 diffs)

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

@@ -242 +242 @@
     int res;
 
-    mr_asprintf(&command, "mt -f %s status", dev);
+    mr_asprintf(command, "mt -f %s status", dev);
     res = run_program_and_log_output(command, 1);
     mr_free(command);
@@ -276 +276 @@
         strcpy(cdr_exe, "dvdrecord");
     }
-    mr_asprintf(&command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l",
+    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));
@@ -287 +287 @@
         return 1;
     }
-    mr_asprintf(&command,
+    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);
@@ -297 +297 @@
         return 1;
     }
-    mr_asprintf(&command,
+    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);
@@ -383 +383 @@
         }
         if (strstr(fname, "xattr") == NULL) {
-            mr_asprintf(&tmp,"Wrong order expected xattr, got %s, sunshine.", fname);
+            mr_asprintf(tmp,"Wrong order expected xattr, got %s, sunshine.", fname);
             fatal_error(tmp);
         }
@@ -413 +413 @@
         }
         if (strstr(fname, "acl") == NULL) {
-            mr_asprintf(&tmp,"Wrong order expected acl, got %s, sunshine.", fname);
+            mr_asprintf(tmp,"Wrong order expected acl, got %s, sunshine.", fname);
             fatal_error(tmp);
         }
@@ -479 +479 @@
     log_it("Insisting on tape #%d", tapeno);
     if (g_current_media_number != tapeno) {
-        mr_asprintf(&tmp,
+        mr_asprintf(tmp,
                 "When the tape drive goes quiet, please insert volume %d in this series.",
                 tapeno);
@@ -549 +549 @@
         suffix[0] = '\0';
     }
-    mr_asprintf(&tmpdir, "%s/tmpfs/backcatalog", td);
+    mr_asprintf(tmpdir, "%s/tmpfs/backcatalog", td);
     mkdir(tmpdir, 0x700);
-    mr_asprintf(&command, "cp -f %s %s", latest_fname, tmpdir);
+    mr_asprintf(command, "cp -f %s %s", latest_fname, tmpdir);
     if (run_program_and_log_output(command, 6)) {
         log_it("Warning - failed to copy %s to backcatalog at %s",
@@ -579 +579 @@
 
     for (i = curr - 1; i >= 0 && curr - i < 10; i--) {
-        mr_asprintf(&old_fname, "%s/%s", tmpdir, g_tapecatalog->el[i].fname);
+        mr_asprintf(old_fname, "%s/%s", tmpdir, g_tapecatalog->el[i].fname);
         unlink(old_fname);
         mr_free(old_fname);
@@ -619 +619 @@
         return (0);
     }
-    mr_asprintf(&tmp, "mt -f %s setblk %ld", bkpinfo->media_device, internal_tape_block_size);
+    mr_asprintf(tmp, "mt -f %s setblk %ld", bkpinfo->media_device, internal_tape_block_size);
     res = run_program_and_log_output(tmp, 3);
     mr_free(tmp);
@@ -688 +688 @@
 
     log_it("Skipping OBDR headers");
-    mr_asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
+    mr_asprintf(command, "mt -f %s rewind",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    mr_asprintf(&command, "mt -f %s fsf 2",bkpinfo->media_device);
+    mr_asprintf(command, "mt -f %s fsf 2",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
@@ -715 +715 @@
     log_it("Creating OBDR headers");
     /* OBDR: First block 10 kB of zero bs = 512 */
-    mr_asprintf(&command, "mt -f %s compression off",bkpinfo->media_device);
+    mr_asprintf(command, "mt -f %s compression off",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    mr_asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
+    mr_asprintf(command, "mt -f %s rewind",bkpinfo->media_device);
     res += run_program_and_log_output(command, 1);
     paranoid_free(command);
@@ -725 +725 @@
     set_tape_block_size_with_mt(512);
 
-    mr_asprintf(&command, "dd if=/dev/zero of=%s bs=512 count=20",bkpinfo->media_device);
+    mr_asprintf(command, "dd if=/dev/zero of=%s bs=512 count=20",bkpinfo->media_device);
     res += run_program_and_log_output(command, 1);
     paranoid_free(command);
@@ -732 +732 @@
     set_tape_block_size_with_mt(2048);
 
-    mr_asprintf(&command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mondorescue.iso",bkpinfo->media_device);
+    mr_asprintf(command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mondorescue.iso",bkpinfo->media_device);
     res += run_program_and_log_output(command, 1);
     paranoid_free(command);
@@ -739 +739 @@
 
     /* restore compression mode on */
-    mr_asprintf(&command, "mt -f %s compression on",bkpinfo->media_device);
+    mr_asprintf(command, "mt -f %s compression on",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
@@ -805 +805 @@
 
     insist_on_this_tape_number(1);
-    mr_asprintf(&outfname, "%s/tmp/all.tar.gz", bkpinfo->tmpdir);
+    mr_asprintf(outfname, "%s/tmp/all.tar.gz", bkpinfo->tmpdir);
     make_hole_for_file(outfname);
 
@@ -874 +874 @@
         // FIXME
     }
-    mr_asprintf(&tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null",
+    mr_asprintf(tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null",
             outfname);
     paranoid_system(tmp);
@@ -904 +904 @@
 
     /*  add 'dummy' if testing */
-    mr_asprintf(&command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", cddev, speed, MONDO_LOGFILE, MONDO_LOGFILE);
+    mr_asprintf(command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", cddev, speed, MONDO_LOGFILE, MONDO_LOGFILE);
     /*  initialise the catalog */
     g_current_media_number = 1;
@@ -1078 +1078 @@
     }
     if (orig_size != temp_size && orig_size != -1) {
-        mr_asprintf(&tmp, "output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
+        mr_asprintf(tmp, "output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1141 +1141 @@
     log_msg(6, ".......................... Should be %lld", orig_size);
     g_tape_posK += total_read_from_tape_for_this_file / 1024;
-    mr_asprintf(&actual_cksum, "%04x%04x", crc16, crctt);
+    mr_asprintf(actual_cksum, "%04x%04x", crc16, crctt);
     if (foutstream) {           /*log_it("Finished writing to foutstream"); */
     } else {
@@ -1151 +1151 @@
     }
     if (strcmp(temp_cksum, actual_cksum)) {
-        mr_asprintf(&tmp, "actual cksum=%s; recorded cksum=%s", actual_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,
+        mr_asprintf(tmp, "%s (%ld K) is corrupt on tape", temp_fname,
                 (long) orig_size >> 10);
         log_to_screen(tmp);
@@ -1494 +1494 @@
     insist_on_this_tape_number(g_current_media_number + 1); // will increment g_current_media, too
     if (bkpinfo->backup_media_type == cdstream) {
-        mr_asprintf(&command,
+        mr_asprintf(command,
                 "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
                 bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE,
@@ -1549 +1549 @@
     last = g_tapecatalog->entries - 1;
     for (i = 0; i <= last; i++) {
-        mr_asprintf(&fname, "%s/tmpfs/backcatalog/%s", bkpinfo->tmpdir, g_tapecatalog->el[i].fname);
+        mr_asprintf(fname, "%s/tmpfs/backcatalog/%s", bkpinfo->tmpdir, g_tapecatalog->el[i].fname);
         if (!does_file_exist(fname)) {
             log_msg(6, "Can't write %s - it doesn't exist.", fname);
@@ -1602 +1602 @@
     log_it("Data disks = %s", fname);
     if (!does_file_exist(fname)) {
-        mr_asprintf(&tmp, "Cannot find %s", fname);
+        mr_asprintf(tmp, "Cannot find %s", fname);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1700 +1700 @@
         p++;
     }
-    mr_asprintf(&tmp, "Writing file '%s' to tape (%ld KB)", p,
+    mr_asprintf(tmp, "Writing file '%s' to tape (%ld KB)", p,
             (long) filesize >> 10);
     log_it(tmp);
@@ -1745 +1745 @@
     }
     paranoid_fclose(fin);
-    mr_asprintf(&checksum, "%04x%04x", crc16, crctt);
+    mr_asprintf(checksum, "%04x%04x", crc16, crctt);
     /* BERLIOS: what does it do ??? */
     write_header_block_to_stream((off_t)g_current_media_number, checksum, BLK_STOP_FILE);
@@ -1808 +1808 @@
         fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
                g_tape_stream) / 1024;
-    mr_asprintf(&tmp, "%s (fname=%s, size=%ld K)",
+    mr_asprintf(tmp, "%s (fname=%s, size=%ld K)",
             marker_to_string(control_char), p,
             (long) length_of_incoming_file >> 10);
@@ -1837 +1837 @@
 
     /*@ end vars *************************************************** */
-    mr_asprintf(&tmp, "Wrong marker! (Should be %s, is actually %s)", marker_to_string(should_be), marker_to_string(it_is));
+    mr_asprintf(tmp, "Wrong marker! (Should be %s, is actually %s)", marker_to_string(should_be), marker_to_string(it_is));
     log_to_screen(tmp);
     mr_free(tmp);