Ignore:
Timestamp:
Sep 29, 2013, 9:31:34 AM (7 years ago)
Author:
Bruno Cornec
Message:
  • Finish with backports from 3.1 for now. Still some work to do, but we will now make that version compile and work again and serve as a base

so the gettext patch can be added

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.1/mondo/src/mondorestore/mondo-rstr-compare.c

    r3161 r3193  
    7676    paranoid_fclose(fin);
    7777
     78
     79    mr_asprintf(bigfile_fname, "%s", biggiestruct.filename);
     80    log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
    7881    mr_asprintf(checksum, "%s", biggiestruct.checksum);
    79     mr_asprintf(bigfile_fname, "%s", biggiestruct.filename);
    80 
    81     log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
    8282    log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
    8383
     
    8585        mr_asprintf(tmp, "Comparing %s", bigfile_fname);
    8686        newtDrawRootText(0, 22, tmp);
    87         paranoid_free(tmp);
     87        mr_free(tmp);
    8888        newtRefresh();
    8989    }
    90     if (!checksum[0]) {
     90    if (checksum == NULL]) {
    9191        log_msg(2, "Warning - %s has no checksum", bigfile_fname);
    9292    }
    9393    if (!strncmp(bigfile_fname, "/dev/", 5)) {
    9494        log_msg(2, "IGNORING %s as begining with /dev", bigfile_fname);
     95        mr_free(checksum);
    9596        mr_free(bigfile_fname);
    9697        return (1);
     
    104105    mr_asprintf(tmp, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
    105106    paranoid_system(tmp);
    106     paranoid_free(tmp);
     107    mr_free(tmp);
    107108
    108109    if (i) {
    109110        log_OS_error("Warning - command failed");
     111        mr_free(checksum);
     112        mr_free(bigfile_fname);
    110113        return (1);
    111114    } else {
    112115        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);
    115118            mr_free(bigfile_fname);
    116119            return (1);
     
    135138
    136139    log_msg(1, tmp);
    137     paranoid_free(tmp);
     140    mr_free(tmp);
    138141
    139142    if (retval) {
     
    270273        } else {
    271274            // afio
     275            mr_asprintf(tmp, "%s", compressor_exe);
    272276            mr_free(compressor_exe);
    273             mr_asprintf(tmp, "%s", compressor_exe);
    274277            mr_asprintf(compressor_exe, "-P %s -Z", tmp);
    275278            mr_free(tmp);
     
    291294    }
    292295    mr_free(compressor_exe);
    293     paranoid_free(archiver_exe);
     296    mr_free(archiver_exe);
    294297
    295298#undef BUFSIZE
     
    474477    noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt");
    475478    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);
    479480
    480481        mr_asprintf(command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
     
    525526
    526527  /**************************************************************************
    527    * also deletes tmp/filelist.full & biggielist.txt _and_ tries to     *
     528   * also deletes tmp/filelist.full & tmp/biggielist.txt _and_ tries to     *
    528529   * restore them from start of tape, if available                          *
    529530   **************************************************************************/
     
    653654    }
    654655
    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");
    657657
    658658    mr_free(bkpinfo->media_device);
     
    711711    }
    712712
    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");
    715714    res = verify_tape_backups();
    716715    if (chdir(dir)) {
Note: See TracChangeset for help on using the changeset viewer.