Ignore:
Timestamp:
Jul 13, 2009, 2:34:39 AM (11 years ago)
Author:
Bruno Cornec
Message:

r3263@localhost: bruno | 2009-07-13 02:25:52 +0200

  • Fix printing bug in text mode during afio backup
  • Fix a wrong tmp usage after mr_asprintf migration in libmondo-archive.c
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mondo/src/common/libmondo-archive.c

    r2267 r2277  
    10341034    bkpinfo_bis = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);
    10351035
    1036     sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
    1037             bkpinfo->tmpdir, 0L);
     1036    sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, 0L);
    10381037    for (archiving_set_no = 0; does_file_exist(archiving_filelist_fname);
    1039          sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
    1040                  bkpinfo->tmpdir, archiving_set_no)) {
     1038         sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no)) {
    10411039        if (g_exiting) {
    10421040            fatal_error("Execution run aborted (pthread)");
    10431041        }
    10441042        if (archiving_set_no >= MAX_NOOF_SETS_HERE) {
    1045             fatal_error
    1046                 ("Maximum number of filesets exceeded. Adjust MAX_NOOF_SETS_HERE, please.");
     1043            fatal_error("Maximum number of filesets exceeded. Adjust MAX_NOOF_SETS_HERE, please.");
    10471044        }
    10481045        if (!semaphore_p()) {
     
    10591056
    10601057        /* backup this set of files */
    1061         sprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
    1062                 bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
    1063         sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
    1064                 bkpinfo->tmpdir, archiving_set_no);
     1058        sprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
     1059        sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
    10651060        if (!does_file_exist(archiving_filelist_fname)) {
    10661061            log_msg(3,
     
    10711066        }
    10721067
    1073         mr_asprintf(&tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir,
    1074                 archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
     1068        mr_asprintf(&tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
    10751069        if (does_file_exist(tmp)) {
    10761070            log_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES,
     
    34273421            mr_asprintf(&tmp1, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
    34283422            mr_free(mds);
    3429             res = ask_me_yes_or_no(tmp);
     3423            res = ask_me_yes_or_no(tmp1);
    34303424            mr_free(tmp1);
    34313425
     
    34653459
    34663460    bkpinfo->verify_data = orig_vfy_flag_val;
     3461    mr_free(tmp);
    34673462    return (0);
    34683463}
Note: See TracChangeset for help on using the changeset viewer.