Changeset 122 in MondoRescue for trunk/mondo/mondo/common/libmondo-verify.c
- Timestamp:
- Nov 15, 2005, 12:01:12 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/mondo/common/libmondo-verify.c
r120 r122 608 608 char *orig_cksum; 609 609 char *tmp; 610 char *slice_fnam ;610 char *slice_fnam = (char *)&res; 611 611 612 612 /*@ pointers ******************************************************** */ … … 616 616 long long slice_siz; 617 617 618 malloc_string(slice_fnam);619 618 assert(bkpinfo != NULL); 620 619 assert_string_is_neither_NULL_nor_zerolength(biggie_fname); … … 627 626 } 628 627 asprintf(&test_file, "%s/temporary-%s", bkpinfo->tmpdir, p); 629 /* BERLIOS: useless 630 asprintf(&tmp, 631 "Temporarily copying biggiefile %s's slices from tape to '%s'", 632 p, test_file); 633 log_it(tmp); 634 paranoid_free(tmp); 635 */ 628 asprintf(&tmp, 629 "Temporarily copying biggiefile %s's slices from tape to '%s'", 630 p, test_file); 631 log_it(tmp); 632 paranoid_free(tmp); 636 633 for (res = 637 634 read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr); … … 645 642 res = read_file_from_stream_to_file(bkpinfo, test_file, slice_siz); 646 643 unlink(test_file); 644 paranoid_free(slice_fnam); 645 slice_fnam = (char *)&res; 647 646 res = 648 647 read_header_block_from_stream(&slice_siz, slice_fnam, … … 654 653 current_slice_number++; 655 654 retval += res; 655 paranoid_free(slice_fnam); 656 slice_fnam = (char *)&res; 656 657 } 657 658 paranoid_free(test_file); … … 705 706 /*@ buffers ***************************************************** */ 706 707 char *tmp; 707 char *fname ;708 char *fname = (char *)&res; /* Should NOT be NULL */ 708 709 char *curr_xattr_list_fname; 709 710 char *curr_acl_list_fname; … … 713 714 714 715 assert(bkpinfo != NULL); 715 malloc_string(fname);716 716 717 717 asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ, … … 725 725 "Please wait. This may take a couple of hours.", "", 726 726 total_afioballs); 727 res = read_header_block_from_stream(&size, fname, &ctrl_chr);727 res = read_header_block_from_stream(&size, NULL, &ctrl_chr); 728 728 if (ctrl_chr != BLK_START_AFIOBALLS) { 729 729 iamhere("YOU SHOULD NOT GET HERE"); … … 731 731 if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) { 732 732 res = 733 read_EXAT_files_from_tape(bkpinfo, &size, fname, &ctrl_chr,733 read_EXAT_files_from_tape(bkpinfo, &size, NULL, &ctrl_chr, 734 734 curr_xattr_list_fname, 735 735 curr_acl_list_fname); … … 744 744 for (res = read_header_block_from_stream(&size, fname, &ctrl_chr); 745 745 ctrl_chr != BLK_STOP_AFIOBALLS; 746 res = read_header_block_from_stream(&size, fname, &ctrl_chr)) { 746 res = 747 read_header_block_from_stream(&size, fname, &ctrl_chr)) { 747 748 asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, 748 749 bkpinfo->tmpdir, current_afioball_number); … … 751 752 if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) { 752 753 iamhere("Reading EXAT files from tape"); 754 paranoid_free(fname); 755 fname = (char *)&res; 753 756 res = 754 757 read_EXAT_files_from_tape(bkpinfo, &size, fname, &ctrl_chr, … … 777 780 current_afioball_number++; 778 781 g_current_progress++; 782 paranoid_free(fname); 783 fname = (char *)&res; 779 784 res = read_header_block_from_stream(&size, fname, &ctrl_chr); 780 785 if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) { 781 786 wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr); 782 787 } 788 paranoid_free(fname); 789 fname = (char *)&res; 783 790 } 784 791 log_msg(1, "All done with afioballs"); … … 810 817 811 818 /*@ buffers ******************************************************** */ 812 char *orig_fname, *logical_fname; 819 char *orig_fname = (char *)&ctrl_chr; /* Should NOT be NULL */ 820 char *logical_fname; 813 821 char *comment; 814 822 char *curr_xattr_list_fname; … … 821 829 822 830 assert(bkpinfo != NULL); 823 malloc_string(orig_fname);824 831 825 832 asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ, … … 829 836 asprintf(&comment, "Verifying all bigfiles."); 830 837 log_to_screen(comment); 831 /*832 asprintf(&tmp, "%s/biggielist.txt", bkpinfo->tmpdir);833 noof_biggiefiles = count_lines_in_file (tmp); // pointless834 paranoid_free(tmp);835 */836 838 res = read_header_block_from_stream(&size, orig_fname, &ctrl_chr); 837 839 if (ctrl_chr != BLK_START_BIGGIEFILES) { 838 840 if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) { 839 841 iamhere("Grabbing the EXAT biggiefiles"); 842 paranoid_free(orig_fname); 843 orig_fname = (char *)&ctrl_chr; 840 844 res = 841 845 read_EXAT_files_from_tape(bkpinfo, &size, orig_fname, … … 846 850 paranoid_free(curr_xattr_list_fname); 847 851 paranoid_free(curr_acl_list_fname); 852 paranoid_free(orig_fname); 853 orig_fname = (char *)&ctrl_chr; 848 854 849 855 if (ctrl_chr != BLK_START_BIGGIEFILES) { … … 884 890 current_biggiefile_number++; 885 891 g_current_progress++; 892 paranoid_free(orig_fname); 893 orig_fname = (char *)&ctrl_chr; 886 894 } 887 895 close_progress_form(); 888 paranoid_free(orig_fname);889 896 return (retval); 890 897 }
Note:
See TracChangeset
for help on using the changeset viewer.