===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tr/tr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/tr/tr.c	1997/07/25 21:05:45	1.4
--- src/usr.bin/tr/tr.c	1997/07/25 21:14:04	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: tr.c,v 1.4 1997/07/25 21:05:45 mickey Exp $	*/
  /*	$NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: tr.c,v 1.5 1997/07/25 21:14:04 mickey Exp $	*/
  /*	$NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $	*/
  
  /*
***************
*** 44,50 ****
  #if 0
  static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
  #endif
! static char rcsid[] = "$OpenBSD: tr.c,v 1.4 1997/07/25 21:05:45 mickey Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 44,50 ----
  #if 0
  static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
  #endif
! static char rcsid[] = "$OpenBSD: tr.c,v 1.5 1997/07/25 21:14:04 mickey Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 53,58 ****
--- 53,59 ----
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
+ #include <err.h>
  
  #include "extern.h"
  
***************
*** 205,211 ****
  			*p++ = OOBCH;
  
  	if (!next(&s2))
! 		err("empty string2");
  
  	/* If string2 runs out of characters, use the last one specified. */
  	if (sflag)
--- 206,212 ----
  			*p++ = OOBCH;
  
  	if (!next(&s2))
! 		errx(1, "empty string2");
  
  	/* If string2 runs out of characters, use the last one specified. */
  	if (sflag)
***************
*** 264,296 ****
  	(void)fprintf(stderr, "       tr [-c] -s string1\n");
  	(void)fprintf(stderr, "       tr [-c] -ds string1 string2\n");
  	exit(1);
- }
- 
- #ifdef __STDC__
- #include <stdarg.h>
- #else
- #include <varargs.h>
- #endif
- 
- void
- #ifdef __STDC__
- err(const char *fmt, ...)
- #else
- err(fmt, va_alist)
- 	char *fmt;
-         va_dcl
- #endif
- {
- 	va_list ap;
- #ifdef __STDC__
- 	va_start(ap, fmt);
- #else
- 	va_start(ap);
- #endif
- 	(void)fprintf(stderr, "tr: ");
- 	(void)vfprintf(stderr, fmt, ap);
- 	va_end(ap);
- 	(void)fprintf(stderr, "\n");
- 	exit(1);
- 	/* NOTREACHED */
  }
--- 265,268 ----