===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/opttbl.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/less/opttbl.c	2015/11/12 18:46:50	1.18
--- src/usr.bin/less/opttbl.c	2016/09/17 15:06:41	1.19
***************
*** 436,442 ****
  {
  	struct loption *o;
  
! 	for (o = option;  o->oletter != '\0';  o++) {
  		/*
  		 * Set each variable to its default.
  		 */
--- 436,442 ----
  {
  	struct loption *o;
  
! 	for (o = option; o->oletter != '\0'; o++) {
  		/*
  		 * Set each variable to its default.
  		 */
***************
*** 455,461 ****
  {
  	struct loption *o;
  
! 	for (o = option;  o->oletter != '\0';  o++) {
  		if (o->oletter == c)
  			return (o);
  		if ((o->otype & TRIPLE) &&
--- 455,461 ----
  {
  	struct loption *o;
  
! 	for (o = option; o->oletter != '\0'; o++) {
  		if (o->oletter == c)
  			return (o);
  		if ((o->otype & TRIPLE) &&
***************
*** 500,516 ****
  	/*
  	 * Check all options.
  	 */
! 	for (o = option;  o->oletter != '\0';  o++) {
  		/*
  		 * Check all names for this option.
  		 */
! 		for (oname = o->onames;  oname != NULL;  oname = oname->onext) {
  			/*
  			 * Try normal match first (uppercase == 0),
  			 * then, then if it's a TRIPLE option,
  			 * try uppercase match (uppercase == 1).
  			 */
! 			for (uppercase = 0;  uppercase <= 1;  uppercase++) {
  				len = sprefix(optname, oname->oname, uppercase);
  				if (len <= 0 || is_optchar(optname[len])) {
  					/*
--- 500,516 ----
  	/*
  	 * Check all options.
  	 */
! 	for (o = option; o->oletter != '\0'; o++) {
  		/*
  		 * Check all names for this option.
  		 */
! 		for (oname = o->onames; oname != NULL; oname = oname->onext) {
  			/*
  			 * Try normal match first (uppercase == 0),
  			 * then, then if it's a TRIPLE option,
  			 * try uppercase match (uppercase == 1).
  			 */
! 			for (uppercase = 0; uppercase <= 1; uppercase++) {
  				len = sprefix(optname, oname->oname, uppercase);
  				if (len <= 0 || is_optchar(optname[len])) {
  					/*