system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-02 22:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a -I flag which requests confirmation before action, like what is done

Browse source 
in pkill(1).

MFC after:	2 weeks
This commit is contained in:
Xin LI 2012-06-27 00:50:25 +00:00
parent 96e55cc72d
commit 8d5ec3937c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=237618
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
usr.bin/killall/killall.1
View file

@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd December 25, 2009
.Dd June 27, 2012
.Dt KILLALL 1
.Os
.Sh NAME
@ -34,6 +34,7 @@
.Nm
.Op Fl delmsvz
.Op Fl help
.Op Fl I
.Op Fl j Ar jail
.Op Fl u Ar user
.Op Fl t Ar tty
@ -71,6 +72,9 @@ processes specified with the
option.
.It Fl help
Give a help on the command usage and exit.
.It Fl I
Request confirmation before attempting to signal each
process.
.It Fl l
List the names of the available signals and exit, like in
.Xr kill 1 .

19
usr.bin/killall/killall.c
View file

@ -53,7 +53,7 @@ static void __dead2
usage(void)
{
fprintf(stderr, "usage: killall [-delmsvz] [-help] [-j jail]\n");
fprintf(stderr, "usage: killall [-delmsvz] [-help] [-I] [-j jail]\n");
fprintf(stderr,
" [-u user] [-t tty] [-c cmd] [-SIGNAL] [cmd]...\n");
fprintf(stderr, "At least one option or argument to specify processes must be given.\n");
@ -95,8 +95,9 @@ main(int ac, char **av)
struct passwd *pw;
regex_t rgx;
regmatch_t pmatch;
int i, j;
int i, j, ch;
char buf[256];
char first;
char *user = NULL;
char *tty = NULL;
char *cmd = NULL;
@ -104,6 +105,7 @@ main(int ac, char **av)
int sflag = 0;
int dflag = 0;
int eflag = 0;
int Iflag = 0;
int jflag = 0;
int mflag = 0;
int zflag = 0;
@ -141,6 +143,9 @@ main(int ac, char **av)
if (**av == '-') {
++*av;
switch (**av) {
case 'I':
Iflag = 1;
break;
case 'j':
++*av;
if (**av == '\0') {
@ -382,6 +387,16 @@ main(int ac, char **av)
if (matched)
break;
}
if (matched != 0 && Iflag) {
printf("Send signal %d to %s (pid %d uid %d)? ",
sig, thiscmd, thispid, thisuid);
fflush(stdout);
first = ch = getchar();
while (ch != '\n' && ch != EOF)
ch = getchar();
if (first != 'y' && first != 'Y')
matched = 0;
}
if (matched == 0)
continue;
if (dflag)