mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-28 12:58:07 +00:00
Code Issues Releases Wiki Activity

Update the flex scanner to use a stack for its start conditions

Browse Source 
This is the first step in reducing the number of shared rules between the
different start conditions.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Kees Cook <kees@ubuntu.com>
This commit is contained in:
John Johansen 2012-01-02 16:48:24 -08:00
parent 98f196506a
commit 49142c74a5
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
parser/parser_lex.l
View File

@ -23,6 +23,7 @@
/* eliminates need to link with libfl */ /* eliminates need to link with libfl */
%option noyywrap %option noyywrap
%option nounput %option nounput
%option stack
%{ %{
#include <stdio.h> #include <stdio.h>
@ -221,7 +222,7 @@ LT_EQUAL <=
filename[strlen(filename) - 1] = '\0'; filename[strlen(filename) - 1] = '\0';
include_filename(filename + 1, 1); include_filename(filename + 1, 1);
free(filename); free(filename);
BEGIN(INITIAL); yy_pop_state();
} }
\"([^\" \t\n]+)\" { /* "filename" */ \"([^\" \t\n]+)\" { /* "filename" */
@ -229,12 +230,12 @@ LT_EQUAL <=
filename[strlen(filename) - 1] = '\0'; filename[strlen(filename) - 1] = '\0';
include_filename(filename + 1, 0); include_filename(filename + 1, 0);
free(filename); free(filename);
BEGIN(INITIAL); yy_pop_state();
} }
[^\<\>\"{WS}]+ { /* filename */ [^\<\>\"{WS}]+ { /* filename */
include_filename(yytext, 0); include_filename(yytext, 0);
BEGIN(INITIAL); yy_pop_state();
} }
} }
@ -257,7 +258,7 @@ LT_EQUAL <=
DUMP_PREPROCESS; DUMP_PREPROCESS;
yylval.id = processunquoted(yytext, yyleng); yylval.id = processunquoted(yytext, yyleng);
PDEBUG("Found sub name: \"%s\"\n", yylval.id); PDEBUG("Found sub name: \"%s\"\n", yylval.id);
BEGIN(INITIAL); yy_pop_state();
return TOK_ID; return TOK_ID;
} }
{QUOTED_ID} { {QUOTED_ID} {
@ -271,7 +272,7 @@ LT_EQUAL <=
DUMP_PREPROCESS; DUMP_PREPROCESS;
yylval.id = processquoted(yytext, yyleng); yylval.id = processquoted(yytext, yyleng);
PDEBUG("Found sub name: \"%s\"\n", yylval.id); PDEBUG("Found sub name: \"%s\"\n", yylval.id);
BEGIN(INITIAL); yy_pop_state();
return TOK_ID; return TOK_ID;
} }
@ -294,7 +295,7 @@ LT_EQUAL <=
DUMP_PREPROCESS; DUMP_PREPROCESS;
yylval.id = processunquoted(yytext, yyleng); yylval.id = processunquoted(yytext, yyleng);
PDEBUG("Found sub name: \"%s\"\n", yylval.id); PDEBUG("Found sub name: \"%s\"\n", yylval.id);
BEGIN(INITIAL); yy_pop_state();
return TOK_ID; return TOK_ID;
} }
{QUOTED_ID} { {QUOTED_ID} {
@ -308,7 +309,7 @@ LT_EQUAL <=
DUMP_PREPROCESS; DUMP_PREPROCESS;
yylval.id = processquoted(yytext, yyleng); yylval.id = processquoted(yytext, yyleng);
PDEBUG("Found sub name: \"%s\"\n", yylval.id); PDEBUG("Found sub name: \"%s\"\n", yylval.id);
BEGIN(INITIAL); yy_pop_state();
return TOK_ID; return TOK_ID;
} }
@ -329,7 +330,7 @@ LT_EQUAL <=
{FLAGCLOSE_PAREN} { {FLAGCLOSE_PAREN} {
DUMP_PREPROCESS; DUMP_PREPROCESS;
PDEBUG("Flag )\n"); PDEBUG("Flag )\n");
BEGIN(INITIAL); yy_pop_state();
return TOK_FLAG_CLOSEPAREN; return TOK_FLAG_CLOSEPAREN;
} }
@ -388,7 +389,7 @@ LT_EQUAL <=
\r?\n { \r?\n {
DUMP_PREPROCESS; DUMP_PREPROCESS;
current_lineno++; current_lineno++;
BEGIN(INITIAL); yy_pop_state();
} }
[^\n] { [^\n] {
DUMP_PREPROCESS; DUMP_PREPROCESS;
@ -407,7 +408,7 @@ LT_EQUAL <=
} }
{END_OF_RULE} { {END_OF_RULE} {
DUMP_PREPROCESS; DUMP_PREPROCESS;
BEGIN(INITIAL); yy_pop_state();
return TOK_END_OF_RULE; return TOK_END_OF_RULE;
} }
[^\n] { [^\n] {
@ -441,7 +442,7 @@ LT_EQUAL <=
DUMP_PREPROCESS; DUMP_PREPROCESS;
yylval.id = processunquoted(yytext, yyleng); yylval.id = processunquoted(yytext, yyleng);
PDEBUG("Found change profile name: \"%s\"\n", yylval.id); PDEBUG("Found change profile name: \"%s\"\n", yylval.id);
BEGIN(INITIAL); yy_pop_state();
return TOK_ID; return TOK_ID;
} }
{QUOTED_ID} { {QUOTED_ID} {
@ -455,7 +456,7 @@ LT_EQUAL <=
DUMP_PREPROCESS; DUMP_PREPROCESS;
yylval.id = processquoted(yytext, yyleng); yylval.id = processquoted(yytext, yyleng);
PDEBUG("Found change profile quoted name: \"%s\"\n", yylval.id); PDEBUG("Found change profile quoted name: \"%s\"\n", yylval.id);
BEGIN(INITIAL); yy_pop_state();
return TOK_ID; return TOK_ID;
} }
@ -489,26 +490,26 @@ LT_EQUAL <=
{END_OF_RULE} { {END_OF_RULE} {
DUMP_PREPROCESS; DUMP_PREPROCESS;
BEGIN(INITIAL); yy_pop_state();
return TOK_END_OF_RULE; return TOK_END_OF_RULE;
} }
\\\n { \\\n {
DUMP_PREPROCESS; DUMP_PREPROCESS;
current_lineno++; current_lineno++;
BEGIN(INITIAL); yy_pop_state();
} }
\r?\n { \r?\n {
DUMP_PREPROCESS; DUMP_PREPROCESS;
current_lineno++; current_lineno++;
BEGIN(INITIAL); yy_pop_state();
} }
} }
#include/.*\r?\n { /* include */ #include/.*\r?\n { /* include */
PDEBUG("Matched #include\n"); PDEBUG("Matched #include\n");
BEGIN(INCLUDE); yy_push_state(INCLUDE);
} }
#.*\r?\n { /* normal comment */ #.*\r?\n { /* normal comment */
@ -522,7 +523,7 @@ LT_EQUAL <=
{SEPARATOR} { {SEPARATOR} {
DUMP_PREPROCESS; DUMP_PREPROCESS;
PDEBUG("Matched a separator\n"); PDEBUG("Matched a separator\n");
BEGIN(SUB_NAME); yy_push_state(SUB_NAME);
return TOK_SEP; return TOK_SEP;
} }
{ARROW} { {ARROW} {
@ -533,13 +534,13 @@ LT_EQUAL <=
{EQUALS} { {EQUALS} {
DUMP_PREPROCESS; DUMP_PREPROCESS;
PDEBUG("Matched equals for assignment\n"); PDEBUG("Matched equals for assignment\n");
BEGIN(ASSIGN_MODE); yy_push_state(ASSIGN_MODE);
return TOK_EQUALS; return TOK_EQUALS;
} }
{ADD_ASSIGN} { {ADD_ASSIGN} {
DUMP_PREPROCESS; DUMP_PREPROCESS;
PDEBUG("Matched additive value assignment\n"); PDEBUG("Matched additive value assignment\n");
BEGIN(ASSIGN_MODE); yy_push_state(ASSIGN_MODE);
return TOK_ADD_ASSIGN; return TOK_ADD_ASSIGN;
} }
{SET_VARIABLE} { {SET_VARIABLE} {
@ -590,7 +591,7 @@ LT_EQUAL <=
{HAT} { {HAT} {
DUMP_PREPROCESS; DUMP_PREPROCESS;
BEGIN(SUB_NAME2); yy_push_state(SUB_NAME2);
return TOK_HAT; return TOK_HAT;
} }
@ -603,7 +604,7 @@ LT_EQUAL <=
{FLAGOPEN_PAREN} { {FLAGOPEN_PAREN} {
DUMP_PREPROCESS; DUMP_PREPROCESS;
PDEBUG("FLag (\n"); PDEBUG("FLag (\n");
BEGIN(FLAGS_MODE); yy_push_state(FLAGS_MODE);
return TOK_FLAG_OPENPAREN; return TOK_FLAG_OPENPAREN;
} }
@ -620,19 +621,19 @@ LT_EQUAL <=
return TOK_ID; return TOK_ID;
break; break;
case TOK_PROFILE: case TOK_PROFILE:
BEGIN(SUB_NAME2); yy_push_state(SUB_NAME2);
break; break;
case TOK_FLAGS: case TOK_FLAGS:
BEGIN(FLAGS_MODE); yy_push_state(FLAGS_MODE);
break; break;
case TOK_RLIMIT: case TOK_RLIMIT:
BEGIN(RLIMIT_MODE); yy_push_state(RLIMIT_MODE);
break; break;
case TOK_NETWORK: case TOK_NETWORK:
BEGIN(NETWORK_MODE); yy_push_state(NETWORK_MODE);
break; break;
case TOK_CHANGE_PROFILE: case TOK_CHANGE_PROFILE:
BEGIN(CHANGE_PROFILE_MODE); yy_push_state(CHANGE_PROFILE_MODE);
break; break;
default: /* nothing */ default: /* nothing */
break; break;