===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/generate.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/make/generate.c	2014/05/18 08:08:50	1.16
--- src/usr.bin/make/generate.c	2015/04/18 18:28:37	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: generate.c,v 1.16 2014/05/18 08:08:50 espie Exp $ */
  
  /*
   * Copyright (c) 2001 Marc Espie.
--- 1,4 ----
! /*	$OpenBSD: generate.c,v 1.17 2015/04/18 18:28:37 deraadt Exp $ */
  
  /*
   * Copyright (c) 2001 Marc Espie.
***************
*** 29,34 ****
--- 29,35 ----
  #include <stdint.h>
  #include <stdio.h>
  #include <stdlib.h>
+ #include <limits.h>
  #include <ohash.h>
  
  #include "stats.h"
***************
*** 137,142 ****
--- 138,144 ----
  	uint32_t v;
  	uint32_t h;
  	uint32_t slots;
+ 	const char *errstr;
  	const char *e;
  	char **occupied;
  	char **t;
***************
*** 146,156 ****
  	if (argc != 3)
  		exit(1);
  
! 	tn = atoi(argv[1]);
! 	if (!tn)
  		exit(1);
  	t = table[tn-1];
! 	slots = atoi(argv[2]);
  	if (slots) {
  		occupied = calloc(slots, sizeof(char *));
  		if (!occupied)
--- 148,160 ----
  	if (argc != 3)
  		exit(1);
  
! 	tn = strtonum(argv[1], 1, INT_MAX, &errstr);
! 	if (errstr)
  		exit(1);
  	t = table[tn-1];
! 	slots = strtonum(argv[2], 0, INT_MAX, &errstr);
! 	if (errstr)
! 		exit(1);
  	if (slots) {
  		occupied = calloc(slots, sizeof(char *));
  		if (!occupied)