Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reverse the notion of fancy, use plain, and increment it so that we can

Browse Source 
have multiple levels of plainness. I want to be able to display syscalls
numerically, for that use -nn. This is not documented as it is an wip.
This commit is contained in:
christos 2002-02-12 22:22:37 +00:00
parent a3c74e7653
commit 35734831f9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.bin/kdump/kdump.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kdump.c,v 1.35 2001/02/16 23:28:44 manu Exp $ */ /* $NetBSD: kdump.c,v 1.36 2002/02/12 22:22:37 christos Exp $ */
/*- /*-
* Copyright (c) 1988, 1993 * Copyright (c) 1988, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95"; static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#else #else
__RCSID("$NetBSD: kdump.c,v 1.35 2001/02/16 23:28:44 manu Exp $"); __RCSID("$NetBSD: kdump.c,v 1.36 2002/02/12 22:22:37 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -70,7 +70,7 @@ __RCSID("$NetBSD: kdump.c,v 1.35 2001/02/16 23:28:44 manu Exp $");
#include <sys/syscall.h> #include <sys/syscall.h>
int timestamp, decimal, fancy = 1, tail, maxdata; int timestamp, decimal, plain, tail, maxdata;
const char *tracefile = DEF_TRACEFILE; const char *tracefile = DEF_TRACEFILE;
struct ktr_header ktr_header; struct ktr_header ktr_header;
int emul_changed = 0; int emul_changed = 0;
@ -138,7 +138,7 @@ main(argc, argv)
maxdata = atoi(optarg); maxdata = atoi(optarg);
break; break;
case 'n': case 'n':
fancy = 0; plain++;
break; break;
case 'R': case 'R':
timestamp = 2; /* relative timestamp */ timestamp = 2; /* relative timestamp */
@ -317,7 +317,7 @@ ktrsyscall(ktr)
ap = (register_t *)((char *)ktr + sizeof(struct ktr_syscall)); ap = (register_t *)((char *)ktr + sizeof(struct ktr_syscall));
if (argsize) { if (argsize) {
char c = '('; char c = '(';
if (fancy) { if (!plain) {
if (ktr->ktr_code == SYS_ioctl) { if (ktr->ktr_code == SYS_ioctl) {
char *cp; char *cp;
if (decimal) if (decimal)
@ -381,14 +381,14 @@ ktrsysret(ktr)
revelant = current; revelant = current;
emul_changed = 0; emul_changed = 0;
if (code >= revelant->nsysnames || code < 0) if (code >= revelant->nsysnames || code < 0 || plain > 1)
(void)printf("[%d] ", code); (void)printf("[%d] ", code);
else else
(void)printf("%s ", revelant->sysnames[code]); (void)printf("%s ", revelant->sysnames[code]);
switch (error) { switch (error) {
case 0: case 0:
if (fancy) { if (!plain) {
(void)printf("%ld", (long)ret); (void)printf("%ld", (long)ret);
if (ret < 0 || ret > 9) if (ret < 0 || ret > 9)
(void)printf("/%#lx", (long)ret); (void)printf("/%#lx", (long)ret);
@ -447,7 +447,7 @@ normal:
default: default:
(void)printf("-1 errno %d", e); (void)printf("-1 errno %d", e);
if (fancy) if (!plain)
(void)printf(" %s", strerror(i)); (void)printf(" %s", strerror(i));
} }
} }
@ -492,7 +492,7 @@ ktrgenio(ktr, len)
if (screenwidth == 0) { if (screenwidth == 0) {
struct winsize ws; struct winsize ws;
if (fancy && ioctl(fileno(stderr), TIOCGWINSZ, &ws) != -1 && if (!plain && ioctl(fileno(stderr), TIOCGWINSZ, &ws) != -1 &&
ws.ws_col > 8) ws.ws_col > 8)
screenwidth = ws.ws_col; screenwidth = ws.ws_col;
else else