===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/Attic/initscan.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/lex/Attic/initscan.c	2002/05/30 10:53:44	1.7
--- src/usr.bin/lex/Attic/initscan.c	2002/05/31 00:56:21	1.8
***************
*** 1,10 ****
! /*	$OpenBSD: initscan.c,v 1.7 2002/05/30 10:53:44 deraadt Exp $	*/
  
  #line 2 "scan.c"
  /* A lexical scanner generated by flex */
  
  /* Scanner skeleton version:
!  * $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/Attic/initscan.c,v 1.7 2002/05/30 10:53:44 deraadt Exp $
   */
  
  #define FLEX_SCANNER
--- 1,10 ----
! /*	$OpenBSD: initscan.c,v 1.8 2002/05/31 00:56:21 deraadt Exp $	*/
  
  #line 2 "scan.c"
  /* A lexical scanner generated by flex */
  
  /* Scanner skeleton version:
!  * $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/Attic/initscan.c,v 1.8 2002/05/31 00:56:21 deraadt Exp $
   */
  
  #define FLEX_SCANNER
***************
*** 1272,1278 ****
   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
! /* $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/Attic/initscan.c,v 1.7 2002/05/30 10:53:44 deraadt Exp $ */
  
  #include "flexdef.h"
  #include "parse.h"
--- 1272,1278 ----
   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
! /* $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/Attic/initscan.c,v 1.8 2002/05/31 00:56:21 deraadt Exp $ */
  
  #include "flexdef.h"
  #include "parse.h"
***************
*** 1294,1300 ****
  	return CHAR;
  
  #define RETURNNAME \
! 	strlcpy( nmstr, yytext, sizeof nmstr ); \
  	return NAME;
  
  #define PUT_BACK_STRING(str, start) \
--- 1294,1300 ----
  	return CHAR;
  
  #define RETURNNAME \
! 	strcpy( nmstr, yytext ); \
  	return NAME;
  
  #define PUT_BACK_STRING(str, start) \
***************
*** 1667,1673 ****
  YY_RULE_SETUP
  #line 138 "scan.l"
  {
! 			strlcpy( nmstr, yytext, sizeof nmstr );
  			didadef = false;
  			BEGIN(PICKUPDEF);
  			}
--- 1667,1673 ----
  YY_RULE_SETUP
  #line 138 "scan.l"
  {
! 			strcpy( nmstr, yytext );
  			didadef = false;
  			BEGIN(PICKUPDEF);
  			}
***************
*** 1768,1774 ****
  YY_RULE_SETUP
  #line 186 "scan.l"
  {
! 			strlcpy( (char *) nmdef, yytext, sizeof nmdef );
  
  			/* Skip trailing whitespace. */
  			for ( i = strlen( (char *) nmdef ) - 1;
--- 1768,1774 ----
  YY_RULE_SETUP
  #line 186 "scan.l"
  {
! 			strcpy( (char *) nmdef, yytext );
  
  			/* Skip trailing whitespace. */
  			for ( i = strlen( (char *) nmdef ) - 1;
***************
*** 2046,2052 ****
  YY_RULE_SETUP
  #line 279 "scan.l"
  {
! 			strlcpy( nmstr, yytext + 1, sizeof nmstr );
  			nmstr[strlen( nmstr ) - 1] = '\0';
  			return NAME;
  			}
--- 2046,2052 ----
  YY_RULE_SETUP
  #line 279 "scan.l"
  {
! 			strcpy( nmstr, yytext + 1 );
  			nmstr[strlen( nmstr ) - 1] = '\0';
  			return NAME;
  			}
***************
*** 2257,2263 ****
  {
  			int cclval;
  
! 			strlcpy( nmstr, yytext, sizeof nmstr );
  
  			/* Check to see if we've already encountered this
  			 * ccl.
--- 2257,2263 ----
  {
  			int cclval;
  
! 			strcpy( nmstr, yytext );
  
  			/* Check to see if we've already encountered this
  			 * ccl.
***************
*** 2295,2301 ****
  			Char *nmdefptr;
  			Char *ndlookup();
  
! 			strlcpy( nmstr, yytext + 1, sizeof nmstr );
  			nmstr[yyleng - 2] = '\0';  /* chop trailing brace */
  
  			if ( (nmdefptr = ndlookup( nmstr )) == 0 )
--- 2295,2301 ----
  			Char *nmdefptr;
  			Char *ndlookup();
  
! 			strcpy( nmstr, yytext + 1 );
  			nmstr[yyleng - 2] = '\0';  /* chop trailing brace */
  
  			if ( (nmdefptr = ndlookup( nmstr )) == 0 )