w(1): switch to libkvm

Change-Id: I6d836d9aa2e1dfe8df1d866a5cc33868522f767e
Stichting-MINIX-Research-Foundation · Jan 13, 2016 · 1f761e1 · 1f761e1
1 parent 9da2275
commit 1f761e1
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 327 deletions.
diff --git a/common/lib/libutil/Makefile.inc b/common/lib/libutil/Makefile.inc
@@ -1,7 +1,7 @@
 #	$NetBSD: Makefile.inc,v 1.4 2011/11/13 21:56:53 christos Exp $
 .PATH.c: ${.PARSEDIR}
 .if defined(__MINIX)
-SRCS+=	snprintb.c
+SRCS+=	snprintb.c proc_compare.c
 .else
 SRCS+=	snprintb.c proc_compare.c getfstypename.c
 .endif # defined(__MINIX)

diff --git a/distrib/sets/lists/minix-man/mi b/distrib/sets/lists/minix-man/mi
@@ -2411,6 +2411,7 @@
 ./usr/man/man3/prefresh.3                               minix-man
 ./usr/man/man3/printf.3                                 minix-man
 ./usr/man/man3/printw.3                                 minix-man
+./usr/man/man3/proc_compare.3                           minix-man
 ./usr/man/man3/prop_array.3                             minix-man
 ./usr/man/man3/prop_array_add.3                         minix-man
 ./usr/man/man3/prop_array_capacity.3                    minix-man

diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
@@ -30,7 +30,7 @@ MAN=	efun.3 \
 	login.3 login_cap.3 loginx.3 \
 	\
 	opendisk.3 openpty.3 parsedate.3 pidfile.3 pidlock.3 \
-	pw_getconf.3 pw_init.3 pw_lock.3 secure_path.3 \
+	proc_compare.3 pw_getconf.3 pw_init.3 pw_lock.3 secure_path.3 \
 	raise_default_signal.3 \
 	snprintb.3 sockaddr_snprintf.3 stat_flags.3 strpct.3 ttyaction.3 \
 	ttymsg.3 util.3

diff --git a/minix/usr.bin/w/minix_proc.c b/minix/usr.bin/w/minix_proc.c
diff --git a/minix/usr.bin/w/minix_proc.h b/minix/usr.bin/w/minix_proc.h
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
@@ -1345,10 +1345,8 @@ int	sysctlbyname(const char *, void *, size_t *, const void *, size_t);
 int	sysctlgetmibinfo(const char *, int *, u_int *,
 			 char *, size_t *, struct sysctlnode **, int);
 int	sysctlnametomib(const char *, int *, size_t *);
-#if !defined(__minix)
 int	proc_compare(const struct kinfo_proc2 *, const struct kinfo_lwp *,
     const struct kinfo_proc2 *, const struct kinfo_lwp *);
-#endif /* !defined(__minix) */
 void	*asysctl(const int *, size_t, size_t *);
 void	*asysctlbyname(const char *, size_t *);
 __END_DECLS

diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile
@@ -6,14 +6,8 @@
 PROG=	w
 SRCS=	fmt.c pr_time.c w.c
 MAN=	w.1 uptime.1
-.if defined(__MINIX)
-.PATH:	${NETBSDSRCDIR}/minix/usr.bin/w
-SRCS+=	minix_proc.c
-CPPFLAGS+= -I${NETBSDSRCDIR}/minix/usr.bin/w
-.else
 DPADD=	${LIBKVM} ${LIBUTIL}
 LDADD=	-lkvm -lutil
-.endif
 LINKS=	${BINDIR}/w ${BINDIR}/uptime
 CPPFLAGS+= -DSUPPORT_UTMP -DSUPPORT_UTMPX