===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/scanopt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/lex/scanopt.c	2015/11/19 22:16:43	1.2
--- src/usr.bin/lex/scanopt.c	2015/11/19 23:34:56	1.3
***************
*** 1,4 ****
! /* $OpenBSD: scanopt.c,v 1.2 2015/11/19 22:16:43 tedu Exp $ */
  
  /* flex - tool to generate fast lexical analyzers */
  
--- 1,4 ----
! /* $OpenBSD: scanopt.c,v 1.3 2015/11/19 23:34:56 mmcc Exp $ */
  
  /* flex - tool to generate fast lexical analyzers */
  
***************
*** 191,197 ****
  	s->aux = (struct _aux *) malloc (s->optc * sizeof (struct _aux));
  
  	for (i = 0; i < s->optc; i++) {
! 		const Char *p, *pname;
  		const struct optspec_t *opt;
  		struct _aux *aux;
  
--- 191,197 ----
  	s->aux = (struct _aux *) malloc (s->optc * sizeof (struct _aux));
  
  	for (i = 0; i < s->optc; i++) {
! 		const u_char *p, *pname;
  		const struct optspec_t *opt;
  		struct _aux *aux;
  
***************
*** 202,212 ****
  
  		if (opt->opt_fmt[0] == '-' && opt->opt_fmt[1] == '-') {
  			aux->flags |= IS_LONG;
! 			pname = (const Char *)(opt->opt_fmt + 2);
  			s->has_long = 1;
  		}
  		else {
! 			pname = (const Char *)(opt->opt_fmt + 1);
  			s->has_short = 1;
  		}
  		aux->printlen = strlen (opt->opt_fmt);
--- 202,212 ----
  
  		if (opt->opt_fmt[0] == '-' && opt->opt_fmt[1] == '-') {
  			aux->flags |= IS_LONG;
! 			pname = (const u_char *)(opt->opt_fmt + 2);
  			s->has_long = 1;
  		}
  		else {
! 			pname = (const u_char *)(opt->opt_fmt + 1);
  			s->has_short = 1;
  		}
  		aux->printlen = strlen (opt->opt_fmt);
***************
*** 483,489 ****
  
  					while (*p && n < maxlen[1]
  					       && *p != '\n') {
! 						if (isspace ((Char)(*p))
  						    || *p == '-') lastws =
  								p;
  						n++;
--- 483,489 ----
  
  					while (*p && n < maxlen[1]
  					       && *p != '\n') {
! 						if (isspace ((u_char)(*p))
  						    || *p == '-') lastws =
  								p;
  						n++;