Bash is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 1, or (at your option) any later
+Software Foundation; either version 2, or (at your option) any later
version.
Bash is distributed in the hope that it will be useful, but WITHOUT ANY
You should have received a copy of the GNU General Public License along
with Bash; see the file COPYING. If not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA.
$PRODUCES kill.c
$BUILTIN kill
$FUNCTION kill_builtin
$DEPENDS_ON JOB_CONTROL
-$SHORT_DOC kill [-s sigspec | -sigspec] [pid | job]... | -l [signum]
+$SHORT_DOC kill [-s sigspec | -n signum | -sigspec] [pid | job]... or kill -l [sigspec]
Send the processes named by PID (or JOB) the signal SIGSPEC. If
SIGSPEC is not present, then SIGTERM is assumed. An argument of `-l'
lists the signal names; if arguments follow `-l' they are assumed to
you can create, you don't have to start a process to kill another one.
$END
-/* Not all systems declare ERRNO in errno.h... and some systems #define it! */
-#if !defined (errno)
-extern int errno;
-#endif /* !errno */
+#include <config.h>
+
+#include <stdio.h>
+#include <errno.h>
+#if defined (HAVE_UNISTD_H)
+# ifdef _MINIX
+# include <sys/types.h>
+# endif
+# include <unistd.h>
+#endif
+
+#include "../bashansi.h"
-#include "../bashtypes.h"
#include "../shell.h"
#include "../trap.h"
#include "../jobs.h"
#include "common.h"
-#include <errno.h>
+
+/* Not all systems declare ERRNO in errno.h... and some systems #define it! */
+#if !defined (errno)
+extern int errno;
+#endif /* !errno */
#if defined (JOB_CONTROL)
-extern int interactive;
extern int posixly_correct;
#if !defined (CONTINUE_AFTER_KILL_ERROR)
kill_builtin (list)
WORD_LIST *list;
{
- int signal = SIGTERM;
- int any_succeeded = 0, listing = 0, saw_signal = 0;
- char *sigspec = "TERM", *word;
+ int signal, any_succeeded, listing, saw_signal;
+ char *sigspec, *word;
pid_t pid;
+ long pid_value;
+
+ if (list == 0)
+ {
+ builtin_usage ();
+ return (EXECUTION_FAILURE);
+ }
- if (!list)
- return (EXECUTION_SUCCESS);
+ any_succeeded = listing = saw_signal = 0;
+ signal = SIGTERM;
+ sigspec = "TERM";
/* Process options. */
while (list)
listing++;
list = list->next;
}
- else if (ISOPTION (word, 's'))
+ else if (ISOPTION (word, 's') || ISOPTION (word, 'n'))
{
list = list->next;
if (list)
{
sigspec = list->word->word;
- if (sigspec[0] == '0' && !sigspec[1])
+ if (sigspec[0] == '0' && sigspec[1] == '\0')
signal = 0;
else
signal = decode_signal (sigspec);
}
else
{
- builtin_error ("-s requires an argument");
+ builtin_error ("%s requires an argument", word);
return (EXECUTION_FAILURE);
}
}
list = list->next;
break;
}
+ else if (ISOPTION (word, '?'))
+ {
+ builtin_usage ();
+ return (EXECUTION_SUCCESS);
+ }
/* If this is a signal specification then process it. We only process
the first one seen; other arguments may signify process groups (e.g,
-num == process group num). */
}
if (listing)
- {
- if (!list)
- {
- register int i;
- register int column = 0;
- char *name;
-
- for (i = 1; i < NSIG; i++)
- {
- name = signal_name (i);
- if (STREQN (name, "SIGJUNK", 7) || STREQN (name, "Unknown", 7))
- continue;
-
- if (posixly_correct)
- printf ("%s%s", name, (i == NSIG - 1) ? "" : " ");
- else
- {
- printf ("%2d) %s", i, name);
-
- if (++column < 4)
- printf ("\t");
- else
- {
- printf ("\n");
- column = 0;
- }
- }
- }
-
- if (posixly_correct || column != 0)
- printf ("\n");
- }
- else
- {
- /* List individual signal names. */
- while (list)
- {
- int signum;
- char *name;
-
- if ((sscanf (list->word->word, "%d", &signum) != 1) ||
- (signum <= 0))
- {
- list_error:
- builtin_error ("bad signal number: %s", list->word->word);
- list = list->next;
- continue;
- }
-
- /* This is specified by Posix.2 so that exit statuses can be
- mapped into signal numbers. */
- if (signum > 128)
- signum -= 128;
-
- if (signum >= NSIG)
- goto list_error;
-
- name = signal_name (signum);
- if (STREQN (name, "SIGJUNK", 7) || STREQN (name, "Unknown", 7))
- {
- list = list->next;
- continue;
- }
- printf ("%s\n", name);
- list = list->next;
- }
- }
- return (EXECUTION_SUCCESS);
- }
+ return (display_signal_list (list, 0));
/* OK, we are killing processes. */
if (signal == NO_SIG)
return (EXECUTION_FAILURE);
}
+ if (list == 0)
+ {
+ builtin_usage ();
+ return (EXECUTION_FAILURE);
+ }
+
while (list)
{
word = list->word->word;
if (*word == '-')
word++;
- if (all_digits (word))
+ if (*word && legal_number (word, &pid_value) && (pid_value == (pid_t)pid_value))
{
/* Use the entire argument in case of minus sign presence. */
- pid = (pid_t) atoi (list->word->word);
+ pid = (pid_t) pid_value;
if (kill_pid (pid, signal, 0) < 0)
goto signal_error;
else
any_succeeded++;
}
- else if (*list->word->word != '%')
+ else if (*list->word->word && *list->word->word != '%')
{
- builtin_error ("No such pid %s", list->word->word);
+ builtin_error ("%s: no such pid", list->word->word);
CONTINUE_OR_FAIL;
}
-#if 1
- else if (interactive)
+ else if (*word && (interactive || job_control))
/* Posix.2 says you can kill without job control active (4.32.4) */
-#else
- else if (job_control) /* can't kill jobs if not using job control */
-#endif
{ /* Must be a job spec. Check it out. */
int job;
sigset_t set, oset;
if (job < 0 || job >= job_slots || !jobs[job])
{
if (job != DUP_JOB)
- builtin_error ("No such job %s", list->word->word);
+ builtin_error ("%s: no such job", list->word->word);
UNBLOCK_CHILD (oset);
CONTINUE_OR_FAIL;
}
without job control, then its pgrp == shell_pgrp, so we have
to be careful. We take the pid of the first job in the pipeline
in that case. */
- if (jobs[job]->flags & J_JOBCONTROL)
- pid = jobs[job]->pgrp;
- else
- pid = jobs[job]->pipe->pid;
+ pid = IS_JOBCONTROL (job) ? jobs[job]->pgrp : jobs[job]->pipe->pid;
UNBLOCK_CHILD (oset);
if (kill_pid (pid, signal, 1) < 0)
{
signal_error:
- if (errno == EPERM)
- builtin_error ("(%d) - Not owner", (int)pid);
- else if (errno == ESRCH)
- builtin_error ("(%d) - No such pid", (int)pid);
- else
+ if (errno == EINVAL)
builtin_error ("Invalid signal %d", signal);
+ else
+ builtin_error ("(%ld) - %s", (long)pid, strerror (errno));
CONTINUE_OR_FAIL;
}
else
}
else
{
- builtin_error ("bad process specification `%s'", list->word->word);
+ builtin_error ("`%s': not a pid or valid job spec", list->word->word);
CONTINUE_OR_FAIL;
}
continue_killing:
list = list->next;
}
- if (any_succeeded)
- return (EXECUTION_SUCCESS);
- else
- return (EXECUTION_FAILURE);
+ return (any_succeeded ? EXECUTION_SUCCESS : EXECUTION_FAILURE);
}
#endif /* JOB_CONTROL */
projects / platform / upstream / bash.git / blobdiff