 @@ -1,14 +1,14 @@
-/*	$NetBSD: dump.c,v 1.42 2012/07/17 14:39:08 njoly Exp $	*/
+/*	$NetBSD: dump.c,v 1.43 2018/06/03 13:41:30 kamil 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";
 #endif
-__RCSID("$NetBSD: dump.c,v 1.42 2012/07/17 14:39:08 njoly Exp $");
+__RCSID("$NetBSD: dump.c,v 1.43 2018/06/03 13:41:30 kamil Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #define	_KERNEL
 #include <sys/errno.h>
 #undef _KERNEL
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 #include <sys/ptrace.h>
 #include <sys/queue.h>
 @@ -102,31 +102,31 @@ void	ktrcsw(struct ktr_entry *);
 void	ktremul(struct ktr_entry *);
 void	ktrgenio(struct ktr_entry *);
 void	ktrnamei(struct ktr_entry *);
 void	ktrpsig(struct ktr_entry *);
 void	ktrsyscall(struct ktr_entry *);
 void	ktrsysret(struct ktr_entry *);
 void	nameiargprint(const char *, struct ktr_header *, register_t **, int *);
 void	nameiprint(struct ktr_header *);
 void	newline(void);
 void	putpendq(struct ktr_entry *);
 void	syscallnameprint(int);
 void	syscallprint(struct ktr_header *);
 void	sysretprint(struct ktr_header *);
-int	wprintf(const char *, ...) __printflike(1, 2);
+int	xwprintf(const char *, ...) __printflike(1, 2);
 void	*xrealloc(void *, size_t *, size_t);
 int
-wprintf(const char *fmt, ...)
+xwprintf(const char *fmt, ...)
+{
 	va_list ap;
 	int w;
 	va_start(ap, fmt);
 	w = vprintf(fmt, ap);
 	if (w == -1)
 		warn("vprintf");
 	else
 		width += w;
 	va_end(ap);
 	return (w);
+}
 @@ -136,27 +136,27 @@ newline(void)
+{
 	if (width > 0) {
 		printf("\n");
 		width = 0;
+	}
+}
 void
 indent(int col)
+{
 	while (width < col)
-		if (wprintf(" ") < 0)
+		if (xwprintf(" ") < 0)
 			break;
+}
 void *
 xrealloc(void *p, size_t *siz, size_t req)
+{
 	if (*siz < req) {
 		if (*siz == 0)
 			*siz = 1;
 		while (*siz < req)
 			*siz <<= 1;
 		p = realloc(p, *siz);
 @@ -340,30 +340,30 @@ fread_tail(void *buf, int size, int num,
+}
 void
 dumpheader(struct ktr_header *kth)
+{
 	union timeholder {
 		struct timeval tv;
 		struct timespec ts;
 	};
 	static union timeholder prevtime;
 	union timeholder temp;
 	temp.tv.tv_sec = temp.tv.tv_usec = 0;
-	wprintf("%6d ", kth->ktr_pid);
+	xwprintf("%6d ", kth->ktr_pid);
 	if (kth->ktr_version > KTRFAC_VERSION(KTRFACv0))
-		wprintf("%6d ", kth->ktr_lid);
+		xwprintf("%6d ", kth->ktr_lid);
-	wprintf("%-8.*s ", MAXCOMLEN, kth->ktr_comm);
+	xwprintf("%-8.*s ", MAXCOMLEN, kth->ktr_comm);
 	if (timestamp) {
 		if (timestamp == 2) {
 			switch (kth->ktr_version) {
 			case KTRFAC_VERSION(KTRFACv0):
 				if (prevtime.tv.tv_sec == 0)
 					temp.tv.tv_sec = temp.tv.tv_usec = 0;
 				else
 					timersub(&kth->ktr_otv,
 					    &prevtime.tv, &temp.tv);
 				prevtime.tv.tv_sec = kth->ktr_otv.tv_sec;
 				prevtime.tv.tv_usec = kth->ktr_otv.tv_usec;
 				break;
 @@ -394,115 +394,115 @@ dumpheader(struct ktr_header *kth)
 				temp.tv.tv_usec = kth->ktr_otv.tv_usec;
 				break;
 			case KTRFAC_VERSION(KTRFACv1):
 				temp.ts.tv_sec = kth->ktr_ots.tv_sec;
 				temp.ts.tv_nsec = kth->ktr_ots.tv_nsec;
 				break;
 			case KTRFAC_VERSION(KTRFACv2):
 				temp.ts.tv_sec = kth->ktr_ts.tv_sec;
 				temp.ts.tv_nsec = kth->ktr_ts.tv_nsec;
 				break;
+			}
+		}
 		if (kth->ktr_version == KTRFAC_VERSION(KTRFACv0))
-			wprintf("%lld.%06ld ",
+			xwprintf("%lld.%06ld ",
 			    (long long)temp.tv.tv_sec, (long)temp.tv.tv_usec);
 		else
-			wprintf("%lld.%09ld ",
+			xwprintf("%lld.%09ld ",
 			    (long long)temp.ts.tv_sec, (long)temp.ts.tv_nsec);
+	}
+}
 void
 ioctldecode(u_long cmd)
+{
 	char dirbuf[4], *dir = dirbuf;
 	if (cmd & IOC_OUT)
 		*dir++ = 'W';
 	if (cmd & IOC_IN)
 		*dir++ = 'R';
 	*dir = '\0';
-	wprintf(decimal ? ", _IO%s('%c',%ld" : ", _IO%s('%c',%#lx",
+	xwprintf(decimal ? ", _IO%s('%c',%ld" : ", _IO%s('%c',%#lx",
 	    dirbuf, (int) ((cmd >> 8) & 0xff), cmd & 0xff);
 	if ((cmd & IOC_VOID) == 0)
-		wprintf(decimal ? ",%ld)" : ",%#lx)",
+		xwprintf(decimal ? ",%ld)" : ",%#lx)",
 		    (cmd >> 16) & 0xff);
 	else
-		wprintf(")");
+		xwprintf(")");
+}
 void
 nameiargprint(const char *prefix, struct ktr_header *kth,
     register_t **ap, int *argsize)
+{
 	struct ktr_entry *kte;
 	if (*argsize == 0)
 		errx(EXIT_FAILURE, "argument expected");
 	/*
 	 * XXX: binary emulation mode.
 	 */
 	kte = getpendq(kth, KTR_NAMEI, NULL);
 	if (kte == NULL)
 		argprint(prefix, ap, argsize);
 	else {
-		wprintf("%s", prefix);
+		xwprintf("%s", prefix);
 		nameiprint(&kte->kte_kth);
 		free(kte);
 		(*ap)++;
 		*argsize -= sizeof(register_t);
+	}
+}
 void
 syscallnameprint(int code)
