Ignore:
Timestamp:
Nov 21, 2006, 1:42:46 AM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r938:954 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/src/common/libmondo-verify.c

    r914 r956  
    3232int g_last_afioball_number = -1;
    3333
     34extern char *g_getfacl;
     35extern char *g_getfattr;
    3436
    3537/**
     
    703705    assert(bkpinfo != NULL);
    704706
    705     mr_asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
    706              bkpinfo->tmpdir);
    707     mr_asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
    708              bkpinfo->tmpdir);
     707    if (g_getfattr) {
     708        mr_asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
     709            bkpinfo->tmpdir);
     710    }
     711    if (g_getfacl) {
     712        mr_asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
     713            bkpinfo->tmpdir);
     714    }
    709715    log_to_screen(_("Verifying regular archives on tape"));
    710716    total_afioballs = get_last_filelist_number(bkpinfo) + 1;
     
    733739         ctrl_chr != BLK_STOP_AFIOBALLS;
    734740         res = read_header_block_from_stream(&size, fname, &ctrl_chr)) {
    735         mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
    736                  bkpinfo->tmpdir, current_afioball_number);
    737         mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
    738                  bkpinfo->tmpdir, current_afioball_number);
     741        if (g_getfattr) {
     742            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
     743                bkpinfo->tmpdir, current_afioball_number);
     744        }
     745        if (g_getfacl) {
     746            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
     747                bkpinfo->tmpdir, current_afioball_number);
     748        }
    739749        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    740750            iamhere("Reading EXAT files from tape");
     
    817827    assert(bkpinfo != NULL);
    818828
    819     mr_asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
    820              bkpinfo->tmpdir);
    821     mr_asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
    822              bkpinfo->tmpdir);
     829    if (g_getfattr) {
     830        mr_asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
     831            bkpinfo->tmpdir);
     832    }
     833    if (g_getfacl) {
     834        mr_asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
     835            bkpinfo->tmpdir);
     836    }
    823837    mr_asprintf(&comment, "Verifying all bigfiles.");
    824838    log_to_screen(comment);
Note: See TracChangeset for help on using the changeset viewer.