Changeset 792 in MondoRescue for branches/stable/mondo/mondo/common/libmondo-fifo.c

Timestamp:

Sep 13, 2006, 11:48:01 PM (18 years ago)

Author:

Bruno Cornec

Message:

Fix Bug #24

• Introduce kill_anything_like_this as a function instead of define
• Add an external variable ps_options whose value is empty in restore and auxww in archive

File:

• branches/stable/mondo/mondo/common/libmondo-fifo.c (modified) (4 diffs)

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

@@ -136 +136 @@
 /* @} - end of globalGroup */
 
+extern char *ps_options;
 
 /**
@@ -210 +211 @@
     }
     sleep(2);
-    sprintf(tmp, "ps wwax | grep \"%s\"", g_sz_call_to_buffer);
+    sprintf(tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
     if (run_program_and_log_output(tmp, 2)) {
         log_msg(2, "Warning - I think I failed to open tape, actually.");
@@ -216 +217 @@
     g_tape_buffer_size_MB = bufsize;
     tmp[30] = '\0';
-    sprintf(command, "ps wwax | grep buffer | grep -v grep");
+    sprintf(command, "ps %s | grep buffer | grep -v grep", ps_options);
     if (run_program_and_log_output(command, 1)) {
         fres = NULL;
@@ -242 +243 @@
     paranoid_system("sync");
     sprintf(command,
-            "ps wwax | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'",
+            "ps | 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);