Attachment #16713 for bug #30542

View | Details | Raw Unified | Return to bug 30542
Collapse All | Expand All

Lines 33-38 Link Here

(-)usr.bin/killall/killall.1 (+3 lines)
33	.Sh SYNOPSIS	33	.Sh SYNOPSIS
34	.Nm	34	.Nm
35	.Op Fl d \| v	35	.Op Fl d \| v
		36	.Op Fl q
36	.Op Fl h \| ?\&	37	.Op Fl h \| ?\&
37	.Op Fl help	38	.Op Fl help
38	.Op Fl l	39	.Op Fl l
Lines 59-64 Link Here
59	.Pp	60	.Pp
60	The options are as follows:	61	The options are as follows:
61	.Bl -tag -width 10n -offset indent	62	.Bl -tag -width 10n -offset indent
		63	.It Fl q
		64	Do not print an error message if no matching processes are found.
62	.It Fl d \| v	65	.It Fl d \| v
63	Be more verbose about what will be done. For a single	66	Be more verbose about what will be done. For a single
64	.Fl d	67	.Fl d

Lines 62-69 Link Here

(-)usr.bin/killall/killall.c (-3 / +6 lines)
62	static char buf[80];	62	static char buf[80];
63	char *s;	63	char *s;
64		64
65	strncpy(buf, str, sizeof(buf));	65	strlcpy(buf, str, sizeof(buf));
66	buf[sizeof(buf) - 1] = '\0';
67	for (s = buf; *s; s++)	66	for (s = buf; *s; s++)
68	s = toupper(s);	67	s = toupper(s);
69	return buf;	68	return buf;
Lines 109-114 Link Here
109	char *user = NULL;	108	char *user = NULL;
110	char *tty = NULL;	109	char *tty = NULL;
111	char *cmd = NULL;	110	char *cmd = NULL;
		111	int qflag = 0;
112	int vflag = 0;	112	int vflag = 0;
113	int sflag = 0;	113	int sflag = 0;
114	int dflag = 0;	114	int dflag = 0;
Lines 168-173 Link Here
168	case 'v':	168	case 'v':
169	vflag++;	169	vflag++;
170	break;	170	break;
		171	case 'q':
		172	qflag++;
		173	break;
171	case 's':	174	case 's':
172	sflag++;	175	sflag++;
173	break;	176	break;
Lines 362-368 Link Here
362	}	365	}
363	}	366	}
364	}	367	}
365	if (killed == 0) {	368	if (!qflag && killed == 0) {
366	fprintf(stderr, "No matching processes %swere found\n",	369	fprintf(stderr, "No matching processes %swere found\n",
367	getuid() != 0 ? "belonging to you " : "");	370	getuid() != 0 ? "belonging to you " : "");
368	errors = 1;	371	errors = 1;

Return to bug 30542