===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pkill/pkill.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/pkill/pkill.c	2005/03/27 14:50:09	1.10
--- src/usr.bin/pkill/pkill.c	2005/03/27 20:56:47	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: pkill.c,v 1.10 2005/03/27 14:50:09 robert Exp $	*/
  /*	$NetBSD: pkill.c,v 1.5 2002/10/27 11:49:34 kleink Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: pkill.c,v 1.11 2005/03/27 20:56:47 robert Exp $	*/
  /*	$NetBSD: pkill.c,v 1.5 2002/10/27 11:49:34 kleink Exp $	*/
  
  /*-
***************
*** 38,44 ****
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: pkill.c,v 1.10 2005/03/27 14:50:09 robert Exp $";
  #endif /* !lint */
  
  #include <sys/types.h>
--- 38,44 ----
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: pkill.c,v 1.11 2005/03/27 20:56:47 robert Exp $";
  #endif /* !lint */
  
  #include <sys/types.h>
***************
*** 94,100 ****
  int	longfmt;
  int	matchargs;
  int	fullmatch;
- int	cflags = REG_EXTENDED;
  kvm_t	*kd;
  pid_t	mypid;
  
--- 94,99 ----
***************
*** 159,165 ****
  
  	criteria = 0;
  
! 	while ((ch = getopt(argc, argv, "G:P:U:d:fg:ilns:t:u:vx")) != -1)
  		switch (ch) {
  		case 'G':
  			makelist(&rgidlist, LT_GROUP, optarg);
--- 158,164 ----
  
  	criteria = 0;
  
! 	while ((ch = getopt(argc, argv, "G:P:U:d:fg:lns:t:u:vx")) != -1)
  		switch (ch) {
  		case 'G':
  			makelist(&rgidlist, LT_GROUP, optarg);
***************
*** 185,193 ****
  			makelist(&pgrplist, LT_PGRP, optarg);
  			criteria = 1;
  			break;
- 		case 'i':
- 			cflags |= REG_ICASE;
- 			break;
  		case 'l':
  			if (!pgrep)
  				usage();
--- 184,189 ----
***************
*** 252,258 ****
  	 * Refine the selection.
  	 */
  	for (; *argv != NULL; argv++) {
! 		if ((rv = regcomp(&reg, *argv, cflags)) != 0) {
  			regerror(rv, &reg, buf, sizeof(buf));
  			errx(STATUS_BADUSAGE, "bad expression: %s", buf);
  		}
--- 248,254 ----
  	 * Refine the selection.
  	 */
  	for (; *argv != NULL; argv++) {
! 		if ((rv = regcomp(&reg, *argv, REG_EXTENDED)) != 0) {
  			regerror(rv, &reg, buf, sizeof(buf));
  			errx(STATUS_BADUSAGE, "bad expression: %s", buf);
  		}
***************
*** 419,427 ****
  	const char *ustr;
  
  	if (pgrep)
! 		ustr = "[-filnvx] [-d delim]";
  	else
! 		ustr = "[-signal] [-finvx]";
  
  	fprintf(stderr, "usage: %s %s [-G gid] [-P ppid] [-U uid] [-g pgrp] "
  	    "[-s sid] [-t tty] [-u euid] pattern ...\n", __progname, ustr);
--- 415,423 ----
  	const char *ustr;
  
  	if (pgrep)
! 		ustr = "[-flnvx] [-d delim]";
  	else
! 		ustr = "[-signal] [-fnvx]";
  
  	fprintf(stderr, "usage: %s %s [-G gid] [-P ppid] [-U uid] [-g pgrp] "
  	    "[-s sid] [-t tty] [-u euid] pattern ...\n", __progname, ustr);