+{
 	if (code >= cur_emul->nsysnames || code < 0)
-		wprintf("[%d]", code);
+		xwprintf("[%d]", code);
 	else
-		wprintf("%s", cur_emul->sysnames[code]);
+		xwprintf("%s", cur_emul->sysnames[code]);
+}
 void
 argprint(const char *prefix, register_t **ap, int *argsize)
+{
 	if (decimal)
-		wprintf("%s%ld", prefix, (long)**ap);
+		xwprintf("%s%ld", prefix, (long)**ap);
 	else
-		wprintf("%s%#lx", prefix, (long)**ap);
+		xwprintf("%s%#lx", prefix, (long)**ap);
 	(*ap)++;
 	*argsize -= sizeof(register_t);
+}
 void
 syscallprint(struct ktr_header *kth)
+{
 	struct ktr_syscall *ktr = (struct ktr_syscall *)(kth + 1);
 	register_t *ap;
 	const char *s;
 	int argsize;
 	syscallnameprint(ktr->ktr_code);
 	/*
 	 * Arguments processing.
 	 */
 	argsize = ktr->ktr_argsize;
 	if (argsize == 0) {
-		wprintf("(");
+		xwprintf("(");
 		goto noargument;
+	}
 	ap = (register_t *)(ktr + 1);
 	if (!fancy)
 		goto print_first;
 	switch (ktr->ktr_code) {
 	/*
 	 * All these have a path as the first param.
 	 * The order is same as syscalls.master.
 	 */
 	case SYS_open:
 @@ -548,63 +548,63 @@ syscallprint(struct ktr_header *kth)
 		/*
 		 * 2nd argument is also pathname.
 		 */
 		switch (ktr->ktr_code) {
 		case SYS_link:
 		case SYS_rename:
 		case SYS___posix_rename:
 			nameiargprint(", ", kth, &ap, &argsize);
 			break;
+		}
 		break;
 	case SYS_compat_16___sigaction14 :
-		wprintf("(%s", signals[(int)*ap].name);
+		xwprintf("(%s", signals[(int)*ap].name);
 		ap++;
 		argsize -= sizeof(register_t);
 		break;
 	case SYS_ioctl :
 		argprint("(", &ap, &argsize);
 		if ((s = ioctlname(*ap)) != NULL)
-			wprintf(", %s", s);
+			xwprintf(", %s", s);
 		else
 			ioctldecode(*ap);
 		ap++;
 		argsize -= sizeof(register_t);
 		break;
 	case SYS_ptrace :
 		if ((long)*ap >= 0 &&
 		    *ap < (register_t)(sizeof(ptrace_ops) / sizeof(ptrace_ops[0])))
-			wprintf("(%s", ptrace_ops[*ap]);
+			xwprintf("(%s", ptrace_ops[*ap]);
 		else
-			wprintf("(%ld", (long)*ap);
+			xwprintf("(%ld", (long)*ap);
 		ap++;
 		argsize -= sizeof(register_t);
 		break;
 	default:
 print_first:
 		argprint("(", &ap, &argsize);
 		break;
+	}
 	/* Print rest of argument. */
 	while (argsize > 0)
 		argprint(", ", &ap, &argsize);
 noargument:
-	wprintf(")");
+	xwprintf(")");
+}
 void
 ktrsyscall(struct ktr_entry *kte)
