Changeset 797 in MondoRescue for branches

Timestamp:

Sep 16, 2006, 5:36:20 AM (18 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:

• libmondo-fifo.c (modified) (1 diff)
• libmondo-fork.c (modified) (1 diff)
• newt-specific.c (modified) (1 diff)

branches/stable/mondo/mondo/common/libmondo-fifo.c

@@ -243 +243 @@
     paranoid_system("sync");
     sprintf(command,
-            "ps | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
+            "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
             g_sz_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);

branches/stable/mondo/mondo/common/libmondo-fork.c

@@ -616 +616 @@
 //      if (bytes_read_in!=128+64) { fatal_error("Can't read the terminating block"); }
                 fwrite(tmp, 1, bytes_read_in, ftmp);
-                sprintf(tmp, "I am here - %llu", ftello(fin));
+                sprintf(tmp, "I am here - %lld", (long long)ftello(fin));
 //    log_msg(0, tmp);
                 fread(tmp, 1, 512, fin);

branches/stable/mondo/mondo/common/newt-specific.c

@@ -348 +348 @@
 char *tmp = NULL;
 
-asprintf(&tmp,"kill `ps %s | grep \"" %s "\" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
+asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
 run_program_and_log_output(tmp, TRUE);
 paranoid_free(tmp);