Changeset 797 for branches


Ignore:
Timestamp:
Sep 16, 2006, 5:36:20 AM (13 years ago)
Author:
andree
Message:

newt-specific.c:
Fixed compile error by removing superfluous quotes in
kill_anything_like_this().

libmondo-fork.c:
Fixed compiler warning on 64bit platforms regarding the output of the
result of ftello() by casting it to long long (and it's actually
signed).

libmondo-fifo.c:
Added %s for ps_options in kill_buffer(). Also fixes compiler warning.

Location:
branches/stable/mondo/mondo/common
Files:
3 edited

Legend:

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

    r792 r797  
    243243    paranoid_system("sync");
    244244    sprintf(command,
    245             "ps | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
     245            "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
    246246            g_sz_call_to_buffer);
    247247    log_msg(2, "kill_buffer() --- command = %s", command);
  • branches/stable/mondo/mondo/common/libmondo-fork.c

    r684 r797  
    616616//      if (bytes_read_in!=128+64) { fatal_error("Can't read the terminating block"); }
    617617                fwrite(tmp, 1, bytes_read_in, ftmp);
    618                 sprintf(tmp, "I am here - %llu", ftello(fin));
     618                sprintf(tmp, "I am here - %lld", (long long)ftello(fin));
    619619//    log_msg(0, tmp);
    620620                fread(tmp, 1, 512, fin);
  • branches/stable/mondo/mondo/common/newt-specific.c

    r792 r797  
    348348char *tmp = NULL;
    349349
    350 asprintf(&tmp,"kill `ps %s | grep \"" %s "\" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
     350asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
    351351run_program_and_log_output(tmp, TRUE);
    352352paranoid_free(tmp);
Note: See TracChangeset for help on using the changeset viewer.