Changeset 1645 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-archive.c
- Timestamp:
- Sep 24, 2007, 3:04:43 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.5/mondo/src/common/libmondo-archive.c
r1644 r1645 239 239 extern char *MONDO_LOGFILE; 240 240 241 /* Reference to global bkpinfo */ 242 extern struct s_bkpinfo *bkpinfo; 243 241 244 242 245 … … 357 360 358 361 int 359 archive_this_fileset_with_star(struct s_bkpinfo *bkpinfo, char *filelist, 360 char *fname, int setno) 362 archive_this_fileset_with_star(char *filelist, char *fname, int setno) 361 363 { 362 364 int retval = 0; … … 452 454 */ 453 455 int 454 archive_this_fileset(struct s_bkpinfo *bkpinfo, char *filelist, 455 char *fname, int setno) 456 archive_this_fileset(char *filelist, char *fname, int setno) 456 457 { 457 458 … … 473 474 474 475 if (bkpinfo->compression_level > 0 && bkpinfo->use_star) { 475 return (archive_this_fileset_with_star 476 (bkpinfo, filelist, fname, setno)); 476 return (archive_this_fileset_with_star(filelist, fname, setno)); 477 477 } 478 478 … … 587 587 * @ingroup archiveGroup 588 588 */ 589 int backup_data( struct s_bkpinfo *bkpinfo)589 int backup_data() 590 590 { 591 591 int retval = 0, res = 0; … … 593 593 594 594 assert(bkpinfo != NULL); 595 set_g_cdrom_and_g_dvd_to_bkpinfo_value( bkpinfo);595 set_g_cdrom_and_g_dvd_to_bkpinfo_value(); 596 596 malloc_string(tmp); 597 597 if (bkpinfo->backup_media_type == dvd) { … … 608 608 } 609 609 610 if ((res = prepare_filelist( bkpinfo))) { /* generate scratchdir/filelist.full */610 if ((res = prepare_filelist())) { /* generate scratchdir/filelist.full */ 611 611 fatal_error("Failed to generate filelist catalog"); 612 612 } 613 if (call_filelist_chopper( bkpinfo)) {613 if (call_filelist_chopper()) { 614 614 fatal_error("Failed to run filelist chopper"); 615 615 } … … 630 630 } 631 631 632 copy_mondo_and_mindi_stuff_to_scratchdir( bkpinfo); // payload, too, if it exists632 copy_mondo_and_mindi_stuff_to_scratchdir(); // payload, too, if it exists 633 633 #if __FreeBSD__ == 5 634 634 strcpy(bkpinfo->kernel_path, "/boot/kernel/kernel"); … … 644 644 #error "I don't know about this system!" 645 645 #endif 646 if ((res = call_mindi_to_supply_boot_disks( bkpinfo))) {646 if ((res = call_mindi_to_supply_boot_disks())) { 647 647 fatal_error("Failed to generate boot+data disks"); 648 648 } 649 retval += do_that_initial_phase( bkpinfo); // prepare649 retval += do_that_initial_phase(); // prepare 650 650 sprintf(tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir); 651 651 run_program_and_log_output(tmp, 1); 652 retval += make_those_afios_phase( bkpinfo); // backup regular files653 retval += make_those_slices_phase( bkpinfo); // backup BIG files654 retval += do_that_final_phase( bkpinfo); // clean up652 retval += make_those_afios_phase(); // backup regular files 653 retval += make_those_slices_phase(); // backup BIG files 654 retval += do_that_final_phase(); // clean up 655 655 log_msg(1, "Creation of archives... complete."); 656 656 if (bkpinfo->verify_data) { … … 690 690 * @ingroup MLarchiveGroup 691 691 */ 692 int call_mindi_to_supply_boot_disks( struct s_bkpinfo *bkpinfo)692 int call_mindi_to_supply_boot_disks() 693 693 { 694 694 /*@ buffer ************************************************************ */ … … 1162 1162 char *curr_acl_list_fname; 1163 1163 1164 struct s_bkpinfo *bkpinfo ;1164 struct s_bkpinfo *bkpinfo_bis; 1165 1165 char *tmp; 1166 1166 int res = 0, retval = 0; … … 1180 1180 p_next_set_to_archive = (int *) (inbuf + 8); 1181 1181 p_list_of_fileset_flags = (char *) (inbuf + 12); 1182 bkpinfo = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);1182 bkpinfo_bis = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET); 1183 1183 1184 1184 sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, … … 1246 1246 this_thread_no, archiving_set_no); 1247 1247 res = 1248 archive_this_fileset( bkpinfo,archiving_filelist_fname,1248 archive_this_fileset(archiving_filelist_fname, 1249 1249 archiving_afioball_fname, 1250 1250 archiving_set_no); … … 1304 1304 * @ingroup MLarchiveGroup 1305 1305 */ 1306 int do_that_final_phase( struct s_bkpinfo *bkpinfo)1306 int do_that_final_phase() 1307 1307 { 1308 1308 … … 1321 1321 /* write tape/cdstream */ 1322 1322 { 1323 closeout_tape( bkpinfo);1323 closeout_tape(); 1324 1324 } else 1325 1325 /* write final ISO */ 1326 1326 { 1327 res = write_final_iso_if_necessary( bkpinfo);1327 res = write_final_iso_if_necessary(); 1328 1328 retval += res; 1329 1329 if (res) { … … 1365 1365 * @ingroup MLarchiveGroup 1366 1366 */ 1367 int do_that_initial_phase( struct s_bkpinfo *bkpinfo)1367 int do_that_initial_phase() 1368 1368 { 1369 1369 /*@ int *************************************** */ … … 1613 1613 * @return The number of errors encountered (0 for success) 1614 1614 */ 1615 int make_afioballs_and_images( struct s_bkpinfo *bkpinfo)1615 int make_afioballs_and_images() 1616 1616 { 1617 1617 … … 1673 1673 "Please wait. This may take a couple of hours.", 1674 1674 "Working...", 1675 get_last_filelist_number( bkpinfo) + 1);1675 get_last_filelist_number() + 1); 1676 1676 1677 1677 log_msg(5, "We're gonna party like it's your birthday."); … … 1742 1742 sleep(5); 1743 1743 } 1744 strcpy(media_usage_comment, 1745 percent_media_full_comment(bkpinfo)); 1744 strcpy(media_usage_comment, percent_media_full_comment()); 1746 1745 /* copy to CD (scratchdir) ... and an actual CD-R if necessary */ 1747 1746 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) { … … 1752 1751 iamhere("Writing EXAT files"); 1753 1752 res += 1754 write_EXAT_files_to_tape(bkpinfo, 1755 curr_xattr_list_fname, 1753 write_EXAT_files_to_tape(curr_xattr_list_fname, 1756 1754 curr_acl_list_fname); 1757 1755 // archives themselves 1758 1756 res += 1759 move_files_to_stream( bkpinfo,storing_afioball_fname,1757 move_files_to_stream(storing_afioball_fname, 1760 1758 NULL); 1761 1759 } else { 1762 1760 if (g_getfacl) { 1763 1761 if (g_getfattr) { 1764 res = move_files_to_cd( bkpinfo,storing_filelist_fname,1762 res = move_files_to_cd(storing_filelist_fname, 1765 1763 curr_xattr_list_fname, 1766 1764 curr_acl_list_fname, 1767 1765 storing_afioball_fname, NULL); 1768 1766 } else { 1769 res = move_files_to_cd( bkpinfo,storing_filelist_fname,1767 res = move_files_to_cd(storing_filelist_fname, 1770 1768 curr_acl_list_fname, 1771 1769 storing_afioball_fname, NULL); … … 1773 1771 } else { 1774 1772 if (g_getfattr) { 1775 res = move_files_to_cd( bkpinfo,storing_filelist_fname,1773 res = move_files_to_cd(storing_filelist_fname, 1776 1774 curr_xattr_list_fname, 1777 1775 storing_afioball_fname, NULL); 1778 1776 } else { 1779 res = move_files_to_cd( bkpinfo,storing_filelist_fname,1777 res = move_files_to_cd(storing_filelist_fname, 1780 1778 storing_afioball_fname, NULL); 1781 1779 } … … 1855 1853 * @return The number of errors encountered (0 for success) 1856 1854 */ 1857 int make_iso_fs( struct s_bkpinfo *bkpinfo,char *destfile)1855 int make_iso_fs(char *destfile) 1858 1856 { 1859 1857 /*@ int ********************************************** */ … … 1932 1930 g_current_media_number); 1933 1931 res = 1934 eval_call_to_make_ISO(bkpinfo , bkpinfo->call_before_iso,1932 eval_call_to_make_ISO(bkpinfo->call_before_iso, 1935 1933 destfile, g_current_media_number, 1936 1934 MONDO_LOGFILE, message_to_screen); … … 1957 1955 } else { 1958 1956 res = 1959 eval_call_to_make_ISO(bkpinfo , bkpinfo->call_make_iso,1957 eval_call_to_make_ISO(bkpinfo->call_make_iso, 1960 1958 bkpinfo->scratchdir, 1961 1959 g_current_media_number, … … 2020 2018 pause_for_N_seconds(5, "Letting DVD drive settle"); 2021 2019 res = 2022 eval_call_to_make_ISO(bkpinfo , bkpinfo->call_make_iso,2020 eval_call_to_make_ISO(bkpinfo->call_make_iso, 2023 2021 bkpinfo->scratchdir, 2024 2022 g_current_media_number, … … 2054 2052 // FIXME --- change mkisofs string to MONDO_MKISOFS_NONBOOTABLE and add ' .' at end 2055 2053 res = 2056 eval_call_to_make_ISO(bkpinfo, 2057 "mkisofs -o '_ISO_' -r -p MondoRescue -publisher www.mondorescue.org -A MondoRescue_GPL -V _CD#_ .", 2054 eval_call_to_make_ISO("mkisofs -o '_ISO_' -r -p MondoRescue -publisher www.mondorescue.org -A MondoRescue_GPL -V _CD#_ .", 2058 2055 destfile, g_current_media_number, 2059 2056 MONDO_LOGFILE, message_to_screen); … … 2074 2071 #ifdef __IA64__ 2075 2072 log_msg(1, "IA64 --> elilo"); 2076 res = eval_call_to_make_ISO(bkpinfo, 2077 //-b images/mindi-boot.2880.img 2078 "mkisofs -no-emul-boot -b images/mindi-bootroot." 2073 res = eval_call_to_make_ISO("mkisofs -no-emul-boot -b images/mindi-bootroot." 2079 2074 IA64_BOOT_SIZE 2080 2075 ".img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", … … 2088 2083 log_msg(1, "Non-ia64 --> lilo"); 2089 2084 res = 2090 eval_call_to_make_ISO(bkpinfo, 2091 "mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", 2085 eval_call_to_make_ISO("mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", 2092 2086 destfile, g_current_media_number, 2093 2087 MONDO_LOGFILE, … … 2098 2092 log_msg(1, "Isolinux"); 2099 2093 res = 2100 eval_call_to_make_ISO(bkpinfo, 2101 "mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", 2094 eval_call_to_make_ISO("mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", 2102 2095 destfile, g_current_media_number, 2103 2096 MONDO_LOGFILE, … … 2132 2125 pause_and_ask_for_cdr(2, &cd_is_mountable); 2133 2126 res = 2134 eval_call_to_make_ISO(bkpinfo , bkpinfo->call_burn_iso,2127 eval_call_to_make_ISO(bkpinfo->call_burn_iso, 2135 2128 destfile, g_current_media_number, 2136 2129 MONDO_LOGFILE, message_to_screen); … … 2149 2142 g_current_media_number); 2150 2143 res = 2151 eval_call_to_make_ISO(bkpinfo , bkpinfo->call_after_iso,2144 eval_call_to_make_ISO(bkpinfo->call_after_iso, 2152 2145 destfile, g_current_media_number, 2153 2146 MONDO_LOGFILE, message_to_screen); … … 2219 2212 */ 2220 2213 int 2221 make_slices_and_images( struct s_bkpinfo *bkpinfo,char *biggielist_fname)2214 make_slices_and_images(char *biggielist_fname) 2222 2215 { 2223 2216 … … 2252 2245 malloc_string(sz_devfile); 2253 2246 estimated_total_noof_slices = 2254 size_of_all_biggiefiles_K( bkpinfo) / bkpinfo->optimal_set_size + 1;2247 size_of_all_biggiefiles_K() / bkpinfo->optimal_set_size + 1; 2255 2248 2256 2249 log_msg(1, "size of all biggiefiles = %ld", 2257 size_of_all_biggiefiles_K( bkpinfo));2250 size_of_all_biggiefiles_K()); 2258 2251 log_msg(1, "estimated_total_noof_slices = %ld KB / %ld KB = %ld", 2259 size_of_all_biggiefiles_K( bkpinfo), bkpinfo->optimal_set_size,2252 size_of_all_biggiefiles_K(), bkpinfo->optimal_set_size, 2260 2253 estimated_total_noof_slices); 2261 2254 … … 2343 2336 } 2344 2337 res = 2345 slice_up_file_etc(b kpinfo, bigfile_fname,2338 slice_up_file_etc(bigfile_fname, 2346 2339 ntfsprog_fifo, biggie_file_number, 2347 2340 noof_biggie_files, use_ntfsprog); … … 2395 2388 * @see make_afioballs_and_images 2396 2389 */ 2397 int make_afioballs_and_images_OLD( struct s_bkpinfo *bkpinfo)2390 int make_afioballs_and_images_OLD() 2398 2391 { 2399 2392 … … 2427 2420 "Please wait. This may take a couple of hours.", 2428 2421 "Working...", 2429 get_last_filelist_number( bkpinfo) + 1);2422 get_last_filelist_number() + 1); 2430 2423 2431 2424 sprintf(curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, … … 2455 2448 log_msg(1, "Archiving set %ld", curr_set_no); 2456 2449 res = 2457 archive_this_fileset( bkpinfo,curr_filelist_fname,2450 archive_this_fileset(curr_filelist_fname, 2458 2451 curr_afioball_fname, curr_set_no); 2459 2452 retval += res; … … 2465 2458 } 2466 2459 2467 strcpy(media_usage_comment, percent_media_full_comment( bkpinfo));2460 strcpy(media_usage_comment, percent_media_full_comment()); 2468 2461 2469 2462 /* copy to CD (scratchdir) ... and an actual CD-R if necessary */ … … 2475 2468 iamhere("Writing EXAT files"); 2476 2469 res += 2477 write_EXAT_files_to_tape( bkpinfo,curr_xattr_list_fname,2470 write_EXAT_files_to_tape(curr_xattr_list_fname, 2478 2471 curr_acl_list_fname); 2479 2472 // archives themselves 2480 res = move_files_to_stream( bkpinfo,curr_afioball_fname, NULL);2473 res = move_files_to_stream(curr_afioball_fname, NULL); 2481 2474 } else { 2482 2475 if (g_getfacl) { 2483 2476 if (g_getfattr) { 2484 res = move_files_to_cd( bkpinfo,curr_filelist_fname,2477 res = move_files_to_cd(curr_filelist_fname, 2485 2478 curr_xattr_list_fname, 2486 2479 curr_acl_list_fname, 2487 2480 curr_afioball_fname, NULL); 2488 2481 } else { 2489 res = move_files_to_cd( bkpinfo,curr_filelist_fname,2482 res = move_files_to_cd(curr_filelist_fname, 2490 2483 curr_acl_list_fname, 2491 2484 curr_afioball_fname, NULL); … … 2493 2486 } else { 2494 2487 if (g_getfattr) { 2495 res = move_files_to_cd( bkpinfo,curr_filelist_fname,2488 res = move_files_to_cd(curr_filelist_fname, 2496 2489 curr_xattr_list_fname, 2497 2490 curr_afioball_fname, NULL); 2498 2491 } else { 2499 res = move_files_to_cd( bkpinfo,curr_filelist_fname,2492 res = move_files_to_cd(curr_filelist_fname, 2500 2493 curr_afioball_fname, NULL); 2501 2494 } … … 2542 2535 * @ingroup MLarchiveGroup 2543 2536 */ 2544 int make_those_afios_phase( struct s_bkpinfo *bkpinfo)2537 int make_those_afios_phase() 2545 2538 { 2546 2539 /*@ int ******************************************* */ … … 2559 2552 log_msg(1, 2560 2553 "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0"); 2561 res = make_afioballs_and_images_OLD( bkpinfo);2554 res = make_afioballs_and_images_OLD(); 2562 2555 #else 2563 res = make_afioballs_and_images_OLD( bkpinfo);2556 res = make_afioballs_and_images_OLD(); 2564 2557 #endif 2565 2558 write_header_block_to_stream((off_t)0, "stop-afioballs", 2566 2559 BLK_STOP_AFIOBALLS); 2567 2560 } else { 2568 res = make_afioballs_and_images( bkpinfo);2561 res = make_afioballs_and_images(); 2569 2562 } 2570 2563 … … 2588 2581 * @ingroup MLarchiveGroup 2589 2582 */ 2590 int make_those_slices_phase( struct s_bkpinfo *bkpinfo)2583 int make_those_slices_phase() 2591 2584 { 2592 2585 … … 2646 2639 2647 2640 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) { 2648 res += write_EXAT_files_to_tape( bkpinfo,xattr_fname, acl_fname);2641 res += write_EXAT_files_to_tape(xattr_fname, acl_fname); 2649 2642 asprintf(&blah, "%ld", count_lines_in_file(biggielist)); 2650 2643 write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES); 2651 2644 paranoid_free(blah); 2652 2645 } 2653 res = make_slices_and_images(b kpinfo, biggielist);2646 res = make_slices_and_images(biggielist); 2654 2647 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) { 2655 2648 write_header_block_to_stream((off_t)0, "end-of-biggiefiles", … … 2681 2674 * transfer files over the network) or leave it as is. 2682 2675 */ 2683 int (*move_files_to_cd) ( struct s_bkpinfo *,char *, ...) =2676 int (*move_files_to_cd) (char *, ...) = 2684 2677 _move_files_to_cd; 2685 2678 … … 2702 2695 * @return The number of errors encountered (0 for success) 2703 2696 */ 2704 int _move_files_to_cd( struct s_bkpinfo *bkpinfo,char *files_to_add, ...)2697 int _move_files_to_cd(char *files_to_add, ...) 2705 2698 { 2706 2699 … … 2741 2734 } 2742 2735 if (would_occupy / 1024 > bkpinfo->media_size[g_current_media_number]) { 2743 res = write_iso_and_go_on( bkpinfo,FALSE); /* FALSE because this is not the last CD we'll write */2736 res = write_iso_and_go_on(FALSE); /* FALSE because this is not the last CD we'll write */ 2744 2737 retval += res; 2745 2738 if (res) { … … 2798 2791 * @ingroup MLarchiveGroup 2799 2792 */ 2800 int offer_to_write_floppies( struct s_bkpinfo *bkpinfo,char *imagesdir)2793 int offer_to_write_floppies(char *imagesdir) 2801 2794 { 2802 2795 /*@ buffer ************************************************************ */ … … 2958 2951 */ 2959 2952 2960 int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo 2961 *bkpinfo) 2953 int offer_to_write_boot_floppies_to_physical_disks() 2962 2954 { 2963 2955 int res = 0; … … 2982 2974 } 2983 2975 } else { 2984 offer_to_write_floppies( bkpinfo,MINDI_CACHE);2976 offer_to_write_floppies(MINDI_CACHE); 2985 2977 mvaddstr_and_log_it(g_currentY++, 74, "Done."); 2986 2978 } … … 3005 2997 * transfer files over the network) or leave it as is. 3006 2998 */ 3007 int (*move_files_to_stream) ( struct s_bkpinfo *,char *, ...) =2999 int (*move_files_to_stream) (char *, ...) = 3008 3000 _move_files_to_stream; 3009 3001 … … 3022 3014 */ 3023 3015 int 3024 _move_files_to_stream( struct s_bkpinfo *bkpinfo,char *files_to_add, ...)3016 _move_files_to_stream(char *files_to_add, ...) 3025 3017 { 3026 3018 … … 3066 3058 type = other; 3067 3059 } 3068 res = write_file_to_stream_from_file( bkpinfo,curr_file);3060 res = write_file_to_stream_from_file(curr_file); 3069 3061 retval += res; 3070 3062 unlink(curr_file); … … 3381 3373 */ 3382 3374 int 3383 slice_up_file_etc( struct s_bkpinfo *bkpinfo,char *biggie_filename,3375 slice_up_file_etc(char *biggie_filename, 3384 3376 char *ntfsprog_fifo, long biggie_file_number, 3385 3377 long noof_biggie_files, bool use_ntfsprog) … … 3517 3509 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) { 3518 3510 res = 3519 move_files_to_stream(bkpinfo, 3520 slice_fname(biggie_file_number, 0, 3511 move_files_to_stream(slice_fname(biggie_file_number, 0, 3521 3512 bkpinfo->tmpdir, ""), NULL); 3522 3513 } else { 3523 3514 res = 3524 move_files_to_cd(bkpinfo, 3525 slice_fname(biggie_file_number, 0, 3515 move_files_to_cd(slice_fname(biggie_file_number, 0, 3526 3516 bkpinfo->tmpdir, ""), NULL); 3527 3517 } … … 3535 3525 suffix)); 3536 3526 3537 strcpy(tmp, percent_media_full_comment( bkpinfo));3527 strcpy(tmp, percent_media_full_comment()); 3538 3528 update_progress_form(tmp); 3539 3529 if (!(fout = fopen(curr_slice_fname_uncompressed, "w"))) { … … 3622 3612 maintain_collection_of_recent_archives(bkpinfo->tmpdir, 3623 3613 file_to_archive); 3624 res = move_files_to_stream( bkpinfo,file_to_archive, NULL);3614 res = move_files_to_stream(file_to_archive, NULL); 3625 3615 } else { 3626 res = move_files_to_cd( bkpinfo,file_to_archive, NULL);3616 res = move_files_to_cd(file_to_archive, NULL); 3627 3617 } 3628 3618 retval += res; … … 3716 3706 * however, this occurs rarely. 3717 3707 */ 3718 int write_final_iso_if_necessary( struct s_bkpinfo *bkpinfo)3708 int write_final_iso_if_necessary() 3719 3709 { 3720 3710 /*@ int ***************************************************** */ … … 3737 3727 } 3738 3728 #endif 3739 res = write_iso_and_go_on( bkpinfo,TRUE);3729 res = write_iso_and_go_on(TRUE); 3740 3730 #ifndef _XWIN 3741 3731 if (!g_text_mode) { … … 3766 3756 * @see make_iso_fs 3767 3757 */ 3768 int write_iso_and_go_on( struct s_bkpinfo *bkpinfo,bool last_cd)3758 int write_iso_and_go_on(bool last_cd) 3769 3759 { 3770 3760 /*@ pointers **************************************************** */ … … 3842 3832 g_current_media_number); 3843 3833 for (that_one_was_ok = FALSE; !that_one_was_ok;) { 3844 res = make_iso_fs( bkpinfo,isofile);3834 res = make_iso_fs(isofile); 3845 3835 if (g_current_media_number == 1 && !res 3846 3836 && (bkpinfo->backup_media_type == cdr … … 3861 3851 chdir("/"); 3862 3852 iamhere("Before calling verify_cd_image()"); 3863 res += verify_cd_image( bkpinfo);3853 res += verify_cd_image(); 3864 3854 iamhere("After calling verify_cd_image()"); 3865 3855 } … … 3934 3924 * @ingroup verifyGroup 3935 3925 */ 3936 int verify_data( struct s_bkpinfo *bkpinfo)3926 int verify_data() 3937 3927 { 3938 3928 int res = 0, retval = 0, cdno = 0; … … 3949 3939 strcpy(bkpinfo->media_device, "/dev/cdrom"); 3950 3940 } 3951 verify_tape_backups( bkpinfo);3941 verify_tape_backups(); 3952 3942 mvaddstr_and_log_it(g_currentY++, 74, "Done."); 3953 3943 } else if (bkpinfo->backup_data) … … 3972 3962 } 3973 3963 if (bkpinfo->backup_media_type != iso) { 3974 insist_on_this_cd_number( bkpinfo,cdno);3975 } 3976 res = verify_cd_image( bkpinfo); // sets verify_data to FALSE if it's time to stop verifying3964 insist_on_this_cd_number(cdno); 3965 } 3966 res = verify_cd_image(); // sets verify_data to FALSE if it's time to stop verifying 3977 3967 retval += res; 3978 3968 if (res) { 3979 3969 sprintf(tmp, 3980 3970 "Warnings/errors were reported while checking %s #%d", 3981 media_descriptor_string(bkpinfo-> 3982 backup_media_type), 3971 media_descriptor_string(bkpinfo->backup_media_type), 3983 3972 g_current_media_number); 3984 3973 log_to_screen(tmp);
Note:
See TracChangeset
for help on using the changeset viewer.
