Changeset 1850 in MondoRescue

Timestamp:

Jan 4, 2008, 6:51:30 PM (16 years ago)

Author:

Bruno Cornec

Message:

before killing a process test that there is a result to ps (avoid whom to kill messages)

Location:

branches/2.2.5/mondo/src

Files:

• common/newt-specific.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

branches/2.2.5/mondo/src/common/newt-specific.c

@@ -350 +350 @@
 
 char *tmp = NULL;
-
-    asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"`", ps_options, str , ps_proc_id);
+char *tmp1 = NULL;
+
+    asprintf(&tmp,"ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"", ps_options, str , ps_proc_id);
     run_program_and_log_output(tmp, TRUE);
+    if (strlen(tmp) > 0) {
+        asprintf(&tmp1,"kill %s", tmp);
+        run_program_and_log_output(tmp1, TRUE);
+        paranoid_free(tmp1);
+    }
     paranoid_free(tmp);
 }

branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -169 +169 @@
 char *g_getfacl = NULL;
 
+extern void kill_anything_like_this(char *str);
+
 /**
 * @addtogroup restoreUtilityGroup
@@ -514 +516 @@
 * Kill all Petris processes.
 */
-void kill_petris(void)
-{
-char *command;
-malloc_string(command);
-sprintf(command,
-    "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);
+void kill_petris(void) {
+    kill_anything_like_this("petris")
 }