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-filelist.c

    r914 r956  
    6262extern int g_noof_rows;
    6363
     64extern char *g_getfacl;
     65extern char *g_getfattr;
    6466
    6567/**
     
    9597    log_to_screen(_("Dividing filelist into sets. Please wait."));
    9698    i = 0;
    97 /*
    98   if (find_home_of_exe("getfattr"))
    99     { i++; log_to_screen ("NEW! Recording extended attributes."); }
    100   if (find_home_of_exe("getfacl"))
    101     { i++; log_to_screen ("NEW! Recording ACL information."); }
    102   if (i)
    103     { i=0; log_to_screen ("This will take more time. Please be patient."); }
    104 */
    10599    mr_asprintf(&filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
    106100    if (!does_file_exist(filelist)) {
     
    475469    int retval = 0;
    476470
    477     mr_asprintf(&command, "touch %s", facl_fname);
    478     run_program_and_log_output(command, 8);
    479     mr_free(command);
    480 
    481     tmp = find_home_of_exe("getfacl");
    482     if (tmp) {
    483 //      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
     471    if (g_getfacl != NULL) {
     472        mr_asprintf(&command, "touch %s", facl_fname);
     473        run_program_and_log_output(command, 8);
     474        mr_free(command);
     475
    484476        mr_asprintf(&command,
    485477                 "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s",
     
    489481        mr_free(command);
    490482    }
    491     mr_free(tmp);
    492483    return (retval);
    493484}
     
    500491    int retval = 0;
    501492
    502     mr_asprintf(&command, "touch %s", fattr_fname);
    503     run_program_and_log_output(command, 8);
    504     mr_free(command);
    505 
    506     tmp = find_home_of_exe("getfattr");
    507     if (tmp) {
    508 //      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
     493    if (g_getfattr != NULL) {
     494        mr_asprintf(&command, "touch %s", fattr_fname);
     495        run_program_and_log_output(command, 8);
     496        mr_free(command);
     497
    509498        retval =
    510499            gen_aux_list(filelist, "getfattr --en=hex -P -d \"%s\"",
    511500                         fattr_fname);
    512501    }
    513     mr_free(tmp);
    514502    return (retval);
    515503}
Note: See TracChangeset for help on using the changeset viewer.