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

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

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

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

@@ -116 +116 @@
     char *blk;
     int i;
+    int j;
 
     blk = (char *) malloc(256 * 1024);
@@ -131 +132 @@
     }
     for (i = 0; i < 8 && !feof(g_tape_stream); i++) {
-        (void) fread(blk, 1, 256 * 1024, g_tape_stream);
+        j = fread(blk, 1, 256 * 1024, g_tape_stream);
+        if (j) {
+            // FIXME
+        }
     }
     sleep(1);
@@ -185 +189 @@
     }
     for (i = 0; i < 4 * 8; i++) {
-        (void) fwrite(blk, 1, 256 * 1024, g_tape_stream);
+        if (fwrite(blk, 1, 256 * 1024, g_tape_stream)) {
+            //FIXME
+        }
         if (should_we_write_to_next_tape
             (bkpinfo->media_size[g_current_media_number], (off_t)256 * 1024)) {
@@ -362 +368 @@
 {
     int res = 0;
-    char *fname = (char *)&res;                 /* Should NOT be NULL */
+    char fname_buf[PATH_MAX];
+    char *fname = (char *)fname_buf;        /* Should NOT be NULL */
     char *tmp = NULL;
 
@@ -419 +426 @@
     res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
     log_msg(1, "End of extended attributes, now looking for afioball");
-    return (0);
+    return (res);
 }
 
@@ -521 +528 @@
 {
     long long final_alleged_writeK, final_projected_certain_writeK,
-        final_actually_certain_writeK = 0, cposK, bufsize_K;
+        cposK, bufsize_K;
     int last, curr, i;
-    t_archtype type = other;
     char *command = NULL;
     char *tmpdir = NULL;
@@ -557 +563 @@
         cposK = g_tapecatalog->el[curr].tape_posK;
         if (cposK < final_projected_certain_writeK) {
-            final_actually_certain_writeK = cposK;
             break;
         }
@@ -835 +840 @@
                           g_tape_stream);
             }
-            (void) fwrite(datablock, 1, (size_t) length, fout);
+            if (fwrite(datablock, 1, (size_t) length, fout)) {
+                // FIXME
+            }
             g_tape_posK += length / 1024;
         }
@@ -860 +867 @@
     close_evalcall_form();
     log_it("Saved all.tar.gz to '%s'", outfname);
-    (void) getcwd(old_cwd, MAX_STR_LEN);
-    chdir(bkpinfo->tmpdir);
+    if (getcwd(old_cwd, MAX_STR_LEN)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->tmpdir)) {
+        // FIXME
+    }
     mr_asprintf(tmp, "tar -zxf %s ."MINDI_CACHE"/mondorestore.cfg 2> /dev/null", outfname);
     paranoid_system(tmp);
@@ -867 +878 @@
 
     paranoid_system("cp -f ."MINDI_CACHE"/mondorestore.cfg . 2> /dev/null");
-    chdir(old_cwd);
+    if (chdir(old_cwd)) {
+        // FIXME
+    }
     unlink(outfname);
     mr_free(outfname);
@@ -1049 +1062 @@
     unsigned int crctt;
 
-    bool had_to_resync = FALSE;
-
     /*@ init  ******************************************************* */
     malloc_string(temp_fname);
@@ -1062 +1073 @@
 
     res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+    if (res) {
+        // FIXME
+    }
     if (orig_size != temp_size && orig_size != -1) {
         log_to_screen("output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
@@ -1100 +1114 @@
             for (size = orig_size; size > where_I_was_before_tape_change;
                  size -= bytes_to_write) {
-                bytes_read =
-                    fread(datablock, 1, bytes_to_read, g_tape_stream);
+                bytes_read = fread(datablock, 1, bytes_to_read, g_tape_stream);
             }
             log_msg(4, "'size' is now %lld (should be %lld)", size,
                     where_I_was_before_tape_change);
             log_to_screen("Successfully re-sync'd tape");
-            had_to_resync = TRUE;
             bytes_read = fread(datablock, 1, bytes_to_read, g_tape_stream);
         }
 
-        (void) fwrite(datablock, 1, (size_t) bytes_to_write, fout); // for blocking reasons, bytes_successfully_read_in isn't necessarily the same as bytes_to_write
+        if (fwrite(datablock, 1, (size_t) bytes_to_write, fout)) {  // for blocking reasons, bytes_successfully_read_in isn't necessarily the same as bytes_to_write
+            // FIXME
+        }
 
 #ifdef EXTRA_TAPE_CHECKSUMS
@@ -1177 +1191 @@
     }
     while (!(*pcontrol_char = tempblock[7000])) {
-        g_tape_posK +=
-            fread(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
-                  g_tape_stream) / 1024;
+        g_tape_posK += fread(tempblock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream) / 1024;
     }
     memcpy((char *) plen, tempblock + 7001, sizeof(long long));
@@ -1320 +1332 @@
     ctrl_chr = -1;
     while (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
-        res =
-            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr == BLK_START_AN_AFIO_OR_SLICE) {
             break;
@@ -1330 +1341 @@
     }
     while (ctrl_chr != BLK_START_FILE) {
-        res =
-            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr == BLK_START_FILE) {
             break;
@@ -1356 +1366 @@
             bytes_to_write =
                 (size < TAPE_BLOCK_SIZE) ? (long) size : TAPE_BLOCK_SIZE;
-            // FIXME - needs error-checking and -catching
-            fread(datablock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream);
-        }
-        res =
-            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+            if (fread(datablock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream)) {
+                // FIXME - needs error-checking and -catching
+            }
+        }
+        res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_FILE) {
             wrong_marker(BLK_STOP_FILE, ctrl_chr);
         }
-        res =
-            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        res =
-            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        res =
-            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr != BLK_START_FILE) {
             wrong_marker(BLK_START_FILE, ctrl_chr);
@@ -1689 +1696 @@
             bytes_to_read = TAPE_BLOCK_SIZE;
         }
-        (void) fread(datablock, 1, (size_t) bytes_to_read, fin);
+        if (fread(datablock, 1, (size_t) bytes_to_read, fin)) {
+            // FIXME
+        }
         g_tape_posK +=
             fwrite(datablock, 1, /*bytes_to_read */