+{
 	struct ktr_header *kth = &kte->kte_kth;
 	struct ktr_syscall *ktr = (struct ktr_syscall *)(kth + 1);
 	switch (ktr->ktr_code) {
 	case SYS_exit:
 		dumpheader(kth);
 		syscallprint(kth);
 		break;
 @@ -615,44 +615,44 @@ ktrsyscall(struct ktr_entry *kte)
 	free(kte);
+}
 void
 sysretprint(struct ktr_header *kth)
+{
 	struct ktr_sysret *ktr = (struct ktr_sysret *)(kth + 1);
 	register_t ret = ktr->ktr_retval;
 	int error = ktr->ktr_error;
 	indent(50);
 	if (error == EJUSTRETURN)
-		wprintf(" JUSTRETURN");
+		xwprintf(" JUSTRETURN");
 	else if (error == ERESTART)
-		wprintf(" RESTART");
+		xwprintf(" RESTART");
 	else if (error) {
-		wprintf(" Err#%d", error);
+		xwprintf(" Err#%d", error);
 		if (error < MAXERRNOS && error >= -2)
-			wprintf(" %s", errnos[error].name);
+			xwprintf(" %s", errnos[error].name);
 	} else
 		switch (ktr->ktr_code) {
 		case SYS_mremap:
 		case SYS_mmap:
-			wprintf(" = %p", (void *)(intptr_t)ret);
+			xwprintf(" = %p", (void *)(intptr_t)ret);
 			break;
 		default:
-			wprintf(" = %ld", (long)ret);
+			xwprintf(" = %ld", (long)ret);
 			if (kth->ktr_len > (int)offsetof(struct ktr_sysret,
 			    ktr_retval_1) && ktr->ktr_retval_1 != 0)
-				wprintf(", %ld", (long)ktr->ktr_retval_1);
+				xwprintf(", %ld", (long)ktr->ktr_retval_1);
 			break;
+		}
+}
 void
 ktrsysret(struct ktr_entry *kte)
+{
 	struct ktr_header *kth = &kte->kte_kth;
 	struct ktr_sysret *ktr = (struct ktr_sysret *)(kth + 1);
 	struct ktr_entry *emul;
 	struct ktr_entry *genio;
 	struct ktr_entry *syscall_ent;
 @@ -684,52 +684,52 @@ ktrsysret(struct ktr_entry *kte)
 	if (emul != NULL) {
 		newline();
 		ktremul(emul);
+	}
 	flushpendq(kte);
 	free(kte);
+}
 void
 nameiprint(struct ktr_header *kth)
+{
-	wprintf("\"%.*s\"", kth->ktr_len, (char *)(kth + 1));
+	xwprintf("\"%.*s\"", kth->ktr_len, (char *)(kth + 1));
+}
 #ifdef notused
 void
 ktrnamei(struct ktr_entry *kte)
+{
 	struct ktr_header *kth = &kte->kte_kth;
 	dumpheader(kth);
-	wprintf("namei(");
+	xwprintf("namei(");
 	nameiprint(kth);
-	wprintf(")");
+	xwprintf(")");
 	free(kte);
+}
 #endif
 void
 ktremul(struct ktr_entry *kte)
+{
 	struct ktr_header *kth = &kte->kte_kth;
 	char *emul = (char *)(kth + 1);
 	dumpheader(kth);
-	wprintf("emul(%s)", emul);
+	xwprintf("emul(%s)", emul);
 	setemul(emul, kth->ktr_pid, 1);
 	free(kte);
+}
 void
 genioprint(struct ktr_header *kth)
+{
 	struct ktr_genio *ktr = (struct ktr_genio *)(kth + 1);
 	static int screenwidth = 0;
 	int datalen = kth->ktr_len - sizeof(struct ktr_genio);
 	/*
 	 * Need to be unsigned type so that positive value is passed
 @@ -742,76 +742,76 @@ genioprint(struct ktr_header *kth)
 	if (screenwidth == 0) {
 		struct winsize ws;
 		if (fancy && ioctl(fileno(stderr), TIOCGWINSZ, &ws) != -1 &&
 		    ws.ws_col > 8)
 			screenwidth = ws.ws_col;
 		else
 			screenwidth = 80;
+	}
 	if (maxdata && datalen > maxdata)
 		datalen = maxdata;
 	newline();
-	wprintf("       \"");
+	xwprintf("       \"");
 	for (; datalen > 0; datalen--, dp++) {
 		(void) vis(visbuf, *dp, VIS_NL|VIS_TAB|VIS_CSTYLE,
 		    /* We put NUL at the end of buffer when reading */
 		    *(dp + 1));
 		visbuf[4] = '\0';
 		w = strlen(visbuf);
 		if (width + w + 2 >= screenwidth)
 			break;
-		wprintf("%s", visbuf);
+		xwprintf("%s", visbuf);
 		if (width + 2 >= screenwidth)
 			break;
+	}
-	wprintf("\"");
+	xwprintf("\"");
+}
 #ifdef notused
 void
 ktrgenio(struct ktr_entry *kte)
