===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/kdump/ktrstruct.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/kdump/ktrstruct.c	2014/01/24 04:26:51	1.3
--- src/usr.bin/kdump/ktrstruct.c	2014/06/22 23:50:45	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: ktrstruct.c,v 1.3 2014/01/24 04:26:51 guenther Exp $	*/
  
  /*-
   * Copyright (c) 1988, 1993
--- 1,4 ----
! /*	$OpenBSD: ktrstruct.c,v 1.4 2014/06/22 23:50:45 guenther Exp $	*/
  
  /*-
   * Copyright (c) 1988, 1993
***************
*** 61,70 ****
  {
  /*
   TODO: Support additional address families
! 	#include <netnatm/natm.h>
! 	struct sockaddr_natm	*natm;
! 	#include <netsmb/netbios.h>
! 	struct sockaddr_nb	*nb;
  */
  	char addr[64];
  
--- 61,70 ----
  {
  /*
   TODO: Support additional address families
! 	#include <netmpls/mpls.h>
! 	struct sockaddr_mpls	*mpls;
! 	#include <netbt/bluetooth.h>
! 	struct sockaddr_bt	*bt;
  */
  	char addr[64];
  
***************
*** 155,161 ****
  		printf("UTIME_NOW");
  	else if (tsp->tv_nsec == UTIME_OMIT)
  		printf("UTIME_OMIT");
! 	else {
  		print_time(tsp->tv_sec, relative);
  		if (tsp->tv_nsec != 0)
  			printf(".%09ld", tsp->tv_nsec);
--- 155,166 ----
  		printf("UTIME_NOW");
  	else if (tsp->tv_nsec == UTIME_OMIT)
  		printf("UTIME_OMIT");
! 	else if ((resolv == 0 || relative) && tsp->tv_sec < 0 &&
! 	    tsp->tv_nsec > 0) {
! 		/* negative relative times with non-zero nsecs require care */
! 		printf("-%jd.%09ld", -(intmax_t)(tsp->tv_sec+1),
! 		    1000000000 - tsp->tv_nsec);
! 	} else {
  		print_time(tsp->tv_sec, relative);
  		if (tsp->tv_nsec != 0)
  			printf(".%09ld", tsp->tv_nsec);
***************
*** 210,218 ****
  static void
  print_timeval(const struct timeval *tvp, int relative)
  {
! 	print_time(tvp->tv_sec, relative);
! 	if (tvp->tv_usec != 0)
! 		printf(".%06ld", tvp->tv_usec);
  }
  
  static void
--- 215,230 ----
  static void
  print_timeval(const struct timeval *tvp, int relative)
  {
! 	if ((resolv == 0 || relative) && tvp->tv_sec < 0 &&
! 	    tvp->tv_usec > 0) {
! 		/* negative relative times with non-zero usecs require care */
! 		printf("-%jd.%06ld", -(intmax_t)(tvp->tv_sec+1),
! 		    1000000 - tvp->tv_usec);
! 	} else {
! 		print_time(tvp->tv_sec, relative);
! 		if (tvp->tv_usec != 0)
! 			printf(".%06ld", tvp->tv_usec);
! 	}
  }
  
  static void