Changeset 941


Ignore:
Timestamp:
Nov 18, 2006, 1:12:12 AM (12 years ago)
Author:
bruno
Message:

Fix a bug in libmondo-fifo.c where potentially no buffer content could let mondo running forever in case of an exception

Location:
branches/stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r940 r941  
    102102
    103103FDISKLOG=$MINDI_TMP/parted2fdisk.log
    104 touch $FDISKLOG
    105104
    106105# Purge from potential old run
     
    479478
    480479    # Creates a tar file containing all required files
    481     for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log $FDISKLOG ; do
     480    for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log ; do
    482481        [ -e "$i" ] && cp -f $i $MINDI_TMP
    483482    done
     
    27732772        rm -rf $MINDI_TMP
    27742773        MINDI_TMP=$MONDO_TMP
     2774        FDISKLOG=$MINDI_TMP/parted2fdisk.log
    27752775        CACHE_LOC=$3
    27762776        if [ _"$CACHE_LOC" != _"" ]; then
  • branches/stable/mondo/src/common/libmondo-fifo.c

    r928 r941  
    241241    char *command;
    242242
     243    if (g_sz_call_to_buffer == NULL) {
     244        return;
     245    }
     246    if (strcmp(g_sz_call_to_buffer,"") == 0) {
     247        return;
     248    }
    243249    malloc_string(tmp);
    244250    malloc_string(command);
    245251    paranoid_system("sync");
    246252    sprintf(command,
    247             "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options,
    248             g_sz_call_to_buffer);
     253            "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
    249254    log_msg(2, "kill_buffer() --- command = %s", command);
    250255    strcpy(tmp, call_program_and_get_last_line_of_output(command));
  • branches/stable/mondo/src/common/libmondo-filelist.c

    r912 r941  
    207207    log_to_screen("Dividing filelist into sets. Please wait.");
    208208    i = 0;
    209 /*
    210   if (find_home_of_exe("getfattr"))
    211     { i++; log_to_screen ("NEW! Recording extended attributes."); }
    212   if (find_home_of_exe("getfacl"))
    213     { i++; log_to_screen ("NEW! Recording ACL information."); }
    214   if (i)
    215     { i=0; log_to_screen ("This will take more time. Please be patient."); }
    216 */
    217209    sprintf(filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
    218210    sprintf(cksumlist, "%s/cklist.full", bkpinfo->tmpdir);
Note: See TracChangeset for help on using the changeset viewer.