===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pkill/pkill.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/pkill/pkill.c	2004/06/24 18:04:45	1.4
--- src/usr.bin/pkill/pkill.c	2004/07/15 13:55:10	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: pkill.c,v 1.4 2004/06/24 18:04:45 millert Exp $	*/
  /*	$NetBSD: pkill.c,v 1.5 2002/10/27 11:49:34 kleink Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: pkill.c,v 1.5 2004/07/15 13:55:10 mpech 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.4 2004/06/24 18:04:45 millert Exp $";
  #endif /* !lint */
  
  #include <sys/types.h>
--- 38,44 ----
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: pkill.c,v 1.5 2004/07/15 13:55:10 mpech Exp $";
  #endif /* !lint */
  
  #include <sys/types.h>
***************
*** 291,297 ****
  	}
  
  	for (i = 0, kp = plist; i < nproc; i++, kp++) {
! 		if ((kp->p_flag & P_SYSTEM) != 0)
  			continue;
  
  		SLIST_FOREACH(li, &ruidlist, li_chain)
--- 291,297 ----
  	}
  
  	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)
***************
*** 385,399 ****
  	 * Take the appropriate action for each matched process, if any.
  	 */
  	for (i = 0, rv = STATUS_NOMATCH, kp = plist; i < nproc; i++, kp++) {
! 		if (kp->p_pid == mypid)
  			continue;
  		if (selected[i]) {
  			if (inverse)
  				continue;
  		} else if (!inverse)
- 			continue;
- 
- 		if ((kp->p_flag & P_SYSTEM) != 0)
  			continue;
  
  		if ((*action)(kp) == -1)
--- 385,396 ----
  	 * Take the appropriate action for each matched process, if any.
  	 */
  	for (i = 0, rv = STATUS_NOMATCH, kp = plist; i < nproc; i++, kp++) {
! 		if ((kp->p_flag & P_SYSTEM) != 0 || kp->p_pid == mypid)
  			continue;
  		if (selected[i]) {
  			if (inverse)
  				continue;
  		} else if (!inverse)
  			continue;
  
  		if ((*action)(kp) == -1)