Ignore:
Timestamp:
Sep 14, 2006, 1:05:18 AM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r781:793 $SVN_M/branches/stable

File:
1 edited

Legend:

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

    r688 r794  
    5555/* @} - end of globalGroup */
    5656
     57extern char *ps_options;
    5758
    5859/**
     
    129130    }
    130131    sleep(2);
    131     asprintf(&tmp, "ps wwax | grep \"%s\"", g_sz_call_to_buffer);
     132    asprintf(&tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
    132133    if (run_program_and_log_output(tmp, 2)) {
    133134        log_msg(2, "Warning - I think I failed to open tape, actually.");
     
    135136    paranoid_free(tmp);
    136137    g_tape_buffer_size_MB = bufsize;
    137     /* BERLIOS: usless ?
    138        strcmp(tmp, g_sz_call_to_buffer);
    139        tmp[30] = '\0';
    140      */
    141     asprintf(&tmp, "ps wwax | grep buffer | grep -v grep");
     138    asprintf(&tmp, "ps %s | grep buffer | grep -v grep", ps_options);
    142139    if (run_program_and_log_output(tmp, 1)) {
    143140        fres = NULL;
     
    161158    sync();
    162159    asprintf(&command,
    163             "ps wwax | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'",
     160            "ps | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
    164161            g_sz_call_to_buffer);
    165162    paranoid_free(g_sz_call_to_buffer);
Note: See TracChangeset for help on using the changeset viewer.