vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

a better fix

Browse source
This commit is contained in:
BVK Chaitanya 2010-06-12 11:06:02 +05:30
parent e2413da901
commit b06f83e3ba
3 changed files with 110 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/grub/script_sh.h
View file

@ -195,6 +195,12 @@ struct grub_lexer_param
/* Type of text. */ /* Type of text. */
grub_script_arg_type_t type; grub_script_arg_type_t type;
/* Flag to indicate resplit in progres. */
unsigned resplit;
/* Text that is unput. */
char *prefix;
/* Flex scanner. */ /* Flex scanner. */
void *yyscanner; void *yyscanner;
@ -284,7 +290,7 @@ void grub_script_lexer_ref (struct grub_lexer_param *);
void grub_script_lexer_deref (struct grub_lexer_param *); void grub_script_lexer_deref (struct grub_lexer_param *);
void grub_script_lexer_record_start (struct grub_parser_param *); void grub_script_lexer_record_start (struct grub_parser_param *);
char *grub_script_lexer_record_stop (struct grub_parser_param *); char *grub_script_lexer_record_stop (struct grub_parser_param *);
int grub_script_lexer_yywrap (struct grub_parser_param *); int grub_script_lexer_yywrap (struct grub_parser_param *, const char *input);
void grub_script_lexer_record (struct grub_parser_param *, char *); void grub_script_lexer_record (struct grub_parser_param *, char *);
/* Functions to track allocated memory. */ /* Functions to track allocated memory. */

126
script/lexer.c
View file

@ -98,8 +98,6 @@ grub_script_lexer_record_stop (struct grub_parser_param *parser)
return result; return result;
} }
#define MAX(a,b) ((a) < (b) ? (b) : (a))
/* Record STR if input recording is enabled. */ /* Record STR if input recording is enabled. */
void void
grub_script_lexer_record (struct grub_parser_param *parser, char *str) grub_script_lexer_record (struct grub_parser_param *parser, char *str)
@ -115,7 +113,7 @@ grub_script_lexer_record (struct grub_parser_param *parser, char *str)
if (lexer->recordpos + len + 1 > lexer->recordlen) if (lexer->recordpos + len + 1 > lexer->recordlen)
{ {
old = lexer->recording; old = lexer->recording;
lexer->recordlen = MAX (len, lexer->recordlen) * 2; lexer->recordlen = grub_max (len, lexer->recordlen) * 2;
lexer->recording = grub_realloc (lexer->recording, lexer->recordlen); lexer->recording = grub_realloc (lexer->recording, lexer->recordlen);
if (!lexer->recording) if (!lexer->recording)
{ {
@ -131,76 +129,85 @@ grub_script_lexer_record (struct grub_parser_param *parser, char *str)
lexer->recordpos += len; lexer->recordpos += len;
} }
/* Append '\n' to SRC, before '\0' */
static char *
append_newline (const char *src)
{
char *line;
grub_size_t len;
len = grub_strlen (src);
line = grub_malloc (len + 2);
if (!line)
return 0;
grub_strcpy (line, src);
line[len] = '\n';
line[len + 1] = '\0';
return line;
}
/* Read next line of input if necessary, and set yyscanner buffers. */ /* Read next line of input if necessary, and set yyscanner buffers. */
int int
grub_script_lexer_yywrap (struct grub_parser_param *parserstate) grub_script_lexer_yywrap (struct grub_parser_param *parserstate,
const char *input)
{ {
int len; int len;
char *line; char *p = 0;
char *line2; char *line = 0;
YY_BUFFER_STATE buffer; YY_BUFFER_STATE buffer;
struct grub_lexer_param *lexerstate = parserstate->lexerstate; struct grub_lexer_param *lexerstate = parserstate->lexerstate;
if (!lexerstate->refs) if (! lexerstate->refs && ! lexerstate->prefix && ! input)
return 0; return 1;
if (!lexerstate->getline) if (! lexerstate->getline && ! input)
{ {
grub_script_yyerror (parserstate, "unexpected end of file"); grub_script_yyerror (parserstate, "unexpected end of file");
return 0; return 1;
} }
line = 0; line = 0;
buffer = 0; if (! input)
lexerstate->getline (&line, 1); lexerstate->getline (&line, 1);
if (!line) else
line = grub_strdup (input);
if (! line)
{ {
grub_script_yyerror (parserstate, 0); /* XXX this could be for ^C case? */ grub_script_yyerror (parserstate, 0);
return 0; return 1;
} }
len = grub_strlen (line); len = grub_strlen (line);
if (line[len - 1] == '\n') if (lexerstate->prefix)
{ {
buffer = yy_scan_string (line, lexerstate->yyscanner); int plen = grub_strlen (lexerstate->prefix);
}
else p = grub_malloc (len + plen + 2);
{ if (! p)
line2 = append_newline (line);
if (line2)
{ {
buffer = yy_scan_string (line2, lexerstate->yyscanner); grub_free (line);
grub_free (line2); return 1;
} }
grub_strcpy (p, lexerstate->prefix);
lexerstate->prefix = 0;
if (! line[0])
{
line = "\n";
len = 1;
}
grub_strcpy (p + plen, line);
line = p;
len = len + plen;
} }
if (line[len - 1] != '\n')
{
char *p;
p = grub_realloc (line, len + 2);
if (! p)
{
grub_free (line);
return 1;
}
line = p;
line[len++] = '\n';
line[len] = '\0';
}
buffer = yy_scan_string (line, lexerstate->yyscanner);
grub_free (line); grub_free (line);
if (!buffer)
if (! buffer)
{ {
grub_script_yyerror (parserstate, 0); grub_script_yyerror (parserstate, 0);
return 0; return 1;
} }
return 0;
return 1;
} }
struct grub_lexer_param * struct grub_lexer_param *
@ -231,35 +238,18 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script,
grub_free (lexerstate); grub_free (lexerstate);
return 0; return 0;
} }
yyset_extra (parser, lexerstate->yyscanner);
parser->lexerstate = lexerstate;
buffer = 0; if (grub_script_lexer_yywrap (parser, script ?: "\n"))
script = script ? : "\n";
len = grub_strlen (script);
if (script[len - 1] == '\n')
{
buffer = yy_scan_string (script, lexerstate->yyscanner);
}
else
{
script2 = append_newline (script);
if (script2)
{
buffer = yy_scan_string (script2, lexerstate->yyscanner);
grub_free (script2);
}
}
if (!buffer)
{ {
parser->lexerstate = 0;
yylex_destroy (lexerstate->yyscanner); yylex_destroy (lexerstate->yyscanner);
grub_free (lexerstate->yyscanner); grub_free (lexerstate->yyscanner);
grub_free (lexerstate->text); grub_free (lexerstate->text);
grub_free (lexerstate); grub_free (lexerstate);
return 0; return 0;
} }
yyset_extra (parser, lexerstate->yyscanner);
return lexerstate; return lexerstate;
} }

