Changeset 1176 in MondoRescue for trunk/mondo/src/common/libmondo-stream.c
- Timestamp:
- Feb 16, 2007, 2:16:14 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/src/common/libmondo-stream.c
r1086 r1176 14 14 #include "my-stuff.h" 15 15 #include "mr_mem.h" 16 #include "mr_msg.h" 17 16 18 #include "mondostructures.h" 17 19 #include "libmondo-devices.h" … … 23 25 #include "libmondo-tools-EXT.h" 24 26 #include "libmondo-fifo-EXT.h" 25 #include "mr_mem.h"26 27 27 28 #define EXTRA_TAPE_CHECKSUMS 28 29 30 /*@unused@*/ 31 //static char cvsid[] = "$Id$"; 29 32 extern bool g_sigpipe; 30 33 extern int g_tape_buffer_size_MB; … … 132 135 } 133 136 mr_free(blk); 134 mr_free( (void *)g_tapecatalog);137 mr_free(g_tapecatalog); 135 138 return (retval); 136 139 } … … 151 154 152 155 /*@ long long's ************************************************* */ 153 int i ;154 char *blk ;156 int i = 0; 157 char *blk = NULL; 155 158 156 159 blk = (char *) mr_malloc(256 * 1024); … … 186 189 } 187 190 mr_free(blk); 188 mr_free( (void *)g_tapecatalog);191 mr_free(g_tapecatalog); 189 192 return (retval); 190 193 } … … 251 254 252 255 mr_asprintf(&command, 253 254 256 "%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", 257 cdr_exe); 255 258 tmp = call_program_and_get_last_line_of_output(command); 256 259 mr_free(command); … … 264 267 265 268 mr_asprintf(&command, 266 267 269 "%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", 270 cdr_exe); 268 271 mr_free(cdr_exe); 269 272 … … 339 342 } 340 343 } 344 341 345 342 346 int read_EXAT_files_from_tape(struct s_bkpinfo *bkpinfo, … … 450 454 { 451 455 int i; 452 char *tmp ;456 char *tmp = NULL; 453 457 454 458 log_it("Insisting on tape #%d", tapeno); … … 488 492 489 493 490 491 492 494 /** 493 495 * Add a file to a collection of recently archived filesets/slices. … … 507 509 int last, curr, i; 508 510 t_archtype type = other; 509 char *command ;510 char *tmpdir ;511 char *old_fname ;511 char *command = NULL; 512 char *tmpdir = NULL; 513 char *old_fname = NULL; 512 514 513 515 bufsize_K = (long long) (1024LL * (1 + g_tape_buffer_size_MB)); 514 mr_asprintf(&tmpdir, "%s/tmpfs/backcatalog", td);515 516 if (strstr(latest_fname, ".afio.") || strstr(latest_fname, ".star.")) { 516 517 type = fileset; … … 522 523 ("Unknown type. Internal error in maintain_collection_of_recent_archives()"); 523 524 } 525 526 mr_asprintf(&tmpdir, "%s/tmpfs/backcatalog", td); 524 527 mkdir(tmpdir, 0x700); 525 528 mr_asprintf(&command, "cp -f %s %s", latest_fname, tmpdir); … … 603 606 { 604 607 /*@ buffer ***************************************************** */ 605 char *datablock ;606 char *tmp ;608 char *datablock = NULL; 609 char *tmp = NULL; 607 610 char old_cwd[MAX_STR_LEN]; 608 char *outfname ;611 char *outfname = NULL; 609 612 /*@ int ******************************************************* */ 610 613 int i; … … 649 652 log_to_screen(_("Reading stream")); 650 653 log_it("stream device = '%s'", bkpinfo->media_device); 651 /* skip data disks */654 /* skip data disks */ 652 655 open_evalcall_form("Skipping data disks on stream"); 653 656 log_to_screen(_("Skipping data disks on stream")); … … 712 715 { 713 716 /*@ buffers ***************************************************** */ 714 char *command ;717 char *command = NULL; 715 718 716 719 /*@ end vars *************************************************** */ … … 832 835 { 833 836 /*@ buffers ***************************************************** */ 834 char *tmp ;835 char *datablock ;837 char *tmp = NULL; 838 char *datablock = NULL; 836 839 char *temp_fname = (char *)bkpinfo; /* Should NOT be NULL */ 837 840 char *temp_cksum = (char *)bkpinfo; /* Should NOT be NULL */ 838 char *actual_cksum ;841 char *actual_cksum = NULL; 839 842 840 843 /*@ int ********************************************************* */ … … 1289 1292 { 1290 1293 int res = 0; 1291 char *command ;1294 char *command = NULL; 1292 1295 1293 1296 paranoid_pclose(g_tape_stream); … … 1348 1351 { 1349 1352 int i, last, res = 0; 1350 char *fname ;1353 char *fname = NULL; 1351 1354 1352 1355 mr_msg(2, "I am now writing back catalog to tape"); … … 1387 1390 { 1388 1391 /*@ pointers *************************************************** */ 1389 FILE *fin ;1390 char *tmp ;1392 FILE *fin = NULL; 1393 char *tmp = NULL; 1391 1394 1392 1395 /*@ long ******************************************************* */ … … 1449 1452 { 1450 1453 /*@ buffers **************************************************** */ 1451 char *tmp ;1454 char *tmp = NULL; 1452 1455 char datablock[TAPE_BLOCK_SIZE]; 1453 char *checksum ;1454 char *infile_basename ;1456 char *checksum = NULL; 1457 char *infile_basename = NULL; 1455 1458 1456 1459 /*@ int ******************************************************** */ … … 1570 1573 /*@ buffers **************************************************** */ 1571 1574 char tempblock[TAPE_BLOCK_SIZE]; 1572 char *tmp;1573 1575 char *p; 1574 1576 … … 1603 1605 fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE, 1604 1606 g_tape_stream) / 1024; 1605 mr_asprintf(&tmp, "%s (fname=%s, size=%ld K)", 1606 marker_to_string(control_char), p, 1607 (long) length_of_incoming_file >> 10); 1608 mr_msg(6, tmp); 1609 mr_free(tmp); 1607 mr_msg(6, "%s (fname=%s, size=%ld K)", 1608 marker_to_string(control_char), p, 1609 (long) length_of_incoming_file >> 10); 1610 1610 return (0); 1611 1611 } … … 1620 1620 { 1621 1621 /*@ buffer ***************************************************** */ 1622 char *tmp ;1622 char *tmp = NULL; 1623 1623 1624 1624
Note:
See TracChangeset
for help on using the changeset viewer.