Changeset 792 in MondoRescue

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

Location:

branches/stable/mondo/mondo

Files:

• common/libmondo-fifo.c (modified) (4 diffs)
• common/my-stuff.h (modified) (1 diff)
• common/newt-specific.c (modified) (2 diffs)
• mondoarchive/main.c (modified) (1 diff)
• mondorestore/mondo-restore.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (2 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);

branches/stable/mondo/mondo/common/my-stuff.h

@@ -439 +439 @@
  */
 #define MALLOC_CHECK_ 1
-
-/**
- * Kill any process containing the string @p x surrounded by spaces in its commandline.
- */
-#define kill_anything_like_this(x) {run_program_and_log_output("kill `ps wax | grep \"" x "\" | awk '{print $1;}' | grep -vx \"\\?\"`", TRUE);}
 
 /**

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

@@ -128 +128 @@
     extern char *g_boot_mountpt;
     extern char *g_mondo_home;
+    extern char *ps_options;
 
     extern void set_signals(int);
@@ -340 +341 @@
     }
 
-
+/**
+ * Kill any process containing the string @p str surrounded by spaces in its commandline.
+ */
+void kill_anything_like_this(char *str) {
+
+char *tmp = NULL;
+
+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);
+}
 
 

branches/stable/mondo/mondo/mondoarchive/main.c

@@ -140 +140 @@
 bool g_skip_floppies;
 long diffs;
+char *ps_options = "auxww";
 
 extern t_bkptype g_backup_media_type;

branches/stable/mondo/mondo/mondorestore/mondo-restore.c

@@ -488 +488 @@
  */
 char *g_mondo_home;
+
+char *ps_options = "";
 
 /* @} - end of "Restore-Time Globals" in globalGroup */

branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -513 +513 @@
     malloc_string(command);
     sprintf(command,
-            "kill `ps wax 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
+            "kill `ps 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
     paranoid_system(command);
     paranoid_free(command);
@@ -2179 +2179 @@
          &&
          run_program_and_log_output
-         ("ps wax | grep buffer | grep -v \"grep buffer\"", TRUE) == 0;
+         ("ps | grep buffer | grep -v \"grep buffer\"", TRUE) == 0;
          i++) {
         sleep(1);