Ignore:
Timestamp:
Jun 19, 2013, 8:34:46 AM (11 years ago)
Author:
Bruno Cornec
Message:
  • First pass on svn merge -r 2935:3146 ../3.0
File:
1 edited

Legend:

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

    r2937 r3147  
    412412    char *outlog = NULL;
    413413    char *tmp = NULL;
     414    char *p = NULL;
    414415
    415416    /*@ pointers ******************************************************* */
     
    477478        bkpinfo->use_star = TRUE;
    478479        if (strstr(tarball_fname, ".bz2"))
    479             mr_asprintf(command, "star -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s", tarball_fname, (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog, outlog);
     480            mr_asprintf(command, "star -sparse -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s", tarball_fname, (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog, outlog);
    480481    } else {
    481482        bkpinfo->use_star = FALSE;
     
    681682
    682683            mr_asprintf(tmp, "echo \"%s\" >> %s/biggies.changed", biggie_fname, bkpinfo->tmpdir);
    683             system(tmp);
     684            paranoid_system(tmp);
    684685            mr_free(tmp);
    685686        }
     
    738739        log_it("Grabbing the EXAT files");
    739740        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    740             res =
    741                 read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
     741            res = read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
    742742                                          curr_xattr_list_fname,
    743743                                          curr_acl_list_fname);
     
    765765        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    766766            log_it("Reading EXAT files from tape");
    767             res =
    768                 read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
     767            res = read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
    769768                                          curr_xattr_list_fname,
    770769                                          curr_acl_list_fname);
     
    848847        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    849848            log_it("Grabbing the EXAT biggiefiles");
    850             res =
    851                 read_EXAT_files_from_tape(&size, orig_fname,
     849            res = read_EXAT_files_from_tape(&size, orig_fname,
    852850                                          &ctrl_chr, curr_xattr_list_fname,
    853851                                          curr_acl_list_fname);
Note: See TracChangeset for help on using the changeset viewer.