===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tr/tr.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/tr/tr.c	2004/05/09 03:20:20	1.12
--- src/usr.bin/tr/tr.c	2004/09/15 22:12:19	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: tr.c,v 1.12 2004/05/09 03:20:20 deraadt Exp $	*/
  /*	$NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: tr.c,v 1.13 2004/09/15 22:12:19 deraadt Exp $	*/
  /*	$NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $	*/
  
  /*
***************
*** 40,46 ****
  #if 0
  static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
  #endif
! static char rcsid[] = "$OpenBSD: tr.c,v 1.12 2004/05/09 03:20:20 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 40,46 ----
  #if 0
  static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
  #endif
! static char rcsid[] = "$OpenBSD: tr.c,v 1.13 2004/09/15 22:12:19 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 192,199 ****
  	if (!isstring2)
  		usage();
  
! 	s1.str = argv[0];
! 	s2.str = argv[1];
  
  	if (cflag)
  		for (cnt = NCHARS, p = string1; cnt--;)
--- 192,199 ----
  	if (!isstring2)
  		usage();
  
! 	s1.str = (unsigned char *)argv[0];
! 	s2.str = (unsigned char *)argv[1];
  
  	if (cflag)
  		for (cnt = NCHARS, p = string1; cnt--;)
***************
*** 239,245 ****
  {
  	int cnt, *p;
  
! 	str->str = arg;
  	bzero(string, NCHARS * sizeof(int));
  	while (next(str))
  		string[str->lastch] = 1;
--- 239,245 ----
  {
  	int cnt, *p;
  
! 	str->str = (unsigned char *)arg;
  	bzero(string, NCHARS * sizeof(int));
  	while (next(str))
  		string[str->lastch] = 1;