118
script/yylex.l
View file

@ -58,7 +58,9 @@
#define YY_INPUT(buf,res,max) do { res = 0; } while (0) #define YY_INPUT(buf,res,max) do { res = 0; } while (0)
/* forward declarations */ /* forward declarations */
static int resplit (const char *input, yyscan_t yyscanner); static int grub_lexer_unput (const char *input, yyscan_t yyscanner);
static int grub_lexer_resplit (const char *input, yyscan_t yyscanner);
static void grub_lexer_yyfree (void *, yyscan_t yyscanner); static void grub_lexer_yyfree (void *, yyscan_t yyscanner);
static void* grub_lexer_yyalloc (yy_size_t, yyscan_t yyscanner); static void* grub_lexer_yyalloc (yy_size_t, yyscan_t yyscanner);
static void* grub_lexer_yyrealloc (void*, yy_size_t, yyscan_t yyscanner); static void* grub_lexer_yyrealloc (void*, yy_size_t, yyscan_t yyscanner);
@ -100,10 +102,9 @@ typedef size_t yy_size_t;
%option never-interactive %option never-interactive
%option noyyfree noyyalloc noyyrealloc %option noyyfree noyyalloc noyyrealloc
%option nounistd nostdinit nodefault noyylineno noyywrap %option nounistd nostdinit nodefault noyylineno
/* Reduce lexer size, by not defining these. */ /* Reduce lexer size, by not defining these. */
%option noyy_top_state
%option noinput nounput %option noinput nounput
%option noyyget_in noyyset_in %option noyyget_in noyyset_in
%option noyyget_out noyyset_out %option noyyget_out noyyset_out
@ -120,20 +121,19 @@ DIGITS [[:digit:]]+
NAME [[:alpha:]_][[:alnum:][:digit:]_]* NAME [[:alpha:]_][[:alnum:][:digit:]_]*
ESC \\. ESC \\.
SQCHR [^\']
DQCHR {ESC}|[^\"]
DQSTR \"{DQCHR}*\"
SQSTR \'{SQCHR}*\'
VARIABLE ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\} VARIABLE ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}
DQSTR \"([^\"]|{ESC})*\"
SQSTR \'([^\'])*\'
WORD ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+ WORD ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
DQSTR2 {WORD}?\"({ESC}|[^\"])*\n MULTILINE {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*))
SQSTR2 {WORD}?\'({ESC}|[^\'])*\n
%x SPLIT %x SPLIT
%x DQUOTE %x DQUOTE
%x SQUOTE %x SQUOTE
%x VAR %x VAR
%x DQMULTILINE
%x SQMULTILINE
%% %%
@ -179,55 +179,22 @@ SQSTR2 {WORD}?\'({ESC}|[^\'])*\n
{NAME} { RECORD; return GRUB_PARSER_TOKEN_NAME; } {NAME} { RECORD; return GRUB_PARSER_TOKEN_NAME; }
{WORD} { {WORD} {
RECORD; RECORD;
yyextra->lexerstate->resplit = 1;
yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner); yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
if (resplit (yytext, yyscanner)) if (grub_lexer_resplit (yytext, yyscanner))
{ {
yypop_buffer_state (yyscanner); yypop_buffer_state (yyscanner);
return GRUB_PARSER_TOKEN_WORD; return GRUB_PARSER_TOKEN_WORD;
} }
} }
{DQSTR2} { {MULTILINE} {
yy_push_state (DQMULTILINE, yyscanner); if (grub_lexer_unput (yytext, yyscanner))
grub_script_lexer_ref (yyextra->lexerstate); return GRUB_PARSER_TOKEN_BAD;
yymore (); }
. {
grub_script_yyerror (yyextra, yytext);
return GRUB_PARSER_TOKEN_BAD;
} }
<DQMULTILINE>{
\"{WORD}? {
RECORD;
grub_script_lexer_deref (yyextra->lexerstate);
yy_pop_state (yyscanner);
yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
if (resplit (yytext, yyscanner))
{
yypop_buffer_state (yyscanner);
return GRUB_PARSER_TOKEN_WORD;
}
}
{ESC} { yymore(); }
[^\"] { yymore(); }
}
{SQSTR2} {
yy_push_state (SQMULTILINE, yyscanner);
grub_script_lexer_ref (yyextra->lexerstate);
yymore ();
}
<SQMULTILINE>{
\'{WORD}? {
RECORD;
grub_script_lexer_deref (yyextra->lexerstate);
yy_pop_state (yyscanner);
yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
if (resplit (yytext, yyscanner))
{
yypop_buffer_state (yyscanner);
return GRUB_PARSER_TOKEN_WORD;
}
}
{ESC} { yymore(); }
[^\'] { yymore(); }
}
/* Split word into multiple args */ /* Split word into multiple args */
@ -250,6 +217,7 @@ SQSTR2 {WORD}?\'({ESC}|[^\'])*\n
<<EOF>> { <<EOF>> {
yy_pop_state (yyscanner); yy_pop_state (yyscanner);
yypop_buffer_state (yyscanner); yypop_buffer_state (yyscanner);
yyextra->lexerstate->resplit = 0;
yyextra->lexerstate->merge_end = 1; yyextra->lexerstate->merge_end = 1;
ARG (GRUB_SCRIPT_ARG_TYPE_TEXT); ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
} }
@ -305,37 +273,21 @@ SQSTR2 {WORD}?\'({ESC}|[^\'])*\n
(.|\n) { COPY (yytext, yyleng); } (.|\n) { COPY (yytext, yyleng); }
} }
. { /* ignore */ }
<<EOF>> { <<EOF>> {
yypop_buffer_state (yyscanner); yypop_buffer_state (yyscanner);
if (! grub_script_lexer_yywrap (yyextra)) yyextra->lexerstate->eof = 1;
{ return GRUB_PARSER_TOKEN_EOF;
yyextra->lexerstate->eof = 1;
return GRUB_PARSER_TOKEN_EOF;
}
} }
%% %%
#if 0
int int
yywrap (yyscan_t yyscanner) yywrap (yyscan_t yyscanner)
{ {
char *line = 0; if (yyget_extra (yyscanner)->lexerstate->resplit)
struct grub_lexer_param *lexerstate = yyget_extra(yyscanner)->lexerstate; return 1;
grub_printf ("yywrap\n"); return grub_script_lexer_yywrap (yyget_extra (yyscanner), 0);
if (lexerstate->getline)
{
lexerstate->getline (&line, 1);
if (! line)
return 1;
yy_scan_string (line, yyscanner);
return 0;
}
return 1;
} }
#endif
static void static void
grub_lexer_yyfree (void *ptr, yyscan_t yyscanner __attribute__ ((unused))) grub_lexer_yyfree (void *ptr, yyscan_t yyscanner __attribute__ ((unused)))
@ -381,7 +333,7 @@ static void copy_string (struct grub_parser_param *parser, const char *str, unsi
} }
static int static int
resplit (const char *text, yyscan_t yyscanner) grub_lexer_resplit (const char *text, yyscan_t yyscanner)
{ {
/* resplit text */ /* resplit text */
if (yy_scan_string (text, yyscanner)) if (yy_scan_string (text, yyscanner))
@ -393,3 +345,23 @@ resplit (const char *text, yyscan_t yyscanner)
grub_script_yyerror (yyget_extra (yyscanner), 0); grub_script_yyerror (yyget_extra (yyscanner), 0);
return 1; return 1;
} }
static int
grub_lexer_unput (const char *text, yyscan_t yyscanner)
{
struct grub_lexer_param *lexerstate = yyget_extra (yyscanner)->lexerstate;
if (lexerstate->prefix)
{
grub_free (lexerstate->prefix);
lexerstate->prefix = 0;
}
lexerstate->prefix = grub_strdup (text);
if (! lexerstate->prefix)
{
grub_script_yyerror (yyget_extra (yyscanner), "out of memory");
return 1;
}
return 0;
}