===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/scan.l,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/lex/scan.l	2001/06/17 07:30:42	1.4
--- src/usr.bin/lex/scan.l	2002/05/30 10:53:45	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: scan.l,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
  
  /* scan.l - scanner for flex input */
  
--- 1,4 ----
! /*	$OpenBSD: scan.l,v 1.5 2002/05/30 10:53:45 deraadt Exp $	*/
  
  /* scan.l - scanner for flex input */
  
***************
*** 29,35 ****
   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
! /* $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/scan.l,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
  
  #include "flexdef.h"
  #include "parse.h"
--- 29,35 ----
   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
! /* $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/scan.l,v 1.5 2002/05/30 10:53:45 deraadt Exp $ */
  
  #include "flexdef.h"
  #include "parse.h"
***************
*** 51,57 ****
  	return CHAR;
  
  #define RETURNNAME \
! 	strcpy( nmstr, yytext ); \
  	return NAME;
  
  #define PUT_BACK_STRING(str, start) \
--- 51,57 ----
  	return CHAR;
  
  #define RETURNNAME \
! 	strlcpy( nmstr, yytext, sizeof nmstr); \
  	return NAME;
  
  #define PUT_BACK_STRING(str, start) \
***************
*** 138,144 ****
  	^"%"[^sxaceknopr{}].*	synerr( _( "unrecognized '%' directive" ) );
  
  	^{NAME}		{
! 			strcpy( nmstr, yytext );
  			didadef = false;
  			BEGIN(PICKUPDEF);
  			}
--- 138,144 ----
  	^"%"[^sxaceknopr{}].*	synerr( _( "unrecognized '%' directive" ) );
  
  	^{NAME}		{
! 			strlcpy( nmstr, yytext, sizeof nmstr );
  			didadef = false;
  			BEGIN(PICKUPDEF);
  			}
***************
*** 186,192 ****
  	{WS}		/* separates name and definition */
  
  	{NOT_WS}.*	{
! 			strcpy( (char *) nmdef, yytext );
  
  			/* Skip trailing whitespace. */
  			for ( i = strlen( (char *) nmdef ) - 1;
--- 186,192 ----
  	{WS}		/* separates name and definition */
  
  	{NOT_WS}.*	{
! 			strlcpy( (char *) nmdef, yytext, sizeof nmdef);
  
  			/* Skip trailing whitespace. */
  			for ( i = strlen( (char *) nmdef ) - 1;
***************
*** 279,286 ****
  	yyclass		return OPT_YYCLASS;
  
  	\"[^"\n]*\"	{
! 			strcpy( nmstr, yytext + 1 );
! 			nmstr[strlen( nmstr ) - 1] = '\0';
  			return NAME;
  			}
  
--- 279,285 ----
  	yyclass		return OPT_YYCLASS;
  
  	\"[^"\n]*\"	{
! 			strlcpy( nmstr, yytext + 1, sizeof nmstr);
  			return NAME;
  			}
  
***************
*** 403,409 ****
  	"["({FIRST_CCL_CHAR}|{CCL_EXPR})({CCL_CHAR}|{CCL_EXPR})*	{
  			int cclval;
  
! 			strcpy( nmstr, yytext );
  
  			/* Check to see if we've already encountered this
  			 * ccl.
--- 402,408 ----
  	"["({FIRST_CCL_CHAR}|{CCL_EXPR})({CCL_CHAR}|{CCL_EXPR})*	{
  			int cclval;
  
! 			strlcpy( nmstr, yytext, sizeof nmstr);
  
  			/* Check to see if we've already encountered this
  			 * ccl.
***************
*** 438,444 ****
  			register Char *nmdefptr;
  			Char *ndlookup();
  
! 			strcpy( nmstr, yytext + 1 );
  			nmstr[yyleng - 2] = '\0';  /* chop trailing brace */
  
  			if ( (nmdefptr = ndlookup( nmstr )) == 0 )
--- 437,443 ----
  			register Char *nmdefptr;
  			Char *ndlookup();
  
! 			strlcpy( nmstr, yytext + 1, sizeof nmstr );
  			nmstr[yyleng - 2] = '\0';  /* chop trailing brace */
  
  			if ( (nmdefptr = ndlookup( nmstr )) == 0 )