Changeset 3190 in MondoRescue for branches/3.1/mondo/src/common/libmondo-stream.c

Timestamp:

Sep 25, 2013, 8:55:43 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Modification to 3.1 branch to make it extremely similar to 3.0. What remains are function rewrite with allocation in the function and desallocation outside of the function. Will be next step

File:

• branches/3.1/mondo/src/common/libmondo-stream.c (modified) (11 diffs)

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

@@ -193 +193 @@
         }
         if (should_we_write_to_next_tape
-            (bkpinfo->media_size[g_current_media_number], (off_t)256 * 1024)) {
+            (bkpinfo->media_size, (off_t)256 * 1024)) {
             start_to_write_to_next_tape();
         }
@@ -206 +206 @@
       {
         fwrite (blk, 1, 256*1024, g_tape_stream);
-        if (should_we_write_to_next_tape (bkpinfo->media_size[g_current_media_number], 256*1024))
+        if (should_we_write_to_next_tape (bkpinfo->media_size, 256*1024))
           {
             start_to_write_to_next_tape ();
@@ -278 +278 @@
         mr_asprintf(dev, "%s", VANILLA_SCSI_TAPE);
         mr_free(tmp);
+        mr_free(cdr_exe);
         return(dev);
     }
@@ -288 +289 @@
     if (strlen(tmp) < 2) {
         log_it("Could not find tape device");
+        mr_free(cdr_exe);
         mr_free(tmp);
         return(NULL);
@@ -295 +297 @@
     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);
+
     tmp = call_program_and_get_last_line_of_output(command,TRUE);
     mr_free(command);
@@ -812 +815 @@
     log_to_screen("Reading stream");
     log_it("stream device = '%s'", bkpinfo->media_device);
-/* skip data disks */
+    /* skip data disks */
     open_evalcall_form("Skipping data disks on stream");
     log_to_screen("Skipping data disks on stream");
@@ -937 +940 @@
 }
 if (bkpinfo->media_device == NULL) {
-    log_it("Unable to openout NULL dvice");
+    log_it("Unable to openout NULL device");
     return(1);
 }
@@ -1305 +1308 @@
     char *pA;
     char *pB;
+    int res;
     int ctrl_chr;
-    int res;
     char *temp_fname;
     char *datablock;
@@ -1325 +1328 @@
     while (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
         res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+        if (res) {
+            // FIXME
+        }
         if (ctrl_chr == BLK_START_AN_AFIO_OR_SLICE) {
             break;
@@ -1472 +1478 @@
     log_it("New tape requested.");
     insist_on_this_tape_number(g_current_media_number + 1); // will increment g_current_media, too
-    if (g_current_media_number > MAX_NOOF_MEDIA) {
-        res++;
-        log_to_screen("Too many tapes. Man, you need to use nfs!");
-    }
     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);
@@ -1663 +1665 @@
     filesize = length_of_file(infile);
     if (should_we_write_to_next_tape
-        (bkpinfo->media_size[g_current_media_number], filesize)) {
+        (bkpinfo->media_size, filesize)) {
         start_to_write_to_next_tape();
         write_backcatalog_to_tape();