2009-03-29 Yoshinori K. Okuji <okuji@enbug.org>
Make the format of Environment Block plain text. The boot loader
part is not tested well yet.
* util/grub-editenv.c (DEFAULT_ENVBLK_SIZE): New macro.
(buffer): Removed.
(envblk): Likewise.
(usage): Remove "info" and "clear". Add "unset". Update the
description of "set", as this does not delete variables any
longer.
(create_envblk_file): Complete rewrite.
(open_envblk_file): Likewise.
(cmd_info): Removed.
(cmd_list): Likewise.
(cmd_set): Likewise.
(cmd_clear): Likewise.
(list_variables): New function.
(write_envblk): Likewise.
(set_variables): Likewise.
(unset_variables): Likewise.
(main): Complete rewrite.
* commands/loadenv.c (buffer): Removed.
(envblk): Likewise.
(open_envblk_file): New function.
(read_envblk_file): Complete rewrite.
(grub_cmd_load_env): Likewise.
(grub_cmd_list_env): Likewise.
(struct blocklist): New struct.
(free_blocklists): New function.
(check_blocklists): Likewise.
(write_blocklists): Likewise.
(grub_cmd_save_env): Complete rewrite.
* include/grub/lib/envblk.h (GRUB_ENVBLK_SIGNATURE): Replaced with
a plain text signature.
(GRUB_ENVBLK_MAXLEN): Removed.
(struct grub_envblk): Complete rewrite.
(grub_envblk_find): Removed.
(grub_envblk_insert): Likewise.
(grub_envblk_open): New prototype.
(grub_envblk_set): Likewise.
(grub_envblk_delete): Put const to VALUE.
(grub_envblk_iterate): Put const to NAME and VALUE.
(grub_envblk_close): New prototype.
(grub_envblk_buffer): New inline function.
(grub_envblk_size): Likewise.
* lib/envblk.c: Include grub/mm.h.
(grub_env_find): Removed.
(grub_envblk_open): New function.
(grub_envblk_close): Likewise.
(escaped_value_len): Likewise.
(find_next_line): Likewise.
(grub_envblk_insert): Removed.
(grub_envblk_set): New function.
(grub_envblk_delete): Complete rewrite.
(grub_envblk_iterate): Likewise.
This commit is contained in:
okuji
parent
a9368fd30c
commit
5709cfc4d1
7 changed files with 3685 additions and 2644 deletions
342
lib/envblk.c
342
lib/envblk.c
|
|
@ -1,7 +1,7 @@
|
|||
/* envblk.c - Common function for environment block. */
|
||||
/* envblk.c - Common functions for environment block. */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2008 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2008,2009 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -20,137 +20,277 @@
|
|||
#include <config.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/lib/envblk.h>
|
||||
|
||||
grub_envblk_t
|
||||
grub_envblk_find (char *buf)
|
||||
grub_envblk_open (char *buf, grub_size_t size)
|
||||
{
|
||||
grub_uint32_t *pd;
|
||||
int len;
|
||||
grub_envblk_t envblk;
|
||||
|
||||
pd = (grub_uint32_t *) buf;
|
||||
|
||||
for (len = GRUB_ENVBLK_MAXLEN - 6; len > 0; len -= 4, pd++)
|
||||
if (*pd == GRUB_ENVBLK_SIGNATURE)
|
||||
{
|
||||
grub_envblk_t p;
|
||||
|
||||
p = (grub_envblk_t) pd;
|
||||
if (p->length <= len)
|
||||
return p;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
grub_envblk_insert (grub_envblk_t envblk, char *name, char *value)
|
||||
{
|
||||
char *p, *pend;
|
||||
char *found = 0;
|
||||
int nl;
|
||||
|
||||
nl = grub_strlen (name);
|
||||
p = envblk->data;
|
||||
pend = p + envblk->length;
|
||||
|
||||
while (*p)
|
||||
if (size < sizeof (GRUB_ENVBLK_SIGNATURE)
|
||||
|| grub_memcmp (buf, GRUB_ENVBLK_SIGNATURE,
|
||||
sizeof (GRUB_ENVBLK_SIGNATURE) - 1))
|
||||
{
|
||||
if ((! found) && (! grub_memcmp (name, p, nl)) && (p[nl] == '='))
|
||||
found = p + nl + 1;
|
||||
|
||||
p += grub_strlen (p) + 1;
|
||||
if (p >= pend)
|
||||
return 1;
|
||||
grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid environment block");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (found)
|
||||
|
||||
envblk = grub_malloc (sizeof (*envblk));
|
||||
if (envblk)
|
||||
{
|
||||
int len1, len2;
|
||||
|
||||
len1 = grub_strlen (found);
|
||||
len2 = grub_strlen (value);
|
||||
if ((p - envblk->data) + 1 - len1 + len2 > envblk->length)
|
||||
return 1;
|
||||
|
||||
grub_memcpy (found + len2 + 1, found + len1 + 1, (p - found) - len1);
|
||||
grub_strcpy (found, value);
|
||||
envblk->buf = buf;
|
||||
envblk->size = size;
|
||||
}
|
||||
else
|
||||
{
|
||||
int len2 = grub_strlen (value);
|
||||
|
||||
if ((p - envblk->data) + nl + 1 + len2 + 2 > envblk->length)
|
||||
return 1;
|
||||
|
||||
grub_strcpy (p, name);
|
||||
p[nl] = '=';
|
||||
grub_strcpy (p + nl + 1, value);
|
||||
p[nl + 1 + len2 + 1] = 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
return envblk;
|
||||
}
|
||||
|
||||
void
|
||||
grub_envblk_delete (grub_envblk_t envblk, char *name)
|
||||
grub_envblk_close (grub_envblk_t envblk)
|
||||
{
|
||||
grub_free (envblk->buf);
|
||||
grub_free (envblk);
|
||||
}
|
||||
|
||||
static int
|
||||
escaped_value_len (const char *value)
|
||||
{
|
||||
int n = 0;
|
||||
char *p;
|
||||
|
||||
for (p = (char *) value; *p; p++)
|
||||
{
|
||||
if (*p == '\\' || *p == '\n')
|
||||
n += 2;
|
||||
else
|
||||
n++;
|
||||
}
|
||||
|
||||
return n;
|
||||
}
|
||||
|
||||
static char *
|
||||
find_next_line (char *p, const char *pend)
|
||||
{
|
||||
while (p < pend)
|
||||
{
|
||||
if (*p == '\\')
|
||||
p += 2;
|
||||
else if (*p == '\n')
|
||||
break;
|
||||
else
|
||||
p++;
|
||||
}
|
||||
|
||||
return p + 1;
|
||||
}
|
||||
|
||||
int
|
||||
grub_envblk_set (grub_envblk_t envblk, const char *name, const char *value)
|
||||
{
|
||||
char *p, *pend;
|
||||
char *space;
|
||||
int found = 0;
|
||||
int nl;
|
||||
int vl;
|
||||
int i;
|
||||
|
||||
nl = grub_strlen (name);
|
||||
vl = escaped_value_len (value);
|
||||
p = envblk->buf + sizeof (GRUB_ENVBLK_SIGNATURE) - 1;
|
||||
pend = envblk->buf + envblk->size;
|
||||
|
||||
/* First, look at free space. */
|
||||
for (space = pend - 1; *space == '#'; space--)
|
||||
;
|
||||
|
||||
if (*space != '\n')
|
||||
/* Broken. */
|
||||
return 0;
|
||||
|
||||
space++;
|
||||
|
||||
while (p + nl + 1 < space)
|
||||
{
|
||||
if (grub_memcmp (p, name, nl) == 0 && p[nl] == '=')
|
||||
{
|
||||
int len;
|
||||
|
||||
/* Found the same name. */
|
||||
p += nl + 1;
|
||||
|
||||
/* Check the length of the current value. */
|
||||
len = 0;
|
||||
while (p + len < pend && p[len] != '\n')
|
||||
{
|
||||
if (p[len] == '\\')
|
||||
len += 2;
|
||||
else
|
||||
len++;
|
||||
}
|
||||
|
||||
if (p + len >= pend)
|
||||
/* Broken. */
|
||||
return 0;
|
||||
|
||||
if (pend - space < vl - len)
|
||||
/* No space. */
|
||||
return 0;
|
||||
|
||||
if (vl < len)
|
||||
{
|
||||
/* Move the following characters backward, and fill the new
|
||||
space with harmless characters. */
|
||||
grub_memmove (p + vl, p + len, pend - (p + len));
|
||||
grub_memset (space + len - vl, '#', len - vl);
|
||||
}
|
||||
else
|
||||
/* Move the following characters forward. */
|
||||
grub_memmove (p + vl, p + len, pend - (p + vl));
|
||||
|
||||
found = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
p = find_next_line (p, pend);
|
||||
}
|
||||
|
||||
if (! found)
|
||||
{
|
||||
/* Append a new variable. */
|
||||
|
||||
if (pend - space < nl + 1 + vl + 1)
|
||||
/* No space. */
|
||||
return 0;
|
||||
|
||||
grub_memcpy (space, name, nl);
|
||||
p = space + nl;
|
||||
*p++ = '=';
|
||||
}
|
||||
|
||||
/* Write the value. */
|
||||
for (i = 0; value[i]; i++)
|
||||
{
|
||||
if (value[i] == '\\' || value[i] == '\n')
|
||||
*p++ = '\\';
|
||||
|
||||
*p++ = value[i];
|
||||
}
|
||||
|
||||
*p = '\n';
|
||||
return 1;
|
||||
}
|
||||
|
||||
void
|
||||
grub_envblk_delete (grub_envblk_t envblk, const char *name)
|
||||
{
|
||||
char *p, *pend;
|
||||
char *found = 0;
|
||||
int nl;
|
||||
|
||||
nl = grub_strlen (name);
|
||||
p = envblk->data;
|
||||
pend = p + envblk->length;
|
||||
p = envblk->buf + sizeof (GRUB_ENVBLK_SIGNATURE) - 1;
|
||||
pend = envblk->buf + envblk->size;
|
||||
|
||||
while (*p)
|
||||
while (p + nl + 1 < pend)
|
||||
{
|
||||
if ((! found) && (! grub_memcmp (name, p, nl)) && (p[nl] == '='))
|
||||
found = p;
|
||||
if (grub_memcmp (p, name, nl) == 0 && p[nl] == '=')
|
||||
{
|
||||
/* Found. */
|
||||
int len = nl + 1;
|
||||
|
||||
p += grub_strlen (p) + 1;
|
||||
if (p >= pend)
|
||||
return;
|
||||
}
|
||||
while (p + len < pend)
|
||||
{
|
||||
if (p[len] == '\n')
|
||||
break;
|
||||
else if (p[len] == '\\')
|
||||
len += 2;
|
||||
else
|
||||
len++;
|
||||
}
|
||||
|
||||
if (found)
|
||||
{
|
||||
int len;
|
||||
if (p + len >= pend)
|
||||
/* Broken. */
|
||||
return;
|
||||
|
||||
len = grub_strlen (found);
|
||||
grub_memcpy (found, found + len + 1, (p - found) - len);
|
||||
}
|
||||
len++;
|
||||
grub_memmove (p, p + len, pend - (p + len));
|
||||
grub_memset (pend - len, '#', len);
|
||||
break;
|
||||
}
|
||||
|
||||
p = find_next_line (p, pend);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
grub_envblk_iterate (grub_envblk_t envblk,
|
||||
int hook (char *name, char *value))
|
||||
int hook (const char *name, const char *value))
|
||||
{
|
||||
char *p, *pend;
|
||||
|
||||
p = envblk->data;
|
||||
pend = p + envblk->length;
|
||||
p = envblk->buf + sizeof (GRUB_ENVBLK_SIGNATURE) - 1;
|
||||
pend = envblk->buf + envblk->size;
|
||||
|
||||
while (*p)
|
||||
while (p < pend)
|
||||
{
|
||||
char *v;
|
||||
int r;
|
||||
|
||||
v = grub_strchr (p, '=');
|
||||
if (v)
|
||||
if (*p != '#')
|
||||
{
|
||||
*v = 0;
|
||||
r = hook (p, v + 1);
|
||||
*v = '=';
|
||||
char *name;
|
||||
char *value;
|
||||
char *name_start, *name_end, *value_start;
|
||||
char *q;
|
||||
int ret;
|
||||
|
||||
name_start = p;
|
||||
while (p < pend && *p != '=')
|
||||
p++;
|
||||
if (p == pend)
|
||||
/* Broken. */
|
||||
return;
|
||||
name_end = p;
|
||||
|
||||
p++;
|
||||
value_start = p;
|
||||
while (p < pend)
|
||||
{
|
||||
if (*p == '\n')
|
||||
break;
|
||||
else if (*p == '\\')
|
||||
p += 2;
|
||||
else
|
||||
p++;
|
||||
}
|
||||
|
||||
if (p >= pend)
|
||||
/* Broken. */
|
||||
return;
|
||||
|
||||
name = grub_malloc (p - name_start + 1);
|
||||
if (! name)
|
||||
/* out of memory. */
|
||||
return;
|
||||
|
||||
value = name + (value_start - name_start);
|
||||
|
||||
grub_memcpy (name, name_start, name_end - name_start);
|
||||
name[name_end - name_start] = '\0';
|
||||
|
||||
for (p = value_start, q = value; *p != '\n'; ++p)
|
||||
{
|
||||
if (*p == '\\')
|
||||
*q++ = *++p;
|
||||
else
|
||||
*q++ = *p;
|
||||
}
|
||||
*q = '\0';
|
||||
|
||||
ret = hook (name, value);
|
||||
grub_free (name);
|
||||
if (ret)
|
||||
return;
|
||||
}
|
||||
else
|
||||
r = hook (p, "");
|
||||
|
||||
if (r)
|
||||
break;
|
||||
|
||||
p += grub_strlen (p) + 1;
|
||||
if (p >= pend)
|
||||
break;
|
||||
|
||||
p = find_next_line (p, pend);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue