 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_ktrace.c,v 1.155 2010/11/19 06:44:42 dholland Exp $	*/
+/*	$NetBSD: kern_ktrace.c,v 1.156 2011/04/27 00:00:46 joerg Exp $	*/
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * 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.
+ *
  *	@(#)kern_ktrace.c	8.5 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.155 2010/11/19 06:44:42 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.156 2011/04/27 00:00:46 joerg Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/ktrace.h>
 #include <sys/kmem.h>
 #include <sys/syslog.h>
 #include <sys/filedesc.h>
 @@ -955,59 +955,26 @@ ktr_kuser(const char *id, void *addr, si
 	error = ktealloc(&kte, (void *)&ktp, l, KTR_USER, sizeof(*ktp) + len);
 	if (error != 0)
 		return;
 	strlcpy(ktp->ktr_id, id, KTR_USER_MAXIDLEN);
 	memcpy(ktp + 1, addr, len);
 	ktraddentry(l, kte, KTA_WAITOK);
+}
 void
 ktr_mmsg(const void *msgh, size_t size)
 	lwp_t *l = curlwp;
 	if (!KTRPOINT(l->l_proc, KTR_MMSG))
 		return;
 	ktr_kmem(l, KTR_MMSG, msgh, size);
 void
 ktr_mool(const void *kaddr, size_t size, const void *uaddr)
 	struct ktrace_entry *kte;
 	struct ktr_mool *kp;
 	struct ktr_mool *bf;
 	lwp_t *l = curlwp;
 	if (!KTRPOINT(l->l_proc, KTR_MOOL))
 		return;
 	if (ktealloc(&kte, (void *)&kp, l, KTR_MOOL, size + sizeof(*kp)))
 		return;
 	kp->uaddr = uaddr;
 	kp->size = size;
 	bf = kp + 1; /* Skip uaddr and size */
 	(void)memcpy(bf, kaddr, size);
 	ktraddentry(l, kte, KTA_WAITOK);
 void
 ktr_saupcall(struct lwp *l, int type, int nevent, int nint, void *sas,
     void *ap, void *ksas)
+{
 	struct ktrace_entry *kte;
 	struct ktr_saupcall *ktp;
 	size_t len, sz;
 	struct sa_t **sapp;
 	int i;
 	if (!KTRPOINT(l->l_proc, KTR_SAUPCALL))
 		return;
 	len = sizeof(struct ktr_saupcall);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_stub.c,v 1.30 2011/01/31 23:07:16 dyoung Exp $	*/
+/*	$NetBSD: kern_stub.c,v 1.31 2011/04/27 00:00:46 joerg Exp $	*/
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
  * 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.
 @@ -52,27 +52,27 @@
  * 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.
+ *
  *	@(#)subr_xxx.c	8.3 (Berkeley) 3/29/95
  */
 /*
  * Stubs for system calls and facilities not included in the system.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.30 2011/01/31 23:07:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.31 2011/04/27 00:00:46 joerg Exp $");
 #include "opt_ptrace.h"
 #include "opt_ktrace.h"
 #include "opt_sa.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/fstypes.h>
 #include <sys/signalvar.h>
 #include <sys/syscall.h>
 #include <sys/ktrace.h>
 #include <sys/intr.h>
 @@ -97,29 +97,27 @@ __weak_alias(sys_ptrace,sys_nosys);
 #ifndef KTRACE
 __weak_alias(ktr_csw,nullop);		/* Probes */
 __weak_alias(ktr_emul,nullop);
 __weak_alias(ktr_geniov,nullop);
 __weak_alias(ktr_genio,nullop);
 __weak_alias(ktr_mibio,nullop);
 __weak_alias(ktr_namei,nullop);
 __weak_alias(ktr_namei2,nullop);
 __weak_alias(ktr_psig,nullop);
 __weak_alias(ktr_saupcall,nullop);
 __weak_alias(ktr_syscall,nullop);
 __weak_alias(ktr_sysret,nullop);
 __weak_alias(ktr_kuser,nullop);
 __weak_alias(ktr_mmsg,nullop);
 __weak_alias(ktr_mib,nullop);
 __weak_alias(ktr_mool,nullop);
 __weak_alias(ktr_execarg,nullop);
 __weak_alias(ktr_execenv,nullop);
 __weak_alias(sys_fktrace,sys_nosys);	/* Syscalls */
 __weak_alias(sys_ktrace,sys_nosys);
 __weak_alias(sys_utrace,sys_nosys);
 int	ktrace_on;			/* Misc */
 __weak_alias(ktruser,enosys);
 __weak_alias(ktr_point,nullop);
 #endif	/* KTRACE */
 __weak_alias(device_register, voidop);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ktrace.h,v 1.56 2009/01/11 02:45:55 christos Exp $	*/
+/*	$NetBSD: ktrace.h,v 1.57 2011/04/27 00:00:46 joerg Exp $	*/
 /*
  * Copyright (c) 1988, 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.
 @@ -180,62 +180,33 @@ struct ktr_csw {
  * KTR_USER - user record
  */
 #define	KTR_USER	8
 #define KTR_USER_MAXIDLEN	20
 #define KTR_USER_MAXLEN		2048	/* maximum length of passed data */
 struct ktr_user {
 	char 	ktr_id[KTR_USER_MAXIDLEN];	/* string id of caller */
 	/*
 	 * Followed by ktr_len - sizeof(struct ktr_user) of user data.
 	 */
 };
 /*
  * KTR_MMSG - Mach message
  */
 #define KTR_MMSG		9
 struct ktr_mmsg {
 	/*
 	 * This is a Mach message header
 	 */
 	int	ktr_bits;
 	int	ktr_size;
 	int	ktr_remote_port;
 	int	ktr_local_port;
 	int	ktr_reserved;
 	int	ktr_id;
 	/*
 	 * Followed by ktr_size - sizeof(mach_msg_header_t) of message payload
 	 */
 };
 /*
  * KTR_EXEC_ARG, KTR_EXEC_ENV - Arguments and environment from exec
  */
 #define KTR_EXEC_ARG		10
 #define KTR_EXEC_ENV		11
 	/* record contains arg/env string */
 /*
  * KTR_MOOL - Mach Out Of Line data
  */
 #define KTR_MOOL		12
 struct ktr_mool {
 	const void 	*uaddr;	/* User address */
 	size_t		size;	/* Data len */
 	/* Followed by size bytes of data */
 };
 /*
  * KTR_SAUPCALL - scheduler activated upcall.
  */
 #define	KTR_SAUPCALL	13
 struct ktr_saupcall {
 	int ktr_type;
 	int ktr_nevent;
 	int ktr_nint;
 	void *ktr_sas;
 	void *ktr_ap;
 	/*
 	 * followed by nevent sa_t's from sas[]
 	 */
 };
 @@ -249,30 +220,28 @@ struct ktr_saupcall {
 /*
  * kernel trace points (in p_traceflag)
  */
 #define KTRFAC_MASK	0x00ffffff
 #define KTRFAC_SYSCALL	(1<<KTR_SYSCALL)
 #define KTRFAC_SYSRET	(1<<KTR_SYSRET)
 #define KTRFAC_NAMEI	(1<<KTR_NAMEI)
 #define KTRFAC_GENIO	(1<<KTR_GENIO)
 #define	KTRFAC_PSIG	(1<<KTR_PSIG)
 #define KTRFAC_CSW	(1<<KTR_CSW)
 #define KTRFAC_EMUL	(1<<KTR_EMUL)
 #define	KTRFAC_USER	(1<<KTR_USER)
 #define KTRFAC_MMSG	(1<<KTR_MMSG)
 #define KTRFAC_EXEC_ARG	(1<<KTR_EXEC_ARG)
 #define KTRFAC_EXEC_ENV	(1<<KTR_EXEC_ENV)
 #define KTRFAC_MOOL	(1<<KTR_MOOL)
 #define	KTRFAC_SAUPCALL	(1<<KTR_SAUPCALL)
 #define	KTRFAC_MIB	(1<<KTR_MIB)
 /*
  * trace flags (also in p_traceflags)
  */
 #define KTRFAC_PERSISTENT	0x80000000	/* persistent trace across sugid
 						   exec (exclusive) */
 #define KTRFAC_INHERIT	0x40000000	/* pass trace flags to children */
 #define KTRFAC_TRC_EMUL	0x10000000	/* ktrace KTR_EMUL before next trace */
 #define	KTRFAC_VER_MASK	0x0f000000	/* record version mask */
 #define	KTRFAC_VER_SHIFT	24	/* record version shift */
 #define	KTRFAC_VERSION(tf)	(((tf) & KTRFAC_VER_MASK) >> KTRFAC_VER_SHIFT)
 @@ -304,29 +273,27 @@ int ktruser(const char *, void *, size_t
 bool ktr_point(int);
 void ktr_csw(int, int);
 void ktr_emul(void);
 void ktr_geniov(int, enum uio_rw, struct iovec *, size_t, int);
 void ktr_genio(int, enum uio_rw, const void *, size_t, int);
 void ktr_mibio(int, enum uio_rw, const void *, size_t, int);
 void ktr_namei(const char *, size_t);
 void ktr_namei2(const char *, size_t, const char *, size_t);
 void ktr_psig(int, sig_t, const sigset_t *, const ksiginfo_t *);
 void ktr_syscall(register_t, const register_t [], int);
 void ktr_sysret(register_t, int, register_t *);
 void ktr_kuser(const char *, void *, size_t);
 void ktr_mmsg(const void *, size_t);
 void ktr_mib(const int *a , u_int b);
 void ktr_mool(const void *, size_t, const void *);
 void ktr_execarg(const void *, size_t);
 void ktr_execenv(const void *, size_t);
 void ktr_saupcall(struct lwp *, int, int, int, void *, void *, void *);
 static inline bool
 ktrpoint(int fac)
+{
     return __predict_false(ktrace_on) && __predict_false(ktr_point(1 << fac));
+}
 static inline void
 ktrcsw(int a, int b)
+{
 @@ -395,47 +362,33 @@ ktrsysret(register_t a, int b, register_
+{
 	if (__predict_false(ktrace_on))
 		ktr_sysret(a, b, c);
+}
 static inline void
 ktrkuser(const char *a, void *b, size_t c)
+{
 	if (__predict_false(ktrace_on))
 		ktr_kuser(a, b, c);
+}
 static inline void
 ktrmmsg(const void *a, size_t b)
 	if (__predict_false(ktrace_on))
 		ktr_mmsg(a, b);
 static inline void
 ktrmib(const int *a , u_int b)
+{
 	if (__predict_false(ktrace_on))
 		ktr_mib(a, b);
+}
 static inline void
 ktrmool(const void *a, size_t b, const void *c)
 	if (__predict_false(ktrace_on))
 		ktr_mool(a, b, c);
 static inline void
 ktrexecarg(const void *a, size_t b)
+{
 	if (__predict_false(ktrace_on))
 		ktr_execarg(a, b);
+}
 static inline void
 ktrexecenv(const void *a, size_t b)
+{
 	if (__predict_false(ktrace_on))
 		ktr_execenv(a, b);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kdump.c,v 1.110 2011/04/26 15:51:32 joerg Exp $	*/
+/*	$NetBSD: kdump.c,v 1.111 2011/04/27 00:00:47 joerg Exp $	*/
 /*-
  * Copyright (c) 1988, 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.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)kdump.c	8.4 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: kdump.c,v 1.110 2011/04/26 15:51:32 joerg Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.111 2011/04/27 00:00:47 joerg Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #define _KERNEL
 #include <sys/errno.h>
 #undef _KERNEL
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 #include <sys/ioctl.h>
 #include <sys/ptrace.h>
 @@ -104,28 +104,26 @@ static const char * const linux_ptrace_o
 int	main(int, char **);
 static int	fread_tail(void *, size_t, size_t);
 static int	dumpheader(struct ktr_header *);
 static void	output_long(u_long, int);
 static void	ioctldecode(u_long);
 static void	ktrsyscall(struct ktr_syscall *);
 static void	ktrsysret(struct ktr_sysret *, int);
 static void	ktrnamei(char *, int);
 static void	ktremul(char *, int, int);
 static void	ktrgenio(struct ktr_genio *, int);
 static void	ktrpsig(void *, int);
 static void	ktrcsw(struct ktr_csw *);
 static void	ktruser(struct ktr_user *, int);
 static void	ktrmmsg(struct ktr_mmsg *, int);
 static void	ktrmool(struct ktr_mool *, int);
 static void	ktrmib(int *, int);
 static void	usage(void) __dead;
 static void	eprint(int);
 static void	rprint(register_t);
 static const char *signame(long, int);
 static void hexdump_buf(const void *, int, int);
 static void visdump_buf(const void *, int, int);
 int
 main(int argc, char **argv)
+{
 	int ch, ktrlen, size;
 	void *m;
 @@ -282,32 +280,26 @@ main(int argc, char **argv)
 			break;
 		case KTR_PSIG:
 			ktrpsig(m, ktrlen);
 			break;
 		case KTR_CSW:
 			ktrcsw(m);
 			break;
 		case KTR_EMUL:
 			ktremul(m, ktrlen, size);
 			break;
 		case KTR_USER:
 			ktruser(m, ktrlen);
 			break;
 		case KTR_MMSG:
 			ktrmmsg(m, ktrlen);
 			break;
 		case KTR_MOOL:
 			ktrmool(m, ktrlen);
 			break;
 		case KTR_EXEC_ARG:
 		case KTR_EXEC_ENV:
 			visdump_buf(m, ktrlen, col);
 			break;
 		case KTR_MIB:
 			ktrmib(m, ktrlen);
 			break;
 		default:
 			putchar('\n');
 			hexdump_buf(m, ktrlen, word_size ? word_size : 1);
+		}
 		if (tail)
 			(void)fflush(stdout);
 @@ -355,32 +347,26 @@ dumpheader(struct ktr_header *kth)
 		break;
 	case KTR_PSIG:
 		type = "PSIG";
 		break;
 	case KTR_CSW:
 		type = "CSW ";
 		break;
 	case KTR_EMUL:
 		type = "EMUL";
 		break;
 	case KTR_USER:
 		type = "MISC";
 		break;
 	case KTR_MMSG:
 		type = "MMSG";
 		break;
 	case KTR_MOOL:
 		type = "MOOL";
 		break;
 	case KTR_EXEC_ENV:
 		type = "ENV";
 		break;
 	case KTR_EXEC_ARG:
 		type = "ARG";
 		break;
 	case KTR_SAUPCALL:
 		type = "SAU";
 		break;
 	case KTR_MIB:
 		type = "MIB";
 		break;
 	default:
 @@ -1020,56 +1006,26 @@ ktruser(struct ktr_user *usr, int len)
 	dta = (unsigned char *)(usr + 1);
 	if (word_size) {
 		printf("\n");
 		hexdump_buf(dta, len, word_size);
 		return;
+	}
 	printf(" %d, ", len);
 	for (i = 0; i < len; i++)
 		printf("%02x", (unsigned int) dta[i]);
 	printf("\n");
+}
 static void
 ktrmmsg(struct ktr_mmsg *mmsg, int len)
 	const char *reply;
 	int id;
 	id = mmsg->ktr_id;
 	if ((id / 100) % 2) {  /* Message reply */
 		reply = " reply";
 		id -= 100;
 	} else {
 		reply = "";
 	printf("unknown service%s [%d]\n", reply, mmsg->ktr_id);
 	hexdump_buf(mmsg, len, word_size ? word_size : 4);
 static void
 ktrmool(struct ktr_mool *mool, int len)
 	size_t size = mool->size;
 	printf("%ld/0x%lx bytes at %p\n",
 	    (u_long)size, (u_long)size, mool->uaddr);
 	mool++;
 	hexdump_buf(mool, size, word_size ? word_size : 4);
 static void
 ktrmib(int *namep, int len)
+{
 	size_t i;
 	for (i = 0; i < (len / sizeof(*namep)); i++)
 		printf("%s%d", (i == 0) ? "" : ".", namep[i]);
 	printf("\n");
+}
 static const char *
 signame(long sig, int xlat)
+{
 	static char buf[64];

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: ktrace.1,v 1.39 2007/08/27 16:35:47 dsl Exp $
+.\"	$NetBSD: ktrace.1,v 1.40 2011/04/27 00:00:47 joerg Exp $
 .\"
 .\" Copyright (c) 1990, 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.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -19,27 +19,27 @@
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" 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.
 .\"
 .\"	@(#)ktrace.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd August 27, 2007
+.Dd April 27, 2011
 .Dt KTRACE 1
 .Os
 .Sh NAME
 .Nm ktrace , ktruss
 .Nd enable kernel process tracing
 .Sh SYNOPSIS
 .Nm
 .Op Fl aCcdins
 .Op Fl f Ar trfile
 .Op Fl g Ar pgrp
 .Op Fl p Ar pid
 .Op Fl t Ar trstr
 .Nm
 @@ -174,32 +174,26 @@ The following table equates the letters
 .Pp
 .Bl -tag -width flag -compact
 .It Cm A
 trace all tracepoints
 .It Cm a
 trace exec arguments
 .It Cm c
 trace system calls
 .It Cm e
 trace emulation changes
 .It Cm i
 trace
 .Tn I/O
 .It Cm l
 trace Mach out of line data when running Mach binaries with COMPAT_MACH
 (currently limited to i386 and powerpc ports).
 .It Cm m
 trace Mach messages when running Mach binaries with COMPAT_MACH
 (currently limited to i386 and powerpc ports).
 .It Cm n
 trace namei translations
 .It Cm S
 trace MIB access (sysctl)
 .It Cm s
 trace signal processing
 .\" .It Cm U
 .\" trace scheduler activations upcall data
 .It Cm u
 trace user data
 .It Cm v
 trace exec environment
 .It Cm w

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ktrace.h,v 1.19 2008/02/16 07:19:23 matt Exp $	*/
+/*	$NetBSD: ktrace.h,v 1.20 2011/04/27 00:00:47 joerg Exp $	*/
 /*-
  * Copyright (c) 1988, 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.
 @@ -22,26 +22,25 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * 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.
+ *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/6/93
  */
 #define DEF_POINTS (KTRFAC_SYSCALL | KTRFAC_SYSRET | KTRFAC_NAMEI | \
-		  KTRFAC_GENIO | KTRFAC_PSIG | KTRFAC_EMUL | KTRFAC_USER | \
+		  KTRFAC_GENIO | KTRFAC_PSIG | KTRFAC_EMUL | KTRFAC_USER)
 		  KTRFAC_MMSG | KTRFAC_MOOL)
 #define ALL_POINTS KTRFAC_MASK
 #define DEF_TRACEFILE	"ktrace.out"
 #include <sys/cdefs.h>
 int	getpoints(int, char *);
 const char	*ioctlname(u_long);
 const char	*siginfocodename(int, int);
 void	dumpfile(const char *, int, int);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr.c,v 1.16 2007/02/09 22:08:49 ad Exp $	*/
+/*	$NetBSD: subr.c,v 1.17 2011/04/27 00:00:47 joerg Exp $	*/
 /*-
  * Copyright (c) 1988, 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.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)subr.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: subr.c,v 1.16 2007/02/09 22:08:49 ad Exp $");
+__RCSID("$NetBSD: subr.c,v 1.17 2011/04/27 00:00:47 joerg Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 #include <stdio.h>
 #include "ktrace.h"
 int
 @@ -69,32 +69,26 @@ getpoints(int facs, char *s)
 			break;
 		case 'c':
 			fac = KTRFAC_SYSCALL | KTRFAC_SYSRET;
 			break;
 		case 'e':
 			fac = KTRFAC_EMUL;
 			break;
 		case 'i':
 			fac = KTRFAC_GENIO;
 			break;
 		case 'n':
 			fac = KTRFAC_NAMEI;
 			break;
 		case 'm':
 			fac = KTRFAC_MMSG;
 			break;
 		case 'l':
 			fac = KTRFAC_MOOL;
 			break;
 		case 's':
 			fac = KTRFAC_PSIG;
 			break;
 		case 'u':
 			fac = KTRFAC_USER;
 			break;
 		case 'S':
 			fac = KTRFAC_MIB;
 			break;
 		case 'v':
 			fac = KTRFAC_EXEC_ENV;
 			break;
 		case 'w':