Attachment 16713 Details for Bug 30542 – file.diff

[patch] file.diff

file.diff (text/plain), 1.66 KB, created by Tony Finch on 2001-09-13 01:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tony Finch

Created: 2001-09-13 01:10:00 UTC

Size: 1.66 KB

patch

obsolete

>Index: usr.bin/killall/killall.1
>===================================================================
>RCS file: /home/ncvs/src/usr.bin/killall/killall.1,v
>retrieving revision 1.11.2.7
>diff -u -r1.11.2.7 killall.1
>--- usr.bin/killall/killall.1	2001/08/16 13:16:53	1.11.2.7
>+++ usr.bin/killall/killall.1	2001/08/28 22:23:14
>@@ -33,6 +33,7 @@
> .Sh SYNOPSIS
> .Nm
> .Op Fl d | v
>+.Op Fl q
> .Op Fl h | ?\&
> .Op Fl help
> .Op Fl l
>@@ -59,6 +60,8 @@
> .Pp
> The options are as follows:
> .Bl -tag -width 10n -offset indent
>+.It Fl q
>+Do not print an error message if no matching processes are found.
> .It Fl d | v
> Be more verbose about what will be done.  For a single
> .Fl d
>Index: usr.bin/killall/killall.c
>===================================================================
>RCS file: /home/ncvs/src/usr.bin/killall/killall.c,v
>retrieving revision 1.5.2.4
>diff -u -r1.5.2.4 killall.c
>--- usr.bin/killall/killall.c	2001/05/19 19:22:49	1.5.2.4
>+++ usr.bin/killall/killall.c	2001/08/28 22:23:14
>@@ -62,8 +62,7 @@
> 	static char buf[80];
> 	char *s;
> 
>-	strncpy(buf, str, sizeof(buf));
>-	buf[sizeof(buf) - 1] = '\0';
>+	strlcpy(buf, str, sizeof(buf));
> 	for (s = buf; *s; s++)
> 		*s = toupper(*s);
> 	return buf;
>@@ -109,6 +108,7 @@
> 	char		*user = NULL;
> 	char		*tty = NULL;
> 	char		*cmd = NULL;
>+	int		qflag = 0;
> 	int		vflag = 0;
> 	int		sflag = 0;
> 	int		dflag = 0;
>@@ -168,6 +168,9 @@
> 			case 'v':
> 				vflag++;
> 				break;
>+			case 'q':
>+				qflag++;
>+				break;
> 			case 's':
> 				sflag++;
> 				break;
>@@ -362,7 +365,7 @@
> 			}
> 		}
> 	}
>-	if (killed == 0) {
>+	if (!qflag && killed == 0) {
> 		fprintf(stderr, "No matching processes %swere found\n",
> 		    getuid() != 0 ? "belonging to you " : "");
> 		errors = 1;

Actions: View | Diff

Attachments on bug 30542: 16713