2008-07-27 Bean <bean123ch@gmail.com>

* commands/crc.c: New file.

	* lib/crc.c: Likewise.

	* include/grub/lib/crc.h: Likewise.

	* util/grub-fstest.c: grub/hexdump.h => grub/lib/hexdump.h.

	* commands/hexdump.c: grub/hexdump.h => grub/lib/hexdump.h.
	(hexdump): Move this function to ...

	* lib/hexdump.c: ... here.

	* include/grub/hexdump.h: Renamed to ...

	* include/grub/lib/hexdump.h: ... this.

	* commands/loadenv.c: grub/envblk.h => grub/lib/envblk.h

	* util/grub-editenv.c: Likewise.

	* include/envblk.h: Renamed to ...

	* include/lib/envblk.h: ... this.

	* util/envblk.c: Renamed to ...

	* lib/envblk.c: ... this.

	* conf/common.rmk (grub_fstest_SOURCES): commands/hexdump.c =>
	lib/hexdump.c.
	(grub_editenv_SOURCES): util/envblk.c => lib/envblk.c
	(pkglib_MODULES): Add crc.mod.
	(hexdump_mod_SOURCES): Add lib/hexdump.c.
	(loadenv_mod_SOURCES): util/envblk.c => lib/envblk.c.
	(crc_mod_SOURCES): New macro.
	(crc_mod_CFLAGS): Likewise.
	(crc_mod_LDFLAGS): Likewise.

	* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add lib/hexdump.c.

	* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.

	* conf/i386-pc.rmk (grub_emu_SOURCES): Likewise.

	* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.

	* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
This commit is contained in:
bean 2008-07-27 13:51:30 +00:00
parent 8749e9e524
commit a85cd5a0b5
26 changed files with 479 additions and 125 deletions

75
lib/crc.c Normal file
View file

@ -0,0 +1,75 @@
/* crc.c - crc function */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2008 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* GRUB is distributed in the hope that it will be useful,
* 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
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <grub/types.h>
#include <grub/lib/crc.h>
static grub_uint32_t crc32_table [256];
static void
init_crc32_table (void)
{
auto grub_uint32_t reflect (grub_uint32_t ref, int len);
grub_uint32_t reflect (grub_uint32_t ref, int len)
{
grub_uint32_t result = 0;
int i;
for (i = 1; i <= len; i++)
{
if (ref & 1)
result |= 1 << (len - i);
ref >>= 1;
}
return result;
}
grub_uint32_t polynomial = 0x04c11db7;
int i, j;
for(i = 0; i < 256; i++)
{
crc32_table[i] = reflect(i, 8) << 24;
for (j = 0; j < 8; j++)
crc32_table[i] = (crc32_table[i] << 1) ^
(crc32_table[i] & (1 << 31) ? polynomial : 0);
crc32_table[i] = reflect(crc32_table[i], 32);
}
}
grub_uint32_t
grub_getcrc32 (grub_uint32_t crc, void *buf, int size)
{
int i;
grub_uint8_t *data = buf;
if (! crc32_table[1])
init_crc32_table ();
crc^= 0xffffffff;
for (i = 0; i < size; i++)
{
crc = (crc >> 8) ^ crc32_table[(crc & 0xFF) ^ *data];
data++;
}
return crc ^ 0xffffffff;
}

156
lib/envblk.c Normal file
View file

@ -0,0 +1,156 @@
/* envblk.c - Common function for environment block. */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2008 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* GRUB is distributed in the hope that it will be useful,
* 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
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
#include <grub/types.h>
#include <grub/misc.h>
#include <grub/lib/envblk.h>
grub_envblk_t
grub_envblk_find (char *buf)
{
grub_uint32_t *pd;
int len;
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 ((! found) && (! grub_memcmp (name, p, nl)) && (p[nl] == '='))
found = p + nl + 1;
p += grub_strlen (p) + 1;
if (p >= pend)
return 1;
}
if (found)
{
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);
}
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;
}
void
grub_envblk_delete (grub_envblk_t envblk, char *name)
{
char *p, *pend;
char *found = 0;
int nl;
nl = grub_strlen (name);
p = envblk->data;
pend = p + envblk->length;
while (*p)
{
if ((! found) && (! grub_memcmp (name, p, nl)) && (p[nl] == '='))
found = p;
p += grub_strlen (p) + 1;
if (p >= pend)
return;
}
if (found)
{
int len;
len = grub_strlen (found);
grub_memcpy (found, found + len + 1, (p - found) - len);
}
}
void
grub_envblk_iterate (grub_envblk_t envblk,
int hook (char *name, char *value))
{
char *p, *pend;
p = envblk->data;
pend = p + envblk->length;
while (*p)
{
char *v;
int r;
v = grub_strchr (p, '=');
if (v)
{
*v = 0;
r = hook (p, v + 1);
*v = '=';
}
else
r = hook (p, "");
if (r)
break;
p += grub_strlen (p) + 1;
if (p >= pend)
break;
}
}

68
lib/hexdump.c Normal file
View file

@ -0,0 +1,68 @@
/* hexdump.c - hexdump function */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2008 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* GRUB is distributed in the hope that it will be useful,
* 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
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <grub/types.h>
#include <grub/misc.h>
#include <grub/lib/hexdump.h>
void
hexdump (unsigned long bse, char *buf, int len)
{
int pos;
char line[80];
while (len > 0)
{
int cnt, i;
pos = grub_sprintf (line, "%08lx ", bse);
cnt = 16;
if (cnt > len)
cnt = len;
for (i = 0; i < cnt; i++)
{
pos += grub_sprintf (&line[pos], "%02x ", (unsigned char) buf[i]);
if ((i & 7) == 7)
line[pos++] = ' ';
}
for (; i < 16; i++)
{
pos += grub_sprintf (&line[pos], " ");
if ((i & 7) == 7)
line[pos++] = ' ';
}
line[pos++] = '|';
for (i = 0; i < cnt; i++)
line[pos++] = ((buf[i] >= 32) && (buf[i] < 127)) ? buf[i] : '.';
line[pos++] = '|';
line[pos] = 0;
grub_printf ("%s\n", line);
bse += 16;
buf += 16;
len -= cnt;
}
}