Ticket #1944: 0001-Add-support-to-kill-processes-using-their-names.patch

src/bin/bash/builtins/common.c

@@ -760 +760 @@
           list = list->next;
           continue;
         }
-#if defined (JOB_CONTROL)
+#if defined (JOB_CONTROL) && defined(HAVE_KILL_BUILTIN)
       /* POSIX.2 says that `kill -l signum' prints the signal name without
          the `SIG' prefix. */
       printf ("%s\n", (this_shell_builtin == kill_builtin) ? name + 3 : name);
@@ -771 +771 @@
       else
     {
       dflags = DSIG_NOCASE;
+#if defined(HAVE_KILL_BUILTIN)
       if (posixly_correct == 0 || this_shell_builtin != kill_builtin)
         dflags |= DSIG_SIGPREFIX;
+#endif
       signum = decode_signal (list->word->word, dflags);
       if (signum == NO_SIG)
         {

src/bin/bash/builtins/kill.def

@@ -22 +22 @@
 
 $BUILTIN kill
 $FUNCTION kill_builtin
+$DEPENDS_ON HAVE_KILL_BUILTIN
 $SHORT_DOC kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
 Send a signal to a job.
 

src/bin/coreutils/src/kill.c

@@ -21 +21 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include <signal.h>
+#include <libgen.h>
 
 #if HAVE_SYS_WAIT_H
 # include <sys/wait.h>
@@ -36 +37 @@
 #include "error.h"
 #include "sig2str.h"
 #include "operand2sig.h"
+#include "OS.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "kill"
@@ -85 +87 @@
   else
     {
       printf (_("\
-Usage: %s [-s SIGNAL | -SIGNAL] PID...\n\
+Usage: %s [-s SIGNAL | -SIGNAL] <PID | PROCESS> ...\n\
   or:  %s -l [SIGNAL]...\n\
   or:  %s -t [SIGNAL]...\n\
 "),
@@ -109 +111 @@
 SIGNAL may be a signal name like `HUP', or a signal number like `1',\n\
 or the exit status of a process terminated by a signal.\n\
 PID is an integer; if negative it identifies a process group.\n\
+PROCESS is name of the process to be killed. The signal will be sent \n\
+to all of the processes matching the given PROCESS name.\n\
 "), stdout);
       printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
       emit_ancillary_info ();
@@ -196 +200 @@
 
   return status;
 }
-
 
+
+
+/*
+ * Checks if passed string is a valid number
+ *
+ * Returns:
+ *  true:   on valid number
+ *      The converted number is returned in NUM if it is not NULL
+ *
+ *  false:  on invalid number
+ *  
+ */
+bool is_number(const char *str, intmax_t *num)
+{
+    char     *e;
+    intmax_t n;
+
+    if (!str)
+        return 0;
+
+    errno = 0;
+    n     = strtoimax(str, &e, 10);
+    if (errno == ERANGE || str == e) {
+        /* not a valid number */
+        return false;
+    }
+
+    /* skip all whitespace if there are any */
+    while (*e == ' ' || *e == '\t')
+        e++;
+
+    if (*e == '\0') {
+        if (num)
+            *num = n;
+        return true;
+    }
+    return false;
+}
+
+
+/*
+ * kill the processes if they match given name
+ *
+ * Returns EXIT_SUCCESS signal was successfully sent to all matched processes,
+ * otherwise EXIT_FAILURE is returned.
+ */
+int kill_by_name(int signum, const char *name)
+{
+    team_info tm;
+    uint32    tc     = 0;
+    int       status = EXIT_SUCCESS;
+
+    while (get_next_team_info(&tc, &tm) >= B_OK) {
+        char *p, *q;
+        int  l;
+
+        q = tm.args;
+        p = strchr(q, ' ');
+        if (p) {
+            /* remove process argument */
+            *p = 0;
+        }
+
+        /* skip the path if any */
+        p = strdup(q);
+        if (!p) {
+            error (0, errno, "%s", name);
+            status = EXIT_FAILURE;
+        }
+
+        q = basename(p);
+
+        if (!strncmp(name, q, strlen(q))) {
+            /* name matched */
+            pid_t pid = tm.team;
+            if (kill(pid, signum) != 0) {
+                error (0, errno, "%s", name);
+                free(p);
+                status = EXIT_FAILURE;
+            }
+        }
+
+        free(p);
+    }
+    return status;
+}
+
+
 /* Send signal SIGNUM to all the processes or process groups specified
    by ARGV.  Return a suitable exit status.  */
 
 static int
 send_signals (int signum, char *const *argv)
 {
-  int status = EXIT_SUCCESS;
-  char const *arg = *argv;
+    int status = EXIT_SUCCESS;
+    char const *arg = *argv;
+    pid_t pid;
 
-  do
-    {
-      char *endp;
-      intmax_t n = (errno = 0, strtoimax (arg, &endp, 10));
-      pid_t pid = n;
-
-      if (errno == ERANGE || pid != n || arg == endp || *endp)
-        {
-          error (0, 0, _("%s: invalid process id"), arg);
-          status = EXIT_FAILURE;
-        }
-      else if (kill (pid, signum) != 0)
-        {
-          error (0, errno, "%s", arg);
-          status = EXIT_FAILURE;
-        }
-    }
-  while ((arg = *++argv));
+    do {
+        bool  is_pid = is_number(arg, (intmax_t *) &pid);
+        if (is_pid) {
+            if (kill(pid, signum) != 0) {
+                error (0, errno, "%s", arg);
+                status = EXIT_FAILURE;
+            }
+            continue;
+        }
 
-  return status;
+        /* not a valid pid, kill by process name */
+        if (kill_by_name(signum, arg) != EXIT_SUCCESS)
+            status = EXIT_FAILURE;
+
+    } while ((arg = *argv++));
+
+    return status;
 }
-
 
+
+
 int