===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/kdump/kdump.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -c -r1.87 -r1.88
*** src/usr.bin/kdump/kdump.c	2014/08/17 22:25:53	1.87
--- src/usr.bin/kdump/kdump.c	2014/08/18 03:29:53	1.88
***************
*** 1,4 ****
! /*	$OpenBSD: kdump.c,v 1.87 2014/08/17 22:25:53 guenther Exp $	*/
  
  /*-
   * Copyright (c) 1988, 1993
--- 1,4 ----
! /*	$OpenBSD: kdump.c,v 1.88 2014/08/18 03:29:53 guenther Exp $	*/
  
  /*-
   * Copyright (c) 1988, 1993
***************
*** 163,168 ****
--- 163,169 ----
  static void flagsandmodename(int, int);
  static void clockname(int);
  static void sockoptlevelname(int);
+ static void ktraceopname(int);
  
  int
  main(int argc, char *argv[])
***************
*** 659,664 ****
--- 660,666 ----
  		pn(mlockallname);
  		break;
  	case SYS_mmap:
+ 	case SYS_mquery:
  		pn(NULL);
  		pn(NULL);
  		pn(mmapprotname);
***************
*** 674,690 ****
  		pn(NULL);
  		pn(mmapprotname);
  		break;
- 	case SYS_mquery:
- 		pn(NULL);
- 		pn(NULL);
- 		pn(mmapprotname);
- 		pn(mmapflagsname);
- 		pn(NULL);
- 		/* skip padding */
- 		ap++;
- 		narg--;
- 		plln();
- 		break;
  	case SYS_msync:
  		pn(NULL);
  		pn(NULL);
--- 676,681 ----
***************
*** 898,904 ****
  		break;
  	case SYS_ktrace:
  		pn(NULL);
! 		pn(NULL);
  		pn(ktracefacname);
  		pn(pgid);
  		break;
--- 889,895 ----
  		break;
  	case SYS_ktrace:
  		pn(NULL);
! 		pn(ktraceopname);
  		pn(ktracefacname);
  		pn(pgid);
  		break;
***************
*** 933,940 ****
  static struct ctlname kernmallocname[] = CTL_KERN_MALLOC_NAMES;
  static struct ctlname forkstatname[] = CTL_KERN_FORKSTAT_NAMES;
  static struct ctlname nchstatsname[] = CTL_KERN_NCHSTATS_NAMES;
! static struct ctlname kernprocname[] =
! {
  	{ NULL },
  	{ "all" },
  	{ "pid" },
--- 924,930 ----
  static struct ctlname kernmallocname[] = CTL_KERN_MALLOC_NAMES;
  static struct ctlname forkstatname[] = CTL_KERN_FORKSTAT_NAMES;
  static struct ctlname nchstatsname[] = CTL_KERN_NCHSTATS_NAMES;
! static struct ctlname kernprocname[] = {
  	{ NULL },
  	{ "all" },
  	{ "pid" },
***************
*** 1445,1451 ****
  }
  
  static void
! shmctlname(int cmd) {
  	switch (cmd) {
  	case IPC_RMID:
  		(void)printf("IPC_RMID");
--- 1435,1442 ----
  }
  
  static void
! shmctlname(int cmd)
! {
  	switch (cmd) {
  	case IPC_RMID:
  		(void)printf("IPC_RMID");
***************
*** 1463,1469 ****
  
  
  static void
! semgetname(int flag) {
  	int	or = 0;
  	if_print_or(flag, IPC_CREAT, or);
  	if_print_or(flag, IPC_EXCL, or);
--- 1454,1461 ----
  
  
  static void
! semgetname(int flag)
! {
  	int	or = 0;
  	if_print_or(flag, IPC_CREAT, or);
  	if_print_or(flag, IPC_EXCL, or);
***************
*** 1481,1487 ****
   * mode argument is unused (and often bogus and misleading).
   */
  static void
! flagsandmodename(int flags, int mode) {
  	flagsname (flags);
  	if ((flags & O_CREAT) == O_CREAT) {
  		(void)putchar(',');
--- 1473,1480 ----
   * mode argument is unused (and often bogus and misleading).
   */
  static void
! flagsandmodename(int flags, int mode)
! {
  	flagsname (flags);
  	if ((flags & O_CREAT) == O_CREAT) {
  		(void)putchar(',');
***************
*** 1523,1525 ****
--- 1516,1544 ----
  	}
  }
  
+ static void
+ ktraceopname(int ops)
+ {
+ 	int invalid = 0;
+ 
+ 	printf("%#x<", ops);
+ 	switch (KTROP(ops)) {
+ 	case KTROP_SET:
+ 		printf("KTROP_SET");
+ 		break;
+ 	case KTROP_CLEAR:
+ 		printf("KTROP_CLEAR");
+ 		break;
+ 	case KTROP_CLEARFILE:
+ 		printf("KTROP_CLEARFILE");
+ 		break;
+ 	default:
+ 		printf("KTROP(%d)", KTROP(ops));
+ 		invalid = 1;
+ 		break;
+ 	}
+ 	if (ops & KTRFLAG_DESCEND) printf ("|%s", "KTRFLAG_DESCEND");
+ 	printf(">");
+ 	if (invalid || (ops & ~(KTROP((unsigned)-1) | KTRFLAG_DESCEND)))
+ 		(void)printf("<invalid>%ld", (long)ops);
+ }