+{
 	struct ktr_header *kth = &kte->kte_kth;
 	struct ktr_genio *ktr = (struct ktr_genio *)(kth + 1);
 	dumpheader(kth);
-	wprintf("genio fd %d %s",
+	xwprintf("genio fd %d %s",
 	    ktr->ktr_fd, ktr->ktr_rw ? "write" : "read");
 	genioprint(kth);
 	free(kte);
+}
 #endif
 void
 ktrpsig(struct ktr_entry *kte)
+{
 	struct ktr_header *kth = &kte->kte_kth;
 	struct ktr_psig *psig = (struct ktr_psig *)(kth + 1);
 	dumpheader(kth);
-	wprintf("SIG%s ", sys_signame[psig->signo]);
+	xwprintf("SIG%s ", sys_signame[psig->signo]);
 	if (psig->action == SIG_DFL)
-		wprintf("SIG_DFL");
+		xwprintf("SIG_DFL");
 	else {
-		wprintf("caught handler=0x%lx mask=0x%lx code=0x%x",
+		xwprintf("caught handler=0x%lx mask=0x%lx code=0x%x",
 		    (u_long)psig->action, (unsigned long)psig->mask.__bits[0],
 		    psig->code);
+	}
 	free(kte);
+}
 void
 ktrcsw(struct ktr_entry *kte)
+{
 	struct ktr_header *kth = &kte->kte_kth;
 	struct ktr_csw *cs = (struct ktr_csw *)(kth + 1);
 	dumpheader(kth);
-	wprintf("%s %s", cs->out ? "stop" : "resume",
+	xwprintf("%s %s", cs->out ? "stop" : "resume",
 	    cs->user ? "user" : "kernel");
 	free(kte);
+}