Author: mjg
Date: Sun Jun 30 20:27:31 2013
New Revision: 252428
URL: http://svnweb.freebsd.org/changeset/base/252428
Log:
killall: add -q flag to suppress error message when no processes are matched
Man-page text provided by wblock.
PR: bin/30542
Submitted by: Tony Finch <d...@dotat.at> (original version)
MFC after: 1 week
Modified:
head/usr.bin/killall/killall.1
head/usr.bin/killall/killall.c
Modified: head/usr.bin/killall/killall.1
==============================================================================
--- head/usr.bin/killall/killall.1 Sun Jun 30 19:53:52 2013
(r252427)
+++ head/usr.bin/killall/killall.1 Sun Jun 30 20:27:31 2013
(r252428)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 27, 2012
+.Dd June 30, 2013
.Dt KILLALL 1
.Os
.Sh NAME
@@ -110,6 +110,8 @@ the specified
Limit potentially matching processes to those matching
the specified
.Ar procname .
+.It Fl q
+Suppress error message if no processes are matched.
.It Fl z
Do not skip zombies.
This should not have any effect except to print a few error messages
Modified: head/usr.bin/killall/killall.c
==============================================================================
--- head/usr.bin/killall/killall.c Sun Jun 30 19:53:52 2013
(r252427)
+++ head/usr.bin/killall/killall.c Sun Jun 30 20:27:31 2013
(r252428)
@@ -53,7 +53,7 @@ static void __dead2
usage(void)
{
- fprintf(stderr, "usage: killall [-delmsvz] [-help] [-I] [-j jail]\n");
+ fprintf(stderr, "usage: killall [-delmsqvz] [-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");
@@ -101,6 +101,7 @@ main(int ac, char **av)
char *user = NULL;
char *tty = NULL;
char *cmd = NULL;
+ int qflag = 0;
int vflag = 0;
int sflag = 0;
int dflag = 0;
@@ -191,6 +192,9 @@ main(int ac, char **av)
errx(1, "must specify procname");
cmd = *av;
break;
+ case 'q':
+ qflag++;
+ break;
case 'v':
vflag++;
break;
@@ -417,8 +421,9 @@ main(int ac, char **av)
}
}
if (killed == 0) {
- fprintf(stderr, "No matching processes %swere found\n",
- getuid() != 0 ? "belonging to you " : "");
+ if (!qflag)
+ fprintf(stderr, "No matching processes %swere found\n",
+ getuid() != 0 ? "belonging to you " : "");
errors = 1;
}
exit(errors);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
