Changeset 1903 in MondoRescue for branches/stable/mondo/src/common/newt-specific.c

Timestamp:

Apr 10, 2008, 1:13:58 AM (16 years ago)

Author:

Bruno Cornec

Message:

merge -r 1842:1889 2.2.5

File:

• branches/stable/mondo/src/common/newt-specific.c (modified) (1 diff)

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

@@ -259 +259 @@
     kill_anything_like_this(char *str) {
 
-    char *tmp = NULL;
-
-    mr_asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"`", ps_options, str, ps_proc_id);
+char *tmp = NULL;
+char *tmp1 = NULL;
+
+    mr_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) {
+        mr_asprintf(&tmp1,"kill `%s`", tmp);
+        run_program_and_log_output(tmp1, TRUE);
+        paranoid_free(tmp1);
+    }
     mr_free(tmp);
 }