===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/banner/banner.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/banner/banner.c	1996/06/26 05:31:33	1.2
--- src/usr.bin/banner/banner.c	1998/12/07 20:09:40	1.3
***************
*** 1,4 ****
! /*	$OpenBSD: banner.c,v 1.2 1996/06/26 05:31:33 deraadt Exp $	*/
  /*	$NetBSD: banner.c,v 1.2 1995/04/09 06:00:15 cgd Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: banner.c,v 1.3 1998/12/07 20:09:40 deraadt Exp $	*/
  /*	$NetBSD: banner.c,v 1.2 1995/04/09 06:00:15 cgd Exp $	*/
  
  /*
***************
*** 62,72 ****
  #if 0
  static char sccsid[] = "@(#)printjob.c	8.2 (Berkeley) 4/16/94";
  #else
! static char rcsid[] = "$OpenBSD: banner.c,v 1.2 1996/06/26 05:31:33 deraadt Exp $";
  #endif
  #endif /* not lint */
  
  #include <stdio.h>
  
  #include "banner.h"
  
--- 62,75 ----
  #if 0
  static char sccsid[] = "@(#)printjob.c	8.2 (Berkeley) 4/16/94";
  #else
! static char rcsid[] = "$OpenBSD: banner.c,v 1.3 1998/12/07 20:09:40 deraadt Exp $";
  #endif
  #endif /* not lint */
  
  #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
  
  #include "banner.h"
  
***************
*** 80,86 ****
  	register char *p;
  	int c;
  {
! 	register scnwidth;
  
  	/*
  	 * <sjg> lpd makes chars out of the letter in question.
--- 83,89 ----
  	register char *p;
  	int c;
  {
! 	int scnwidth;
  
  	/*
  	 * <sjg> lpd makes chars out of the letter in question.
***************
*** 127,134 ****
  	int scfd, dlm;
  	char *scsp;
  {
! 	register char *strp;
! 	register nchrs, j;
  	char outbuf[LINELEN+1], *sp, c, cc;
  	int d, scnhgt;
  	extern char scnkey[][HEIGHT];	/* in lpdchar.c */
--- 130,137 ----
  	int scfd, dlm;
  	char *scsp;
  {
! 	char *strp;
! 	int nchrs, j;
  	char outbuf[LINELEN+1], *sp, c, cc;
  	int d, scnhgt;
  	extern char scnkey[][HEIGHT];	/* in lpdchar.c */
***************
*** 137,148 ****
  		strp = &outbuf[0];
  		sp = scsp;
  		for (nchrs = 0; ; ) {
! 			d = dropit(c = TRC(cc = *sp++));
  			if ((!d && scnhgt > HEIGHT) || (scnhgt <= DROP && d))
  				for (j = WIDTH; --j;)
  					*strp++ = BACKGND;
  			else
! 				strp = scnline(scnkey[c][scnhgt-1-d], strp, cc);
  			if (*sp == dlm || *sp == '\0' || nchrs++ >= PW/(WIDTH+1)-1)
  				break;
  			*strp++ = BACKGND;
--- 140,152 ----
  		strp = &outbuf[0];
  		sp = scsp;
  		for (nchrs = 0; ; ) {
! 			c = TRC(cc = *sp++);
! 			d = dropit(c);
  			if ((!d && scnhgt > HEIGHT) || (scnhgt <= DROP && d))
  				for (j = WIDTH; --j;)
  					*strp++ = BACKGND;
  			else
! 				strp = scnline(scnkey[(int)c][scnhgt-1-d], strp, cc);
  			if (*sp == dlm || *sp == '\0' || nchrs++ >= PW/(WIDTH+1)-1)
  				break;
  			*strp++ = BACKGND;