Changeset 794 in MondoRescue for trunk/mondo/mondo/common/libmondo-fifo.c

Timestamp:

Sep 14, 2006, 1:05:18 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r781:793 $SVN_M/branches/stable

File:

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

trunk/mondo/mondo/common/libmondo-fifo.c

@@ -55 +55 @@
 /* @} - end of globalGroup */
 
+extern char *ps_options;
 
 /**
@@ -129 +130 @@
     }
     sleep(2);
-    asprintf(&tmp, "ps wwax | grep \"%s\"", g_sz_call_to_buffer);
+    asprintf(&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.");
@@ -135 +136 @@
     paranoid_free(tmp);
     g_tape_buffer_size_MB = bufsize;
-    /* BERLIOS: usless ?
-       strcmp(tmp, g_sz_call_to_buffer);
-       tmp[30] = '\0';
-     */
-    asprintf(&tmp, "ps wwax | grep buffer | grep -v grep");
+    asprintf(&tmp, "ps %s | grep buffer | grep -v grep", ps_options);
     if (run_program_and_log_output(tmp, 1)) {
         fres = NULL;
@@ -161 +158 @@
     sync();
     asprintf(&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);
     paranoid_free(g_sz_call_to_buffer);