 @@ -1,14 +1,14 @@
-/*	$NetBSD: extern.h,v 1.6 2003/08/07 11:17:12 agc Exp $	*/
+/*	$NetBSD: extern.h,v 1.7 2011/10/21 02:26:09 christos Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -26,14 +26,13 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
  */
 struct kinfo_proc2;
 void	fmt_puts(char *, int *);
 void	fmt_putc(int, int *);
 void	pr_attime(time_t *, time_t *);
 void	pr_idle(time_t);
 int	proc_compare(struct kinfo_proc2 *, struct kinfo_proc2 *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: w.c,v 1.75 2011/09/16 15:39:30 joerg Exp $	*/
+/*	$NetBSD: w.c,v 1.76 2011/10/21 02:26:09 christos Exp $	*/
 /*-
  * Copyright (c) 1980, 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)w.c	8.6 (Berkeley) 6/30/94";
 #else
-__RCSID("$NetBSD: w.c,v 1.75 2011/09/16 15:39:30 joerg Exp $");
+__RCSID("$NetBSD: w.c,v 1.76 2011/10/21 02:26:09 christos Exp $");
 #endif
 #endif /* not lint */
 /*
  * w - print system status (who and what)
+ *
  * This program is similar to the systat command on Tenex/Tops 10/20
+ *
  */
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 @@ -110,26 +110,28 @@ struct	entry {
 	char line[UTX_LINESIZE + 1];
 	char host[UTX_HOSTSIZE + 1];
 	char type[2];
 	struct timeval tv;
 	dev_t	tdev;			/* dev_t of terminal */
 	time_t	idle;			/* idle time of terminal in seconds */
 	struct	kinfo_proc2 *tp;	/* `most interesting' tty proc */
 	struct	kinfo_proc2 *pp;	/* pid proc */
 	pid_t	pid;			/* pid or ~0 if not known */
 } *ehead = NULL, **nextp = &ehead;
 static void	pr_args(struct kinfo_proc2 *);
 static void	pr_header(time_t *, int);
 static int	proc_compare_wrapper(const struct kinfo_proc2 *,
     const struct kinfo_proc2 *);
 #if defined(SUPPORT_UTMP) || defined(SUPPORT_UTMPX)
 static int	ttystat(const char *, struct stat *);
 static void	process(struct entry *);
 #endif
 __dead static void	usage(int);
 int
 main(int argc, char **argv)
+{
 	struct kinfo_proc2 *kp;
 	struct hostent *hp;
 	struct in_addr l;
 	struct entry *ep;
 @@ -292,37 +294,34 @@ main(int argc, char **argv)
 	if (header || wcmd == 0) {
 		pr_header(&now, nusers);
 		if (wcmd == 0)
 			exit (0);
+	}
 	if ((kp = kvm_getproc2(kd, KERN_PROC_ALL, 0,
 	    sizeof(struct kinfo_proc2), &nentries)) == NULL)
 		errx(1, "%s", kvm_geterr(kd));
 	/* Include trailing space because TTY header starts one column early. */
 	for (i = 0; i < nentries; i++, kp++) {
 		if (kp->p_stat == SIDL || kp->p_stat == SZOMB)
 			continue;
 		for (ep = ehead; ep != NULL; ep = ep->next) {
 			if (ep->tdev != 0 && ep->tdev == kp->p_tdev &&
 			    kp->p__pgid == kp->p_tpgid) {
 				/*
 				 * Proc is in foreground of this
 				 * terminal
 				 */
-				if (proc_compare(ep->tp, kp))
+				if (proc_compare_wrapper(ep->tp, kp))
 					ep->tp = kp;
 				break;
+			}
 			if (ep->pid != 0 && ep->pid == kp->p_pid) {
 				ep->pp = kp;
 				break;
+			}
+		}
+	}
 	if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1 &&
 	    ioctl(STDERR_FILENO, TIOCGWINSZ, &ws) == -1 &&
 	    ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) == -1) || ws.ws_col == 0)
 @@ -608,25 +607,46 @@ process(struct entry *ep)
 		(void) sysctl(mib, 2, &ep->tdev, &size, NULL, 0);
+	}
 	touched = st.st_atime;
 	if (touched < ep->tv.tv_sec) {
 		/* tty untouched since before login */
 		touched = ep->tv.tv_sec;
+	}
 	if ((ep->idle = now - touched) < 0)
 		ep->idle = 0;
+}
 #endif
 static int
 proc_compare_wrapper(const struct kinfo_proc2 *p1,
     const struct kinfo_proc2 *p2)
+{
 	struct kinfo_lwp *l1, *l2;
 	int cnt;
 	if (p1 == NULL)
 		return 1;
 	l1 = kvm_getlwps(kd, p1->p_pid, 0, sizeof(*l1), &cnt);
 	if (l1 == NULL || cnt == 0)
 		return 1;
 	l2 = kvm_getlwps(kd, p2->p_pid, 0, sizeof(*l1), &cnt);
 	if (l2 == NULL || cnt == 0)
 		return 0;
 	return proc_compare(p1, l1, p2, l2);
+}
 static void
 usage(int wcmd)
+{
 	if (wcmd)
 		(void)fprintf(stderr,
 		    "Usage: %s [-hinw] [-M core] [-N system] [user]\n",
 		    getprogname());
 	else
 		(void)fprintf(stderr, "Usage: %s\n", getprogname());
 	exit(1);
+}

 @@ -1,18 +1,18 @@
-#	$NetBSD: Makefile,v 1.20 2011/08/17 13:48:11 christos Exp $
+#	$NetBSD: Makefile,v 1.21 2011/10/21 02:26:09 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 .include <bsd.own.mk>
 PROG=	w
-SRCS=	fmt.c pr_time.c proc_compare.c w.c
+SRCS=	fmt.c pr_time.c w.c
 MAN=	w.1 uptime.1
-DPADD=	${LIBKVM}
+DPADD=	${LIBKVM} ${LIBUTIL}
-LDADD=	-lkvm
+LDADD=	-lkvm -lutil
 LINKS=	${BINDIR}/w ${BINDIR}/uptime
 CPPFLAGS+= -DSUPPORT_UTMP -DSUPPORT_UTMPX
 .PATH: ${NETBSDSRCDIR}/bin/ps
 COPTS.pr_time.c += -Wno-format-y2k
 .include <bsd.prog.mk>