===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pkill/pkill.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/pkill/pkill.c	2009/10/27 23:59:41	1.18
--- src/usr.bin/pkill/pkill.c	2011/04/10 03:20:59	1.19
***************
*** 1,4 ****
! /*	$OpenBSD: pkill.c,v 1.18 2009/10/27 23:59:41 deraadt Exp $	*/
  /*	$NetBSD: pkill.c,v 1.5 2002/10/27 11:49:34 kleink Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: pkill.c,v 1.19 2011/04/10 03:20:59 guenther Exp $	*/
  /*	$NetBSD: pkill.c,v 1.5 2002/10/27 11:49:34 kleink Exp $	*/
  
  /*-
***************
*** 73,79 ****
  
  SLIST_HEAD(listhead, list);
  
! struct kinfo_proc2	*plist;
  char	*selected;
  char	*delim = "\n";
  int	nproc;
--- 73,79 ----
  
  SLIST_HEAD(listhead, list);
  
! struct kinfo_proc	*plist;
  char	*selected;
  char	*delim = "\n";
  int	nproc;
***************
*** 98,105 ****
  
  int	main(int, char **);
  void	usage(void);
! int	killact(struct kinfo_proc2 *, int);
! int	grepact(struct kinfo_proc2 *, int);
  void	makelist(struct listhead *, enum listtype, char *);
  
  extern char *__progname;
--- 98,105 ----
  
  int	main(int, char **);
  void	usage(void);
! int	killact(struct kinfo_proc *, int);
! int	grepact(struct kinfo_proc *, int);
  void	makelist(struct listhead *, enum listtype, char *);
  
  extern char *__progname;
***************
*** 111,118 ****
  	extern int optind;
  	char buf[_POSIX2_LINE_MAX], *mstr, **pargv, *p, *q;
  	int i, j, ch, bestidx, rv, criteria;
! 	int (*action)(struct kinfo_proc2 *, int);
! 	struct kinfo_proc2 *kp;
  	struct list *li;
  	u_int32_t bestsec, bestusec;
  	regex_t reg;
--- 111,118 ----
  	extern int optind;
  	char buf[_POSIX2_LINE_MAX], *mstr, **pargv, *p, *q;
  	int i, j, ch, bestidx, rv, criteria;
! 	int (*action)(struct kinfo_proc *, int);
! 	struct kinfo_proc *kp;
  	struct list *li;
  	u_int32_t bestsec, bestusec;
  	regex_t reg;
***************
*** 227,235 ****
  	if (kd == NULL)
  		errx(STATUS_ERROR, "kvm_openfiles(): %s", buf);
  
! 	plist = kvm_getproc2(kd, KERN_PROC_ALL, 0, sizeof(*plist), &nproc);
  	if (plist == NULL)
! 		errx(STATUS_ERROR, "kvm_getproc2() failed");
  
  	/*
  	 * Allocate memory which will be used to keep track of the
--- 227,235 ----
  	if (kd == NULL)
  		errx(STATUS_ERROR, "kvm_openfiles(): %s", buf);
  
! 	plist = kvm_getprocs(kd, KERN_PROC_ALL, 0, sizeof(*plist), &nproc);
  	if (plist == NULL)
! 		errx(STATUS_ERROR, "kvm_getprocs() failed");
  
  	/*
  	 * Allocate memory which will be used to keep track of the
***************
*** 253,259 ****
  				continue;
  
  			if (matchargs) {
! 				if ((pargv = kvm_getargv2(kd, kp, 0)) == NULL)
  					continue;
  
  				j = 0;
--- 253,259 ----
  				continue;
  
  			if (matchargs) {
! 				if ((pargv = kvm_getargv(kd, kp, 0)) == NULL)
  					continue;
  
  				j = 0;
***************
*** 430,436 ****
  }
  
  int
! killact(struct kinfo_proc2 *kp, int dummy)
  {
  
  	if (kill(kp->p_pid, signum) == -1 && errno != ESRCH) {
--- 430,436 ----
  }
  
  int
! killact(struct kinfo_proc *kp, int dummy)
  {
  
  	if (kill(kp->p_pid, signum) == -1 && errno != ESRCH) {
***************
*** 441,454 ****
  }
  
  int
! grepact(struct kinfo_proc2 *kp, int printdelim)
  {
  	char **argv;
  
  	if (printdelim)
  		fputs(delim, stdout);
  	if (longfmt && matchargs) {
! 		if ((argv = kvm_getargv2(kd, kp, 0)) == NULL)
  			return (-1);
  
  		printf("%d ", (int)kp->p_pid);
--- 441,454 ----
  }
  
  int
! grepact(struct kinfo_proc *kp, int printdelim)
  {
  	char **argv;
  
  	if (printdelim)
  		fputs(delim, stdout);
  	if (longfmt && matchargs) {
! 		if ((argv = kvm_getargv(kd, kp, 0)) == NULL)
  			return (-1);
  
  		printf("%d ", (int)kp->p_pid);