Changeset 1638 in MondoRescue for branches/stable/mondo/src/common/libmondo-stream.c

Timestamp:

Sep 19, 2007, 9:32:00 AM (17 years ago)

Author:

Bruno Cornec

Message:

Continue to use configuration file data (may not compile)

File:

• branches/stable/mondo/src/common/libmondo-stream.c (modified) (15 diffs)

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

@@ -17 +17 @@
 #include "mr_list.h"
 #include "mr_gettext.h"
+#include "mr_conf.h"
 
 #include "mondostructures.h"
@@ -38 +39 @@
 extern char *g_getfattr;
 extern char *MONDO_LOGFILE;
+
+extern struct mr_conf *mr_conf;
 
 /**
@@ -864 +867 @@
     malloc_string(temp_fname);
     malloc_string(temp_cksum);
-    datablock = mr_malloc(TAPE_BLOCK_SIZE);
+    datablock = mr_malloc(mr_conf->external_tape_blocksize);
     crc16 = 0;
     crctt = 0;
@@ -904 +907 @@
          bytes_read) {
         bytes_to_write =
-            (size < TAPE_BLOCK_SIZE) ? (long) size : TAPE_BLOCK_SIZE;
-        bytes_to_read = TAPE_BLOCK_SIZE;
+            (size < mr_conf->external_tape_blocksize) ? (long) size : mr_conf->external_tape_blocksize;
+        bytes_to_read = mr_conf->external_tape_blocksize;
         bytes_read = fread(datablock, 1, bytes_to_read, g_tape_stream);
         while (bytes_read < bytes_to_read) {    // next tape!
@@ -995 +998 @@
     /*@ end vars *************************************************** */
 
-    tempblock = (char *) mr_malloc((size_t) TAPE_BLOCK_SIZE);
-
-    for (i = 0; i < (int) TAPE_BLOCK_SIZE; i++) {
+    tempblock = (char *) mr_malloc((size_t) mr_conf->external_tape_blocksize);
+
+    for (i = 0; i < (int) mr_conf->external_tape_blocksize; i++) {
         tempblock[i] = 0;
     }
     while (!(*pcontrol_char = tempblock[7000])) {
         g_tape_posK +=
-            fread(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
+            fread(tempblock, 1, (size_t) mr_conf->external_tape_blocksize,
                   g_tape_stream) / 1024;
     }
@@ -1131 +1134 @@
     long bytes_to_write;
 
-    datablock = mr_malloc(TAPE_BLOCK_SIZE);
+    datablock = mr_malloc(mr_conf->external_tape_blocksize);
     malloc_string(temp_fname);
     pB = strrchr(the_file_I_was_reading, '/');
@@ -1181 +1184 @@
         for (size = temp_size; size > 0; size -= bytes_to_write) {
             bytes_to_write =
-                (size < TAPE_BLOCK_SIZE) ? (long) size : TAPE_BLOCK_SIZE;
+                (size < mr_conf->external_tape_blocksize) ? (long) size : mr_conf->external_tape_blocksize;
             // FIXME - needs error-checking and -catching
-            fread(datablock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream);
+            fread(datablock, 1, (size_t) mr_conf->external_tape_blocksize, g_tape_stream);
         }
         res =
@@ -1444 +1447 @@
     /*@ buffers **************************************************** */
     char *tmp = NULL;
-    char datablock[TAPE_BLOCK_SIZE];
+    char *datablock = NULL;
     char *checksum = NULL;
     char *infile_basename = NULL;
@@ -1473 +1476 @@
     crc16 = 0;
     crctt = 0;
+    datablock = mr_malloc(mr_conf->external_tape_blocksize);
 
     /*@ end vars *************************************************** */
@@ -1508 +1512 @@
     for (noof_blocks = 0; filesize > 0;
          noof_blocks++, filesize -= bytes_to_read) {
-        if (filesize < TAPE_BLOCK_SIZE) {
+        if (filesize < mr_conf->external_tape_blocksize) {
             bytes_to_read = (long) filesize;
-            for (i = 0; i < TAPE_BLOCK_SIZE; i++) {
+            for (i = 0; i < mr_conf->external_tape_blocksize; i++) {
                 datablock[i] = '\0';
             }
         } else {
-            bytes_to_read = TAPE_BLOCK_SIZE;
+            bytes_to_read = mr_conf->external_tape_blocksize;
         }
         (void) fread(datablock, 1, (size_t) bytes_to_read, fin);
         g_tape_posK += fwrite(datablock, 1, /*bytes_to_read */
-                              (size_t) TAPE_BLOCK_SIZE,
+                              (size_t) mr_conf->external_tape_blocksize,
                               g_tape_stream) / 1024;
         if (g_sigpipe) {
@@ -1536 +1540 @@
 #endif
     }
+    paranoid_free(datablock);
     paranoid_fclose(fin);
     mr_asprintf(&checksum, "%04x%04x", crc16, crctt);
@@ -1563 +1568 @@
 {
     /*@ buffers **************************************************** */
-    char tempblock[TAPE_BLOCK_SIZE];
+    char *tempblock;
     char *p;
 
@@ -1573 +1578 @@
     /*@ end vars *************************************************** */
 
+    tempblock = mr_malloc(mr_conf->external_tape_blocksize);
 
     olen = length_of_incoming_file;
@@ -1586 +1592 @@
         return (1);
     }
-    for (i = 0; i < (int) TAPE_BLOCK_SIZE; i++) {
+    for (i = 0; i < (int) mr_conf->external_tape_blocksize; i++) {
         tempblock[i] = 0;
     }
@@ -1594 +1600 @@
     strcpy(tempblock + 1000, filename);
     g_tape_posK +=
-        fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
+        fwrite(tempblock, 1, (size_t) mr_conf->external_tape_blocksize,
                g_tape_stream) / 1024;
+    paranoid_free(tempblock);
     mr_msg(6, "%s (fname=%s, size=%ld K)",
             marker_to_string(control_char), p,