Changeset 3193 in MondoRescue for branches/3.1/mondo/src/mondorestore/mondo-rstr-compare.c
- Timestamp:
- Sep 29, 2013, 9:31:34 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.1/mondo/src/mondorestore/mondo-rstr-compare.c
r3161 r3193 76 76 paranoid_fclose(fin); 77 77 78 79 mr_asprintf(bigfile_fname, "%s", biggiestruct.filename); 80 log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename); 78 81 mr_asprintf(checksum, "%s", biggiestruct.checksum); 79 mr_asprintf(bigfile_fname, "%s", biggiestruct.filename);80 81 log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);82 82 log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum); 83 83 … … 85 85 mr_asprintf(tmp, "Comparing %s", bigfile_fname); 86 86 newtDrawRootText(0, 22, tmp); 87 paranoid_free(tmp);87 mr_free(tmp); 88 88 newtRefresh(); 89 89 } 90 if ( !checksum[0]) {90 if (checksum == NULL]) { 91 91 log_msg(2, "Warning - %s has no checksum", bigfile_fname); 92 92 } 93 93 if (!strncmp(bigfile_fname, "/dev/", 5)) { 94 94 log_msg(2, "IGNORING %s as begining with /dev", bigfile_fname); 95 mr_free(checksum); 95 96 mr_free(bigfile_fname); 96 97 return (1); … … 104 105 mr_asprintf(tmp, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE); 105 106 paranoid_system(tmp); 106 paranoid_free(tmp);107 mr_free(tmp); 107 108 108 109 if (i) { 109 110 log_OS_error("Warning - command failed"); 111 mr_free(checksum); 112 mr_free(bigfile_fname); 110 113 return (1); 111 114 } else { 112 115 if (!(fin = fopen("/tmp/md5sum.txt", "r"))) { 113 log_msg(2, 114 "Unable to open /tmp/md5sum.txt; can't get live checksum");116 log_msg(2, "Unable to open /tmp/md5sum.txt; can't get live checksum"); 117 mr_free(checksum); 115 118 mr_free(bigfile_fname); 116 119 return (1); … … 135 138 136 139 log_msg(1, tmp); 137 paranoid_free(tmp);140 mr_free(tmp); 138 141 139 142 if (retval) { … … 270 273 } else { 271 274 // afio 275 mr_asprintf(tmp, "%s", compressor_exe); 272 276 mr_free(compressor_exe); 273 mr_asprintf(tmp, "%s", compressor_exe);274 277 mr_asprintf(compressor_exe, "-P %s -Z", tmp); 275 278 mr_free(tmp); … … 291 294 } 292 295 mr_free(compressor_exe); 293 paranoid_free(archiver_exe);296 mr_free(archiver_exe); 294 297 295 298 #undef BUFSIZE … … 474 477 noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt"); 475 478 if (noof_changed_files) { 476 mr_asprintf(tmp, "%ld files do not match the backup ", noof_changed_files); 477 log_to_screen(tmp); 478 mr_free(tmp); 479 log_to_screen("%ld files do not match the backup ", noof_changed_files); 479 480 480 481 mr_asprintf(command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE); … … 525 526 526 527 /************************************************************************** 527 * also deletes tmp/filelist.full & biggielist.txt _and_ tries to *528 * also deletes tmp/filelist.full & tmp/biggielist.txt _and_ tries to * 528 529 * restore them from start of tape, if available * 529 530 **************************************************************************/ … … 653 654 } 654 655 655 mvaddstr_and_log_it(g_currentY, 656 0, "Verifying archives against filesystem"); 656 mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem"); 657 657 658 658 mr_free(bkpinfo->media_device); … … 711 711 } 712 712 713 mvaddstr_and_log_it(g_currentY, 714 0, "Verifying archives against filesystem"); 713 mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem"); 715 714 res = verify_tape_backups(); 716 715 if (chdir(dir)) {
Note:
See TracChangeset
for help on using the changeset viewer.