Changeset 1176 in MondoRescue for trunk/mondo/src/common/libmondo-stream.c

Timestamp:

Feb 16, 2007, 2:16:14 PM (17 years ago)

Author:

Bruno Cornec

Message:

Some merges from stable (synchro for mem. mngt)

File:

• trunk/mondo/src/common/libmondo-stream.c (modified) (23 diffs)

trunk/mondo/src/common/libmondo-stream.c

@@ -14 +14 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
+
 #include "mondostructures.h"
 #include "libmondo-devices.h"
@@ -23 +25 @@
 #include "libmondo-tools-EXT.h"
 #include "libmondo-fifo-EXT.h"
-#include "mr_mem.h"
 
 #define EXTRA_TAPE_CHECKSUMS
 
+/*@unused@*/
+//static char cvsid[] = "$Id$";
 extern bool g_sigpipe;
 extern int g_tape_buffer_size_MB;
@@ -132 +135 @@
     }
     mr_free(blk);
-    mr_free((void *)g_tapecatalog);
+    mr_free(g_tapecatalog);
     return (retval);
 }
@@ -151 +154 @@
 
     /*@ long long's ************************************************* */
-    int i;
-    char *blk;
+    int i = 0;
+    char *blk = NULL;
 
     blk = (char *) mr_malloc(256 * 1024);
@@ -186 +189 @@
     }
     mr_free(blk);
-    mr_free((void *)g_tapecatalog);
+    mr_free(g_tapecatalog);
     return (retval);
 }
@@ -251 +254 @@
 
     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);
+            "%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);
     tmp = call_program_and_get_last_line_of_output(command);
     mr_free(command);
@@ -264 +267 @@
 
     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);
+            "%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);
 
@@ -339 +342 @@
     }
 }
+
 
 int read_EXAT_files_from_tape(struct s_bkpinfo *bkpinfo,
@@ -450 +454 @@
 {
     int i;
-    char *tmp;
+    char *tmp = NULL;
 
     log_it("Insisting on tape #%d", tapeno);
@@ -488 +492 @@
 
 
-
-
 /**
  * Add a file to a collection of recently archived filesets/slices.
@@ -507 +509 @@
     int last, curr, i;
     t_archtype type = other;
-    char *command;
-    char *tmpdir;
-    char *old_fname;
+    char *command = NULL;
+    char *tmpdir = NULL;
+    char *old_fname = NULL;
 
     bufsize_K = (long long) (1024LL * (1 + g_tape_buffer_size_MB));
-    mr_asprintf(&tmpdir, "%s/tmpfs/backcatalog", td);
     if (strstr(latest_fname, ".afio.") || strstr(latest_fname, ".star.")) {
         type = fileset;
@@ -522 +523 @@
             ("Unknown type. Internal error in maintain_collection_of_recent_archives()");
     }
+
+    mr_asprintf(&tmpdir, "%s/tmpfs/backcatalog", td);
     mkdir(tmpdir, 0x700);
     mr_asprintf(&command, "cp -f %s %s", latest_fname, tmpdir);
@@ -603 +606 @@
 {
     /*@ buffer ***************************************************** */
-    char *datablock;
-    char *tmp;
+    char *datablock = NULL;
+    char *tmp = NULL;
     char old_cwd[MAX_STR_LEN];
-    char *outfname;
+    char *outfname = NULL;
     /*@ int ******************************************************* */
     int i;
@@ -649 +652 @@
     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"));
@@ -712 +715 @@
 {
     /*@ buffers ***************************************************** */
-    char *command;
+    char *command = NULL;
 
     /*@ end vars *************************************************** */
@@ -832 +835 @@
 {
     /*@ buffers ***************************************************** */
-    char *tmp;
-    char *datablock;
+    char *tmp = NULL;
+    char *datablock = NULL;
     char *temp_fname = (char *)bkpinfo; /* Should NOT be NULL */
     char *temp_cksum = (char *)bkpinfo; /* Should NOT be NULL */
-    char *actual_cksum;
+    char *actual_cksum = NULL;
 
     /*@ int ********************************************************* */
@@ -1289 +1292 @@
 {
     int res = 0;
-    char *command;
+    char *command = NULL;
 
     paranoid_pclose(g_tape_stream);
@@ -1348 +1351 @@
 {
     int i, last, res = 0;
-    char *fname;
+    char *fname = NULL;
 
     mr_msg(2, "I am now writing back catalog to tape");
@@ -1387 +1390 @@
 {
     /*@ pointers *************************************************** */
-    FILE *fin;
-    char *tmp;
+    FILE *fin = NULL;
+    char *tmp = NULL;
 
     /*@ long ******************************************************* */
@@ -1449 +1452 @@
 {
     /*@ buffers **************************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char datablock[TAPE_BLOCK_SIZE];
-    char *checksum;
-    char *infile_basename;
+    char *checksum = NULL;
+    char *infile_basename = NULL;
 
     /*@ int ******************************************************** */
@@ -1570 +1573 @@
     /*@ buffers **************************************************** */
     char tempblock[TAPE_BLOCK_SIZE];
-    char *tmp;
     char *p;
 
@@ -1603 +1605 @@
         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_msg(6, tmp);
-    mr_free(tmp);
+    mr_msg(6, "%s (fname=%s, size=%ld K)",
+            marker_to_string(control_char), p,
+            (long) length_of_incoming_file >> 10);
     return (0);
 }
@@ -1620 +1620 @@
 {
     /*@ buffer ***************************************************** */
-    char *tmp;
+    char *tmp = NULL;