Changeset 1770 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c
- Timestamp:
- Nov 6, 2007, 11:01:53 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c
r1670 r1770 138 138 139 139 if (retval) { 140 if (!(fout = fopen(M INDI_CACHE"/changed.txt", "a"))) {140 if (!(fout = fopen(MONDO_CACHE"/changed.txt", "a"))) { 141 141 fatal_error("Cannot openout changed.txt"); 142 142 } … … 306 306 if (length_of_file(logfile) > 5) { 307 307 mr_asprintf(&command, 308 "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "M INDI_CACHE"/changed.txt",308 "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt", 309 309 logfile); 310 310 system(command); … … 464 464 getcwd(new, MAX_STR_LEN - 1); 465 465 insist_on_this_cd_number(g_current_media_number); 466 unlink(M INDI_CACHE"/changed.txt");466 unlink(MONDO_CACHE"/changed.txt"); 467 467 468 468 resA = compare_all_tarballs(); 469 469 resB = compare_all_biggiefiles(); 470 470 chdir(cwd); 471 noof_changed_files = count_lines_in_file(M INDI_CACHE"/changed.txt");471 noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt"); 472 472 if (noof_changed_files) { 473 473 log_to_screen(_("%ld files do not match the backup "), 474 474 noof_changed_files); 475 mr_asprintf(&command, "cat "M INDI_CACHE"/changed.txt >> %s", MONDO_LOGFILE);475 mr_asprintf(&command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE); 476 476 paranoid_system(command); 477 477 mr_free(command); … … 579 579 } 580 580 581 if (count_lines_in_file(M INDI_CACHE"/changed.txt") > 0) {581 if (count_lines_in_file(MONDO_CACHE"/changed.txt") > 0) { 582 582 mvaddstr_and_log_it(g_currentY++, 0, 583 583 _ 584 584 ("Differences found while files were being compared.")); 585 streamline_changes_file(M INDI_CACHE"/changed.files", MINDI_CACHE"/changed.txt");586 if (count_lines_in_file(M INDI_CACHE"/changed.files") <= 0) {585 streamline_changes_file(MONDO_CACHE"/changed.files", MONDO_CACHE"/changed.txt"); 586 if (count_lines_in_file(MONDO_CACHE"/changed.files") <= 0) { 587 587 mvaddstr_and_log_it(g_currentY++, 0, 588 588 _ … … 591 591 ("The differences were logfiles and temporary files. Your archives are fine.")); 592 592 } else { 593 q = count_lines_in_file(M INDI_CACHE"/changed.files");593 q = count_lines_in_file(MONDO_CACHE"/changed.files"); 594 594 mr_asprintf(&tmp, _("%ld significant difference%s found."), q, 595 595 (q != 1) ? "s" : ""); … … 608 608 chdir(bkpinfo->restore_path); 609 609 getcwd(new, MAX_STR_LEN - 1); 610 popup_changelist_from_file(M INDI_CACHE"/changed.files");610 popup_changelist_from_file(MONDO_CACHE"/changed.files"); 611 611 mr_msg(2, "Returning from popup_changelist_from_file()"); 612 612 chdir(cwd); … … 666 666 res = verify_tape_backups(); 667 667 chdir(dir); 668 if (length_of_file(M INDI_CACHE"/changed.txt") > 2669 && length_of_file(M INDI_CACHE"/changed.files") > 2) {668 if (length_of_file(MONDO_CACHE"/changed.txt") > 2 669 && length_of_file(MONDO_CACHE"/changed.files") > 2) { 670 670 mr_msg(0, 671 "Type 'less "M INDI_CACHE"/changed.files' to see which files don't match the archives");671 "Type 'less "MONDO_CACHE"/changed.files' to see which files don't match the archives"); 672 672 mr_msg(2, "Calling popup_changelist_from_file()"); 673 popup_changelist_from_file(M INDI_CACHE"/changed.files");673 popup_changelist_from_file(MONDO_CACHE"/changed.files"); 674 674 mr_msg(2, "Returned from popup_changelist_from_file()"); 675 675 }
Note:
See TracChangeset
for help on using the changeset viewer.