===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/timeout/timeout.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/timeout/timeout.c	2021/09/02 08:52:10	1.14
--- src/usr.bin/timeout/timeout.c	2021/09/02 09:08:08	1.15
***************
*** 1,4 ****
! /* $OpenBSD: timeout.c,v 1.14 2021/09/02 08:52:10 job Exp $ */
  
  /*
   * Copyright (c) 2021 Job Snijders <job@openbsd.org>
--- 1,4 ----
! /* $OpenBSD: timeout.c,v 1.15 2021/09/02 09:08:08 deraadt Exp $ */
  
  /*
   * Copyright (c) 2021 Job Snijders <job@openbsd.org>
***************
*** 67,81 ****
  
  	ret = strtod(duration, &suffix);
  	if (ret == 0 && suffix == duration)
! 		err(1, "invalid duration");
  	if (ret < 0 || ret >= 100000000UL)
! 		err(1, "invalid duration");
  
  	if (suffix == NULL || *suffix == '\0')
  		return (ret);
  
  	if (suffix != NULL && *(suffix + 1) != '\0')
! 		err(1, "invalid duration");
  
  	switch (*suffix) {
  	case 's':
--- 67,81 ----
  
  	ret = strtod(duration, &suffix);
  	if (ret == 0 && suffix == duration)
! 		errx(1, "invalid duration");
  	if (ret < 0 || ret >= 100000000UL)
! 		errx(1, "invalid duration");
  
  	if (suffix == NULL || *suffix == '\0')
  		return (ret);
  
  	if (suffix != NULL && *(suffix + 1) != '\0')
! 		errx(1, "invalid duration");
  
  	switch (*suffix) {
  	case 's':
***************
*** 90,96 ****
  		ret *= 60 * 60 * 24;
  		break;
  	default:
! 		err(1, "invalid duration");
  	}
  
  	return (ret);
--- 90,96 ----
  		ret *= 60 * 60 * 24;
  		break;
  	default:
! 		errx(1, "invalid duration");
  	}
  
  	return (ret);
***************
*** 110,121 ****
  			if (strcasecmp(str, sys_signame[i]) == 0)
  				return (i);
  		}
! 		err(1, "invalid signal name");
  	}
  
  	sig = strtonum(str, 1, NSIG, &errstr);
  	if (errstr != NULL)
! 		err(1, "signal %s %s", str, errstr);
  
  	return (int)sig;
  }
--- 110,121 ----
  			if (strcasecmp(str, sys_signame[i]) == 0)
  				return (i);
  		}
! 		errx(1, "invalid signal name");
  	}
  
  	sig = strtonum(str, 1, NSIG, &errstr);
  	if (errstr != NULL)
! 		errx(1, "signal %s %s", str, errstr);
  
  	return (int)sig;
  }