Changeset 2291 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c
- Timestamp:
- Jul 22, 2009, 2:11:26 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-archive.c
r2286 r2291 226 226 log_msg(5, "command='%s'", command); 227 227 res = system(command); 228 mr_asprintf(&tmp, last_line_of_file(MONDO_LOGFILE));228 mr_asprintf(&tmp, "%s", last_line_of_file(MONDO_LOGFILE)); 229 229 log_msg(1, "res=%d; tmp='%s'", res, tmp); 230 230 if (bkpinfo->use_star && (res == 254 || res == 65024) … … 541 541 542 542 assert(bkpinfo != NULL); 543 mr_asprintf(&tmp, 544 "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'", 543 mr_asprintf(&tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'", 545 544 bkpinfo->exclude_paths); 546 545 mr_asprintf(&devs_to_exclude, "%s", call_program_and_get_last_line_of_output(tmp)); … … 624 623 625 624 #ifdef __FreeBSD__ 626 mr_asprintf(&bootdev, call_program_and_get_last_line_of_output625 mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output 627 626 ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'")); 628 627 if (!bootdev[0]) { 629 628 mr_free(bootdev); 630 mr_asprintf(&bootdev, call_program_and_get_last_line_of_output629 mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output 631 630 ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'")); 632 631 } … … 634 633 /* Linux */ 635 634 #ifdef __IA64__ 636 mr_asprintf(&bootdev, call_program_and_get_last_line_of_output635 mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output 637 636 ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'")); 638 637 #else 639 mr_asprintf(&bootdev, call_program_and_get_last_line_of_output638 mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output 640 639 ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'")); 641 640 #endif … … 643 642 mr_free(bootdev); 644 643 #ifdef __IA64__ 645 mr_asprintf(&bootdev, call_program_and_get_last_line_of_output644 mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output 646 645 ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1")); 647 646 #else 648 mr_asprintf(&bootdev, call_program_and_get_last_line_of_output647 mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output 649 648 ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1")); 650 649 #endif … … 652 651 if (!bootdev[0]) { 653 652 mr_free(bootdev); 654 mr_asprintf(&bootdev, call_program_and_get_last_line_of_output653 mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output 655 654 ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'")); 656 655 if (strstr(bootdev, "/dev/cciss/")) { 657 656 mr_free(bootdev); 658 mr_asprintf(&bootdev, call_program_and_get_last_line_of_output657 mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output 659 658 ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1")); 660 659 } … … 667 666 ch = 'U'; 668 667 if (bkpinfo->boot_loader != '\0') { 669 mr_asprintf(&tmp, "User specified boot loader. It is '%c'.", 670 bkpinfo->boot_loader); 668 mr_asprintf(&tmp, "User specified boot loader. It is '%c'.", bkpinfo->boot_loader); 671 669 log_msg(2, tmp); 672 670 mr_free(tmp); … … 675 673 } 676 674 if (bkpinfo->boot_device[0] != '\0') { 677 mr_asprintf(&tmp, "User specified boot device. It is '%s'.", 678 bkpinfo->boot_device); 675 mr_asprintf(&tmp, "User specified boot device. It is '%s'.", bkpinfo->boot_device); 679 676 log_msg(2, tmp); 680 677 mr_free(tmp); … … 761 758 mr_asprintf(&bootldr_str, "unknown"); 762 759 } 763 mr_asprintf(&tmp, "Your boot loader is %s and it boots from %s", 764 bootldr_str, bkpinfo->boot_device); 760 mr_asprintf(&tmp, "Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device); 765 761 log_to_screen(tmp); 766 762 mr_free(tmp); … … 862 858 estimated_total_noof_slices = 863 859 size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1; 864 /* add nfs stuff here? */860 /* add nfs stuff here? */ 865 861 mr_asprintf(&command, "mkdir -p %s/images", bkpinfo->scratchdir); 866 862 if (system(command)) { … … 1495 1491 mr_free(media_usage_comment); 1496 1492 if (res) { 1497 mr_asprintf(&tmp, 1498 "Failed to add archive %ld's files to CD dir\n", 1493 mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n", 1499 1494 storing_set_no); 1500 1495 log_to_screen(tmp); … … 1786 1781 } 1787 1782 pause_for_N_seconds(5, "Letting DVD drive settle"); 1788 mr_asprintf(&sz_blank_disk, "dvd+rw-format -force %s", 1789 bkpinfo->media_device); 1783 mr_asprintf(&sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device); 1790 1784 log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk); 1791 1785 res = … … 1976 1970 bool ret = TRUE; 1977 1971 1978 mr_asprintf(&command, 1979 "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1", 1980 bigfile_fname); 1972 mr_asprintf(&command, "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1", bigfile_fname); 1981 1973 log_msg(1, "command = '%s'", command); 1982 1974 mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command)); … … 2097 2089 "Calling ntfsclone in background because %s is an NTFS partition", 2098 2090 bigfile_fname); 2099 mr_asprintf(&sz_devfile, "%s/%d.%d.000", 2100 bkpinfo->tmpdir, 2091 mr_asprintf(&sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, 2101 2092 (int) (random() % 32768), 2102 2093 (int) (random() % 32768)); … … 2225 2216 log_msg(1, "EXAT'g set %ld", curr_set_no); 2226 2217 if (g_getfattr) { 2227 mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, 2228 bkpinfo->tmpdir, curr_set_no); 2218 mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no); 2229 2219 get_fattr_list(curr_filelist_fname, curr_xattr_list_fname); 2230 2220 } 2231 2221 if (g_getfacl) { 2232 mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, 2233 bkpinfo->tmpdir, curr_set_no); 2222 mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no); 2234 2223 get_acl_list(curr_filelist_fname, curr_acl_list_fname); 2235 2224 } … … 2241 2230 retval += res; 2242 2231 if (res) { 2243 mr_asprintf(&tmp, 2244 "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?", 2245 curr_set_no); 2232 mr_asprintf(&tmp, "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?", curr_set_no); 2246 2233 log_to_screen(tmp); 2247 2234 mr_free(tmp); … … 2295 2282 2296 2283 if (res) { 2297 mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n", 2298 curr_set_no); 2284 mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n", curr_set_no); 2299 2285 log_to_screen(tmp); 2300 2286 mr_free(tmp); … … 2505 2491 continue; 2506 2492 } 2507 mr_asprintf(&curr_file, cf);2493 mr_asprintf(&curr_file, "%s", cf); 2508 2494 if (!does_file_exist(curr_file)) { 2509 2495 log_msg(1, … … 2534 2520 continue; 2535 2521 } 2536 mr_asprintf(&curr_file, cf);2522 mr_asprintf(&curr_file, "%s", cf); 2537 2523 2538 2524 mr_asprintf(&tmp, "mv -f %s %s/archives/", curr_file, bkpinfo->scratchdir); … … 2609 2595 continue; 2610 2596 } 2611 mr_asprintf(&curr_file, cf);2597 mr_asprintf(&curr_file, "%s", cf); 2612 2598 if (!does_file_exist(curr_file)) { 2613 2599 log_msg(1, … … 2667 2653 char *cdrecord = NULL; 2668 2654 2669 mr_asprintf(&bkp, cdrw_dev);2655 mr_asprintf(&bkp, "%s", cdrw_dev); 2670 2656 if (find_cdrw_device(cdrw_dev)) { 2671 2657 strcpy(cdrw_dev, bkp); … … 2826 2812 eject_device(cdrom_dev); 2827 2813 mds = media_descriptor_string(g_backup_media_type); 2828 mr_asprintf(&tmp, 2829 "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", 2814 mr_asprintf(&tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", 2830 2815 mds, g_current_media_number, mds); 2831 2816 mr_free(mds); … … 2995 2980 mr_asprintf(&command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename); 2996 2981 log_it("command = %s", command); 2997 mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));2982 mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command)); 2998 2983 mr_free(command); 2999 2984 log_it("res of it = %s", tmp); … … 3028 3013 strcpy(biggiestruct.checksum, checksum_line); 3029 3014 3030 mr_asprintf(&tmp, slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));3015 mr_asprintf(&tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, "")); 3031 3016 fout = fopen(tmp, "w"); 3032 3017 if (fout == NULL) { … … 3069 3054 } 3070 3055 for (slice_num = 1; !finished; slice_num++) { 3071 mr_asprintf(&curr_slice_fname_uncompressed, "%s", 3072 slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, 3073 "")); 3074 mr_asprintf(&curr_slice_fname_compressed, "%s", 3075 slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, 3076 suffix)); 3077 3078 mr_asprintf(&tmp, percent_media_full_comment()); 3056 mr_asprintf(&curr_slice_fname_uncompressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, "")); 3057 mr_asprintf(&curr_slice_fname_compressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, suffix)); 3058 3059 mr_asprintf(&tmp, "%s", percent_media_full_comment()); 3079 3060 update_progress_form(tmp); 3080 3061 paranoid_free(tmp); … … 3108 3089 } 3109 3090 if (should_I_compress_slices && bkpinfo->compression_level > 0) { 3110 mr_asprintf(&command, "%s -%d %s", bkpinfo->zip_exe, 3111 bkpinfo->compression_level, 3112 curr_slice_fname_uncompressed); 3091 mr_asprintf(&command, "%s -%d %s", bkpinfo->zip_exe, bkpinfo->compression_level, curr_slice_fname_uncompressed); 3113 3092 log_msg(2, command); 3114 3093 if ((res = system(command))) { … … 3117 3096 // did_I_compress_slice = TRUE; 3118 3097 } else { 3119 mr_asprintf(&command, "mv %s %s 2>> %s", 3120 curr_slice_fname_uncompressed, 3121 curr_slice_fname_compressed, MONDO_LOGFILE); 3098 mr_asprintf(&command, "mv %s %s 2>> %s", curr_slice_fname_uncompressed, curr_slice_fname_compressed, MONDO_LOGFILE); 3122 3099 res = 0; // don't do it :) 3123 3100 // did_I_compress_slice = FALSE; … … 3137 3114 mr_asprintf(&tmp, "Problem with slice # %ld", slice_num); 3138 3115 } else { 3139 mr_asprintf(&tmp, 3140 "%s - Bigfile #%ld, slice #%ld compressed OK ", 3141 biggie_filename, biggie_file_number + 1, 3116 mr_asprintf(&tmp, "%s - Bigfile #%ld, slice #%ld compressed OK ", biggie_filename, biggie_file_number + 1, 3142 3117 slice_num); 3143 3118 } … … 3154 3129 paranoid_free(tmp); 3155 3130 3156 mr_asprintf(&file_to_archive, curr_slice_fname_compressed);3131 mr_asprintf(&file_to_archive, "%s", curr_slice_fname_compressed); 3157 3132 g_current_progress++; 3158 3133 } else { /* if i==0 then ... */ 3159 3134 3160 3135 finished = TRUE; 3161 mr_asprintf(&file_to_archive, curr_slice_fname_uncompressed);3136 mr_asprintf(&file_to_archive, "%s", curr_slice_fname_uncompressed); 3162 3137 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) { 3163 3138 break; … … 3180 3155 retval += res; 3181 3156 if (res) { 3182 mr_asprintf(&tmp, 3183 "Failed to add slice %ld of bigfile %ld to scratchdir", 3184 slice_num, biggie_file_number + 1); 3157 mr_asprintf(&tmp, "Failed to add slice %ld of bigfile %ld to scratchdir", slice_num, biggie_file_number + 1); 3185 3158 log_to_screen(tmp); 3186 3159 paranoid_free(tmp); … … 3529 3502 if (res) { 3530 3503 mds = media_descriptor_string(bkpinfo->backup_media_type); 3531 mr_asprintf(&tmp, 3532 "Warnings/errors were reported while checking %s #%d", mds, g_current_media_number); 3504 mr_asprintf(&tmp, "Warnings/errors were reported while checking %s #%d", mds, g_current_media_number); 3533 3505 mr_free(mds); 3534 3506 log_to_screen(tmp); … … 3537 3509 } 3538 3510 } 3539 mr_asprintf(&tmp, 3540 "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files", 3541 MONDO_LOGFILE, MONDO_CACHE); 3511 mr_asprintf(&tmp, "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE); 3542 3512 (void)system(tmp); 3543 3513 mr_free(tmp); 3544 3514 3545 mr_asprintf(&tmp, 3546 "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files", 3547 MONDO_LOGFILE, MONDO_CACHE); 3515 mr_asprintf(&tmp, "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE); 3548 3516 (void)system(tmp); 3549 3517 mr_free(tmp);
Note:
See TracChangeset
for help on using the changeset viewer.
