===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pkill/pkill.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/pkill/pkill.c	2012/03/01 13:04:29	1.24
--- src/usr.bin/pkill/pkill.c	2012/03/13 09:44:49	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: pkill.c,v 1.24 2012/03/01 13:04:29 lum Exp $	*/
  /*	$NetBSD: pkill.c,v 1.5 2002/10/27 11:49:34 kleink Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: pkill.c,v 1.25 2012/03/13 09:44:49 sthen Exp $	*/
  /*	$NetBSD: pkill.c,v 1.5 2002/10/27 11:49:34 kleink Exp $	*/
  
  /*-
***************
*** 254,260 ****
  		}
  
  		for (i = 0, kp = plist; i < nproc; i++, kp++) {
! 			if ((kp->p_flag & P_SYSTEM) != 0 || kp->p_pid == mypid)
  				continue;
  
  			if (matchargs) {
--- 254,261 ----
  		}
  
  		for (i = 0, kp = plist; i < nproc; i++, kp++) {
! 			if ((kp->p_flag & (P_SYSTEM | P_THREAD)) != 0 ||
! 			     kp->p_pid == mypid)
  				continue;
  
  			if (matchargs) {
***************
*** 297,303 ****
  	}
  
  	for (i = 0, kp = plist; i < nproc; i++, kp++) {
! 		if ((kp->p_flag & P_SYSTEM) != 0 || kp->p_pid == mypid)
  			continue;
  
  		SLIST_FOREACH(li, &ruidlist, li_chain)
--- 298,305 ----
  	}
  
  	for (i = 0, kp = plist; i < nproc; i++, kp++) {
! 		if ((kp->p_flag & (P_SYSTEM | P_THREAD)) != 0 ||
! 		     kp->p_pid == mypid)
  			continue;
  
  		SLIST_FOREACH(li, &ruidlist, li_chain)
***************
*** 407,413 ****
  	 */
  	rv = STATUS_NOMATCH;
  	for (i = 0, j = 0, kp = plist; i < nproc; i++, kp++) {
! 		if ((kp->p_flag & P_SYSTEM) != 0 || kp->p_pid == mypid)
  			continue;
  		if (selected[i]) {
  			if (longfmt && !pgrep)
--- 409,416 ----
  	 */
  	rv = STATUS_NOMATCH;
  	for (i = 0, j = 0, kp = plist; i < nproc; i++, kp++) {
! 		if ((kp->p_flag & (P_SYSTEM | P_THREAD)) != 0 ||
! 		     kp->p_pid == mypid)
  			continue;
  		if (selected[i]) {
  			if (longfmt && !pgrep)