2005-11-06 22:19:59 +00:00
|
|
|
/* lexer.c - The scripting lexer. */
|
|
|
|
/*
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2007-07-21 23:32:33 +00:00
|
|
|
* Copyright (C) 2005,2006,2007 Free Software Foundation, Inc.
|
2005-11-06 22:19:59 +00:00
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
2005-11-06 22:19:59 +00:00
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-21 23:32:33 +00:00
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
2005-11-06 22:19:59 +00:00
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is distributed in the hope that it will be useful,
|
2005-11-06 22:19:59 +00:00
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2007-07-21 23:32:33 +00:00
|
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
2005-11-06 22:19:59 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <grub/parser.h>
|
|
|
|
#include <grub/misc.h>
|
|
|
|
#include <grub/mm.h>
|
|
|
|
#include <grub/script.h>
|
|
|
|
|
|
|
|
#include "grub_script.tab.h"
|
|
|
|
|
|
|
|
static int
|
|
|
|
check_varstate (grub_parser_state_t state)
|
|
|
|
{
|
|
|
|
return (state == GRUB_PARSER_STATE_VARNAME
|
|
|
|
|| state == GRUB_PARSER_STATE_VAR
|
|
|
|
|| state == GRUB_PARSER_STATE_QVAR
|
|
|
|
|| state == GRUB_PARSER_STATE_VARNAME2
|
|
|
|
|| state == GRUB_PARSER_STATE_QVARNAME
|
|
|
|
|| state == GRUB_PARSER_STATE_QVARNAME2);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
check_textstate (grub_parser_state_t state)
|
|
|
|
{
|
|
|
|
return (state == GRUB_PARSER_STATE_TEXT
|
|
|
|
|| state == GRUB_PARSER_STATE_QUOTE
|
|
|
|
|| state == GRUB_PARSER_STATE_DQUOTE);
|
|
|
|
}
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
struct grub_lexer_param *
|
|
|
|
grub_script_lexer_init (char *script, grub_err_t (*getline) (char **))
|
|
|
|
{
|
|
|
|
struct grub_lexer_param *param;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
param = grub_malloc (sizeof (*param));
|
|
|
|
if (! param)
|
|
|
|
return 0;
|
2006-01-17 09:50:47 +00:00
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
param->state = GRUB_PARSER_STATE_TEXT;
|
|
|
|
param->getline = getline;
|
|
|
|
param->refs = 0;
|
|
|
|
param->done = 0;
|
|
|
|
param->newscript = 0;
|
|
|
|
param->script = script;
|
|
|
|
param->record = 0;
|
|
|
|
param->recording = 0;
|
|
|
|
param->recordpos = 0;
|
|
|
|
param->recordlen = 0;
|
|
|
|
|
|
|
|
return param;
|
2005-11-06 22:19:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2006-04-17 13:01:20 +00:00
|
|
|
grub_script_lexer_ref (struct grub_lexer_param *state)
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
state->refs++;
|
2005-11-06 22:19:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2006-04-17 13:01:20 +00:00
|
|
|
grub_script_lexer_deref (struct grub_lexer_param *state)
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
state->refs--;
|
2005-11-06 22:19:59 +00:00
|
|
|
}
|
|
|
|
|
2006-01-17 09:50:47 +00:00
|
|
|
/* Start recording all characters passing through the lexer. */
|
|
|
|
void
|
2006-04-17 13:01:20 +00:00
|
|
|
grub_script_lexer_record_start (struct grub_lexer_param *state)
|
2006-01-17 09:50:47 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
state->record = 1;
|
|
|
|
state->recordlen = 100;
|
|
|
|
state->recording = grub_malloc (state->recordlen);
|
|
|
|
state->recordpos = 0;
|
2006-01-17 09:50:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
2006-04-17 13:01:20 +00:00
|
|
|
grub_script_lexer_record_stop (struct grub_lexer_param *state)
|
2006-01-17 09:50:47 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
state->record = 0;
|
2006-01-17 09:50:47 +00:00
|
|
|
|
|
|
|
/* Delete the last character, it is a `}'. */
|
2006-04-17 13:01:20 +00:00
|
|
|
if (state->recordpos > 0)
|
2006-01-17 09:50:47 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
if (state->recording[--state->recordpos] != '}')
|
2006-01-17 09:50:47 +00:00
|
|
|
{
|
|
|
|
grub_printf ("Internal error while parsing menu entry");
|
|
|
|
for (;;); /* XXX */
|
|
|
|
}
|
2006-04-17 13:01:20 +00:00
|
|
|
state->recording[state->recordpos] = '\0';
|
2006-01-17 09:50:47 +00:00
|
|
|
}
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
return state->recording;
|
2006-01-17 09:50:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* When recording is enabled, record the character C as the next item
|
|
|
|
in the character stream. */
|
|
|
|
static void
|
2006-04-17 13:01:20 +00:00
|
|
|
recordchar (struct grub_lexer_param *state, char c)
|
2006-01-17 09:50:47 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
if (state->recordpos == state->recordlen)
|
2006-01-17 09:50:47 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
char *old = state->recording;
|
|
|
|
state->recordlen += 100;
|
|
|
|
state->recording = grub_realloc (state->recording, state->recordlen);
|
|
|
|
if (! state->recording)
|
2006-01-17 09:50:47 +00:00
|
|
|
{
|
|
|
|
grub_free (old);
|
2006-04-17 13:01:20 +00:00
|
|
|
state->record = 0;
|
2006-01-17 09:50:47 +00:00
|
|
|
}
|
|
|
|
}
|
2006-04-17 13:01:20 +00:00
|
|
|
state->recording[state->recordpos++] = c;
|
2006-01-17 09:50:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Fetch the next character for the lexer. */
|
|
|
|
static void
|
2006-04-17 13:01:20 +00:00
|
|
|
nextchar (struct grub_lexer_param *state)
|
2006-01-17 09:50:47 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
if (state->record)
|
|
|
|
recordchar (state, *state->script);
|
|
|
|
state->script++;
|
2006-01-17 09:50:47 +00:00
|
|
|
}
|
|
|
|
|
2006-04-16 18:02:42 +00:00
|
|
|
int
|
2006-04-17 13:01:20 +00:00
|
|
|
grub_script_yylex2 (YYSTYPE *yylval, struct grub_parser_param *parsestate);
|
2006-04-16 18:02:42 +00:00
|
|
|
|
2005-11-06 22:19:59 +00:00
|
|
|
int
|
2006-04-17 13:01:20 +00:00
|
|
|
grub_script_yylex (YYSTYPE *yylval, struct grub_parser_param *parsestate)
|
2006-04-16 18:02:42 +00:00
|
|
|
{
|
|
|
|
int r = -1;
|
|
|
|
|
|
|
|
while (r == -1)
|
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
r = grub_script_yylex2 (yylval, parsestate);
|
2006-05-20 11:10:22 +00:00
|
|
|
if (r == ' ')
|
2006-04-16 18:02:42 +00:00
|
|
|
r = -1;
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2006-04-17 13:01:20 +00:00
|
|
|
grub_script_yylex2 (YYSTYPE *yylval, struct grub_parser_param *parsestate)
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
|
|
|
grub_parser_state_t newstate;
|
|
|
|
char use;
|
|
|
|
char *buffer;
|
|
|
|
char *bp;
|
2006-04-17 13:01:20 +00:00
|
|
|
struct grub_lexer_param *state = parsestate->lexerstate;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
if (state->done)
|
2005-11-06 22:19:59 +00:00
|
|
|
return 0;
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
if (! *state->script)
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
|
|
|
/* Check if more tokens are requested by the parser. */
|
2006-04-17 13:01:20 +00:00
|
|
|
if ((state->refs
|
|
|
|
|| state->state == GRUB_PARSER_STATE_ESC)
|
|
|
|
&& state->getline)
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
while (!state->script || ! grub_strlen (state->script))
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
grub_free (state->newscript);
|
|
|
|
state->newscript = 0;
|
|
|
|
state->getline (&state->newscript);
|
|
|
|
state->script = state->newscript;
|
|
|
|
if (! state->script)
|
2006-01-17 09:50:47 +00:00
|
|
|
return 0;
|
2005-11-06 22:19:59 +00:00
|
|
|
}
|
|
|
|
grub_dprintf ("scripting", "token=`\\n'\n");
|
2006-04-17 13:01:20 +00:00
|
|
|
recordchar (state, '\n');
|
|
|
|
if (state->state != GRUB_PARSER_STATE_ESC)
|
2005-11-06 22:19:59 +00:00
|
|
|
return '\n';
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
grub_free (state->newscript);
|
|
|
|
state->newscript = 0;
|
|
|
|
state->done = 1;
|
2005-11-06 22:19:59 +00:00
|
|
|
grub_dprintf ("scripting", "token=`\\n'\n");
|
|
|
|
return '\n';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
newstate = grub_parser_cmdline_state (state->state, *state->script, &use);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
/* Check if it is a text. */
|
|
|
|
if (check_textstate (newstate))
|
|
|
|
{
|
|
|
|
/* In case the string is not quoted, this can be a one char
|
|
|
|
length symbol. */
|
|
|
|
if (newstate == GRUB_PARSER_STATE_TEXT)
|
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
switch (*state->script)
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
|
|
|
case ' ':
|
2006-04-17 13:01:20 +00:00
|
|
|
while (*state->script)
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
newstate = grub_parser_cmdline_state (state->state,
|
|
|
|
*state->script, &use);
|
|
|
|
if (! (state->state == GRUB_PARSER_STATE_TEXT
|
|
|
|
&& *state->script == ' '))
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
|
|
|
grub_dprintf ("scripting", "token=` '\n");
|
|
|
|
return ' ';
|
|
|
|
}
|
2006-04-17 13:01:20 +00:00
|
|
|
state->state = newstate;
|
|
|
|
nextchar (state);
|
2005-11-06 22:19:59 +00:00
|
|
|
}
|
|
|
|
grub_dprintf ("scripting", "token=` '\n");
|
|
|
|
return ' ';
|
|
|
|
case '{':
|
|
|
|
case '}':
|
|
|
|
case ';':
|
|
|
|
case '\n':
|
2006-01-17 09:50:47 +00:00
|
|
|
{
|
|
|
|
char c;
|
2006-04-17 13:01:20 +00:00
|
|
|
grub_dprintf ("scripting", "token=`%c'\n", *state->script);
|
|
|
|
c = *state->script;;
|
|
|
|
nextchar (state);
|
2006-01-17 09:50:47 +00:00
|
|
|
return c;
|
|
|
|
}
|
2005-11-06 22:19:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX: Use a better size. */
|
2006-04-17 13:01:20 +00:00
|
|
|
buffer = grub_script_malloc (parsestate, 2048);
|
2005-11-06 22:19:59 +00:00
|
|
|
if (! buffer)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
bp = buffer;
|
|
|
|
|
|
|
|
/* Read one token, possible quoted. */
|
2006-04-17 13:01:20 +00:00
|
|
|
while (*state->script)
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
newstate = grub_parser_cmdline_state (state->state,
|
|
|
|
*state->script, &use);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
/* Check if a variable name starts. */
|
|
|
|
if (check_varstate (newstate))
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* If the string is not quoted or escaped, stop processing
|
|
|
|
when a special token was found. It will be recognised
|
|
|
|
next time when this function is called. */
|
|
|
|
if (newstate == GRUB_PARSER_STATE_TEXT
|
2006-04-17 13:01:20 +00:00
|
|
|
&& state->state != GRUB_PARSER_STATE_ESC)
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
|
|
|
int breakout = 0;
|
|
|
|
|
|
|
|
switch (use)
|
|
|
|
{
|
|
|
|
case ' ':
|
|
|
|
case '{':
|
|
|
|
case '}':
|
|
|
|
case ';':
|
|
|
|
case '\n':
|
|
|
|
breakout = 1;
|
|
|
|
}
|
|
|
|
if (breakout)
|
|
|
|
break;
|
|
|
|
*(bp++) = use;
|
|
|
|
}
|
|
|
|
else if (use)
|
|
|
|
*(bp++) = use;
|
|
|
|
|
2006-04-17 13:01:20 +00:00
|
|
|
state->state = newstate;
|
|
|
|
nextchar (state);
|
2005-11-06 22:19:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* A string of text was read in. */
|
|
|
|
*bp = '\0';
|
|
|
|
grub_dprintf ("scripting", "token=`%s'\n", buffer);
|
2006-04-17 13:01:20 +00:00
|
|
|
yylval->string = buffer;
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
/* Detect some special tokens. */
|
|
|
|
if (! grub_strcmp (buffer, "while"))
|
|
|
|
return GRUB_PARSER_TOKEN_WHILE;
|
|
|
|
else if (! grub_strcmp (buffer, "if"))
|
|
|
|
return GRUB_PARSER_TOKEN_IF;
|
|
|
|
else if (! grub_strcmp (buffer, "function"))
|
|
|
|
return GRUB_PARSER_TOKEN_FUNCTION;
|
2006-01-17 09:50:47 +00:00
|
|
|
else if (! grub_strcmp (buffer, "menuentry"))
|
|
|
|
return GRUB_PARSER_TOKEN_MENUENTRY;
|
|
|
|
else if (! grub_strcmp (buffer, "@"))
|
|
|
|
return GRUB_PARSER_TOKEN_MENUENTRY;
|
2005-11-06 22:19:59 +00:00
|
|
|
else if (! grub_strcmp (buffer, "else"))
|
|
|
|
return GRUB_PARSER_TOKEN_ELSE;
|
|
|
|
else if (! grub_strcmp (buffer, "then"))
|
|
|
|
return GRUB_PARSER_TOKEN_THEN;
|
|
|
|
else if (! grub_strcmp (buffer, "fi"))
|
|
|
|
return GRUB_PARSER_TOKEN_FI;
|
|
|
|
else
|
|
|
|
return GRUB_PARSER_TOKEN_NAME;
|
|
|
|
}
|
|
|
|
else if (newstate == GRUB_PARSER_STATE_VAR
|
|
|
|
|| newstate == GRUB_PARSER_STATE_QVAR)
|
|
|
|
{
|
|
|
|
/* XXX: Use a better size. */
|
2006-04-17 13:01:20 +00:00
|
|
|
buffer = grub_script_malloc (parsestate, 2096);
|
2005-11-06 22:19:59 +00:00
|
|
|
if (! buffer)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
bp = buffer;
|
|
|
|
|
|
|
|
/* This is a variable, read the variable name. */
|
2006-04-17 13:01:20 +00:00
|
|
|
while (*state->script)
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
newstate = grub_parser_cmdline_state (state->state,
|
|
|
|
*state->script, &use);
|
2005-11-06 22:19:59 +00:00
|
|
|
|
|
|
|
/* Check if this character is not part of the variable name
|
|
|
|
anymore. */
|
|
|
|
if (! (check_varstate (newstate)))
|
|
|
|
{
|
2006-04-17 13:01:20 +00:00
|
|
|
if (state->state == GRUB_PARSER_STATE_VARNAME2
|
|
|
|
|| state->state == GRUB_PARSER_STATE_QVARNAME2)
|
|
|
|
nextchar (state);
|
|
|
|
state->state = newstate;
|
2005-11-06 22:19:59 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (use)
|
|
|
|
*(bp++) = use;
|
2006-04-17 13:01:20 +00:00
|
|
|
nextchar (state);
|
|
|
|
state->state = newstate;
|
2005-11-06 22:19:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
*bp = '\0';
|
2006-04-17 13:01:20 +00:00
|
|
|
state->state = newstate;
|
|
|
|
yylval->string = buffer;
|
2005-11-06 22:19:59 +00:00
|
|
|
grub_dprintf ("scripting", "vartoken=`%s'\n", buffer);
|
|
|
|
|
|
|
|
return GRUB_PARSER_TOKEN_VAR;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* There is either text or a variable name. In the case you
|
|
|
|
arrive here there is a serious problem with the lexer. */
|
|
|
|
grub_error (GRUB_ERR_BAD_ARGUMENT, "Internal error\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2006-06-04 Yoshinori K. Okuji <okuji@enbug.org>
Clean up the code to support 64-bit addressing in disks and
files. This change is not enough for filesystems yet.
* util/i386/pc/grub-setup.c (struct boot_blocklist): Change the
type of "start" to grub_uint64_t.
(setup): Change the types of KERNEL_SECTOR and FIRST_SECTOR to
grub_disk_addr_t * and grub_disk_addr_t. Fix the format string in
save_first_sector and save_blocklists. Use grub_le_to_cpu64 to
convert addresses.
* util/i386/pc/biosdisk.c (open_device): Change the type of SECTOR
to grub_disk_addr_t.
* partmap/gpt.c (gpt_partition_map_iterate): Fix the format
string.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/amiga.c (amiga_partition_map_iterate): Cast RDSK.MAGIC
to char *.
* normal/script.c (grub_script_parse): Remove unused MEMFREE.
* normal/parser.y (YYLTYPE_IS_TRIVIAL): New macro.
* normal/lexer.c (grub_script_yyerror): Specify unused to LEX.
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf64): Cast -1
to grub_off_t, to detect an error from grub_file_seek.
(grub_multiboot_load_elf32): Likewise.
* kern/misc.c (grub_strtoul): Use grub_strtoull. Return the
maximum unsigned long value when an overflow is detected.
(grub_strtoull): New function.
(grub_divmod64): Likewise.
(grub_lltoa): use grub_divmod64.
* kern/fs.c (struct grub_fs_block): Change the type of "offset" to
grub_disk_addr_t.
(grub_fs_blocklist_open): Increase P if P is not NULL to advance
the pointer to next character. Use grub_strtoull instead of
grub_strtoul.
(grub_fs_blocklist_read): Change the types of SECTOR, OFFSET and
SIZE to grub_disk_addr_t, grub_off_t and grub_size_t,
respectively.
* kern/file.c (grub_file_read): Prevent an oveflow of LEN, as the
return value is signed.
(grub_file_seek): Change the type of OLD to grub_off_t. Do not
test if OFFSET is less than zero, as OFFSET is unsigned now.
* kern/disk.c (struct grub_disk_cache): Change the type of
"sector" to grub_disk_addr_t.
(grub_disk_cache_get_index): Change the type of SECTOR to
grub_disk_addr_t. Calculate the hash with SECTOR casted to
unsigned after shifting.
(grub_disk_cache_invalidate): Change the type of SECTOR to
grub_disk_addr_t.
(grub_disk_cache_unlock): Likewise.
(grub_disk_cache_store): Likewise.
(grub_disk_check_range): Change the types of SECTOR, OFFSET, SIZE,
START and LEN to grub_disk_addr_t *, grub_off_t *, grub_size_t,
grub_disk_addr_t and grub_uint64_t, respectively.
(grub_disk_read): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of START_SECTOR, LEN and
POS to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
(grub_disk_write): Use an unsigned variable REAL_OFFSET for the
body, as the value of OFFSET is tweaked by
grub_disk_check_range. Change the types of LEN and N to
grub_size_t.
* io/gzio.c (struct grub_gzio): Change the types of "data_offset"
and "saved_offset" to grub_off_t.
(test_header): Cast BUF to char *.
(get_byte): Cast GZIO->DATA_OFFSET to grub_off_t. Cast GZIO->INBUF
to char *.
(grub_gzio_read): Change the types of OFFSET and SIZE to
grub_off_t and grub_size_t, respectively.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_FORCE_LBA):
Removed.
(GRUB_BOOT_MACHINE_BOOT_DRIVE): Changed to 0x4c.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Changed to 0x40.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Changed to 0x42.
(GRUB_BOOT_MACHINE_DRIVE_CHECK): Changed to 0x4e.
(GRUB_BOOT_MACHINE_LIST_SIZE): Increased to 12.
* include/grub/types.h (grub_off_t): Unconditionally set to
grub_uint64_t.
(grub_disk_addr_t): Changed to grub_uint64_t.
* include/grub/partition.h (struct grub_partition): Change the
types of "start", "len" and "offset" to grub_disk_addr_t,
grub_uint64_t and grub_disk_addr_t, respectively.
(grub_partition_get_start): Return grub_disk_addr_t.
(grub_partition_get_len): Return grub_uint64_t.
* include/grub/misc.h (grub_strtoull): New prototype.
(grub_divmod64): Likewise.
* include/grub/fshelp.h (grub_fshelp_read_file): Change the types
of SECTOR, LEN and FILESIZE to grub_disk_addr_t, grub_size_t and
grub_off_t, respectively.
All callers and references changed.
* include/grub/fs.h (struct grub_fs): Change the type of LEN to
grub_size_t in "read".
All callers and references changed.
* include/grub/file.h (struct grub_file): Change the types of
"offset" and "size" to grub_off_t and grub_off_t,
respectively. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_file_read): Change the type of LEN to grub_size_t.
(grub_file_seek): Return grub_off_t. Change the type of OFFSET to
grub_off_t.
(grub_file_size): Return grub_off_t.
(grub_file_tell): Likewise.
All callers and references changed.
* include/grub/disk.h (struct grub_disk_dev): Change the types of
SECTOR and SIZE to grub_disk_addr_t and grub_size_t in "read" and
"write".
(struct grub_disk): Change the type of "total_sectors" to
grub_uint64_t. Change the type of SECTOR to grub_disk_addr_t in
"read_hook".
(grub_disk_read): Change the types of SECTOR, OFFSET and SIZE to
grub_disk_addr_t, grub_off_t and grub_size_t, respectively.
(grub_disk_write): Likewise.
All callers and references changed.
* fs/iso9660.c (grub_iso9660_susp_iterate): Cast parameters to
char * for grub_strncmp to silence gcc.
(grub_iso9660_mount): Likewise.
(grub_iso9660_mount): Likewise.
(grub_iso9660_read_symlink): Likewise. Also, remove the nonsense
return statement.
(grub_iso9660_iterate_dir): Likewise.
(grub_iso9660_label): Cast DATA->VOLDESC.VOLNAME to char *.
* fs/hfs.c (grub_hfs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/hfsplus.c (grub_hfsplus_read_file): Likewise.
* fs/jfs.c (grub_jfs_read_file): Likewise.
* fs/minix.c (grub_jfs_read_file): Likewise.
* fs/sfs.c (grub_jfs_read_file): Likewise.
* fs/ufs.c (grub_jfs_read_file): Likewise.
* fs/xfs.c (grub_jfs_read_file): Likewise.
* fs/fat.c (grub_fat_read_data): Change the types of SECTOR, LEN
and SIZE to grub_disk_addr_t, grub_size_t and grub_size_t,
respectively.
* fs/ext2.c (grub_ext2_read_block): When an error happens, set
BLKNR to -1 instead of returning GRUB_ERRNO.
(grub_ext2_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* fs/affs.c (grub_affs_read_file): Change the types of SECTOR and
LEN to grub_disk_addr_t and grub_size_t, respectively.
* font/manager.c (grub_font_get_glyph): Cast BITMAP to char * for
grub_file_read.
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Fix the format
string. Do not cast SECTOR explicitly.
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Change the type of
TOTAL_SECTORS to grub_uint64_t. Do not mask DRP->TOTAL_SECTORS.
(grub_biosdisk_rw): Change the types of SECTOR and SIZE to
grub_disk_addr_t and grub_size_t, respectively. If the sector is
over 2TB and LBA mode is not supported, raise an error.
(get_safe_sectors): New function.
(grub_biosdisk_read): Use get_safe_sectors.
(grub_biosdisk_write): Likewise.
* disk/efi/efidisk.c (grub_efidisk_read): Fix the format string.
(grub_efidisk_write): Likewise.
* disk/loopback.c (delete_loopback): Cosmetic changes.
(grub_cmd_loopback): Likewise. Also, test NEWDEV->FILENAME
correctly.
(grub_loopback_open): Likewise.
(grub_loopback_read): Likewise. Also, change the type of POS to
grub_off_t, and fix the usage of grub_memset.
* commands/i386/pc/play.c: Include grub/machine/time.h.
* commands/ls.c (grub_ls_list_files): Use "llu" instead of "d" to
print FILE->SIZE.
* commands/configfile.c: Include grub/env.h.
* commands/cmp.c (grub_cmd_cmp): Do not use ERR, but use
GRUB_ERRNO directly instead. Change the type of POS to
grub_off_t. Follow the coding standard.
* commands/blocklist.c: Include grub/partition.h.
(grub_cmd_blocklist): Return an error if the underlying device is
not a disk. Take the starting sector of a partition into account,
if a partition is used.
* boot/i386/pc/diskboot.S (bootloop): Adapted to the new offset of
a length field.
(lba_mode): Support 64-bit addresses.
(chs_mode): Likewise.
(copy_buffer): Adapted to the new offsets of a length field and a
segment field.
(blocklist_default_start): Allocate 64-bit space.
* boot/i386/pc/boot.S (force_lba): Removed.
(boot_drive): Moved to under KERNEL_SECTOR.
(kernel_sector): Moved to under KENREL_SEGMENT. Allocate 64-bit
space.
(real_start): Set %si earlier. Remove code for FORCE_LBA, since it
is useless.
(lba_mode): Refactored to support a 64-bit address. More size
optimization.
(setup_sectors): Likewise.
2006-06-04 15:56:55 +00:00
|
|
|
grub_script_yyerror (struct grub_parser_param *lex __attribute__ ((unused)),
|
|
|
|
char const *err)
|
2005-11-06 22:19:59 +00:00
|
|
|
{
|
2006-04-16 18:02:42 +00:00
|
|
|
grub_printf ("%s\n", err);
|
2005-11-06 22:19:59 +00:00
|
|
|
}
|