===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/timeout/timeout.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/timeout/timeout.c	2021/09/02 21:50:24	1.18
--- src/usr.bin/timeout/timeout.c	2021/09/04 11:49:11	1.19
***************
*** 1,4 ****
! /* $OpenBSD: timeout.c,v 1.18 2021/09/02 21:50:24 jmc Exp $ */
  
  /*
   * Copyright (c) 2021 Job Snijders <job@openbsd.org>
--- 1,4 ----
! /* $OpenBSD: timeout.c,v 1.19 2021/09/04 11:49:11 schwarze Exp $ */
  
  /*
   * Copyright (c) 2021 Job Snijders <job@openbsd.org>
***************
*** 69,83 ****
  
  	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':
--- 69,83 ----
  
  	ret = strtod(duration, &suffix);
  	if (ret == 0 && suffix == duration)
! 		errx(1, "duration is not a number");
  	if (ret < 0 || ret >= 100000000UL)
! 		errx(1, "duration out of range");
  
  	if (suffix == NULL || *suffix == '\0')
  		return (ret);
  
! 	if (suffix[1] != '\0')
! 		errx(1, "duration unit suffix too long");
  
  	switch (*suffix) {
  	case 's':
***************
*** 92,98 ****
  		ret *= 60 * 60 * 24;
  		break;
  	default:
! 		errx(1, "invalid duration");
  	}
  
  	return (ret);
--- 92,98 ----
  		ret *= 60 * 60 * 24;
  		break;
  	default:
! 		errx(1, "duration unit suffix is invalid");
  	}
  
  	return (ret);
***************
*** 253,259 ****
  		signal(SIGTTOU, SIG_DFL);
  
  		execvp(argv[0], argv);
! 		err(1, "execvp");
  	}
  
  	/* parent continues here */
--- 253,259 ----
  		signal(SIGTTOU, SIG_DFL);
  
  		execvp(argv[0], argv);
! 		err(1, "%s", argv[0]);
  	}
  
  	/* parent continues here */