===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/hexdump/hexdump.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/hexdump/hexdump.c	2011/09/22 09:09:42	1.16
--- src/usr.bin/hexdump/hexdump.c	2015/01/16 06:40:08	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: hexdump.c,v 1.16 2011/09/22 09:09:42 stsp Exp $	*/
  /*	$NetBSD: hexdump.c,v 1.7 1997/10/19 02:34:06 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: hexdump.c,v 1.17 2015/01/16 06:40:08 deraadt Exp $	*/
  /*	$NetBSD: hexdump.c,v 1.7 1997/10/19 02:34:06 lukem Exp $	*/
  
  /*
***************
*** 30,42 ****
   * SUCH DAMAGE.
   */
  
- #include <sys/param.h>
  #include <err.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include "hexdump.h"
  
  FS *fshead;				/* head of format strings */
  int blocksize;				/* data block size */
  int exitval;				/* final exit value */
--- 30,43 ----
   * SUCH DAMAGE.
   */
  
  #include <err.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include "hexdump.h"
  
+ #define MINIMUM(a, b)	(((a) < (b)) ? (a) : (b))
+ 
  FS *fshead;				/* head of format strings */
  int blocksize;				/* data block size */
  int exitval;				/* final exit value */
***************
*** 64,70 ****
  			blocksize = tfs->bcnt;
  	}
  	if (length != -1) {
! 		iobufsiz = MIN(length, blocksize);
  		if ((iobuf = malloc(iobufsiz)) == NULL)
  			err(1, NULL);
  	}
--- 65,71 ----
  			blocksize = tfs->bcnt;
  	}
  	if (length != -1) {
! 		iobufsiz = MINIMUM(length, blocksize);
  		if ((iobuf = malloc(iobufsiz)) == NULL)
  			err(1, NULL);
  	}