===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/toke.l,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/sudo/Attic/toke.l	2009/07/19 23:16:29	1.5
--- src/usr.bin/sudo/Attic/toke.l	2009/12/07 18:43:11	1.6
***************
*** 72,81 ****
  #include <gram.h>
  
  #ifndef lint
! __unused static const char rcsid[] = "$Sudo: toke.l,v 1.38 2009/07/18 13:55:37 millert Exp $";
  #endif /* lint */
  
  extern YYSTYPE yylval;
  int sudolineno = 1;
  char *sudoers;
  static int sawspace = 0;
--- 72,82 ----
  #include <gram.h>
  
  #ifndef lint
! __unused static const char rcsid[] = "$Sudo: toke.l,v 1.40 2009/11/22 14:54:04 millert Exp $";
  #endif /* lint */
  
  extern YYSTYPE yylval;
+ extern int parse_error;
  int sudolineno = 1;
  char *sudoers;
  static int sawspace = 0;
***************
*** 253,260 ****
  
  			    LEXTRACE("INCLUDEDIR\n");
  
! 			    /* Push current buffer and switch to include file */
! 			    if (!push_includedir(path))
  				yyterminate();
  			}
  
--- 254,264 ----
  
  			    LEXTRACE("INCLUDEDIR\n");
  
! 			    /*
! 			     * Push current buffer and switch to include file.
! 			     * We simply ignore empty directories.
! 			     */
! 			    if (!push_includedir(path) && parse_error)
  				yyterminate();
  			}
  
***************
*** 748,754 ****
  
      if (!(dir = opendir(dirpath))) {
  	yyerror(dirpath);
! 	return(FALSE);
      }
      while ((dent = readdir(dir))) {
  	/* Ignore files that end in '~' or have a '.' in them. */
--- 752,758 ----
  
      if (!(dir = opendir(dirpath))) {
  	yyerror(dirpath);
! 	return(NULL);
      }
      while ((dent = readdir(dir))) {
  	/* Ignore files that end in '~' or have a '.' in them. */
***************
*** 873,884 ****
      }
      if (isdir) {
  	if (!(path = switch_dir(&istack[idepth], path))) {
! 	    yyerror(path);
  	    return(FALSE);
  	}
  	if ((fp = open_sudoers(path, FALSE, &keepopen)) == NULL) {
  	    yyerror(path);
! 	    return(FALSE); /* XXX - just to go next one? */
  	}
      } else {
  	if ((fp = open_sudoers(path, TRUE, &keepopen)) == NULL) {
--- 877,888 ----
      }
      if (isdir) {
  	if (!(path = switch_dir(&istack[idepth], path))) {
! 	    /* switch_dir() called yyerror() for us */
  	    return(FALSE);
  	}
  	if ((fp = open_sudoers(path, FALSE, &keepopen)) == NULL) {
  	    yyerror(path);
! 	    return(FALSE); /* XXX - just to go next one */
  	}
      } else {
  	if ((fp = open_sudoers(path, TRUE, &keepopen)) == NULL) {
***************
*** 918,924 ****
  	istack[idepth - 1].more = pl->next;
  	if ((fp = open_sudoers(pl->path, FALSE, &keepopen)) == NULL) {
  	    yyerror(pl->path);
! 	    return(FALSE); /* XXX - just to go next one? */
  	}
  	efree(sudoers);
  	sudoers = pl->path;
--- 922,928 ----
  	istack[idepth - 1].more = pl->next;
  	if ((fp = open_sudoers(pl->path, FALSE, &keepopen)) == NULL) {
  	    yyerror(pl->path);
! 	    return(FALSE); /* XXX - just to go next one */
  	}
  	efree(sudoers);
  	sudoers = pl->path;