2003-09-25 20:15:53 +00:00
|
|
|
/*
|
2004-04-04 13:46:03 +00:00
|
|
|
* GRUB -- GRand Unified Bootloader
|
2007-05-17 15:43:32 +00:00
|
|
|
* Copyright (C) 2003,2005,2006,2007 Free Software Foundation, Inc.
|
2003-09-25 20:15:53 +00:00
|
|
|
*
|
2007-07-21 23:32:33 +00:00
|
|
|
* GRUB is free software: you can redistribute it and/or modify
|
2003-09-25 20:15:53 +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
|
2003-09-25 20:15:53 +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,
|
2003-09-25 20:15:53 +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/>.
|
2003-09-25 20:15:53 +00:00
|
|
|
*/
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#include <grub/file.h>
|
|
|
|
#include <grub/misc.h>
|
|
|
|
#include <grub/dl.h>
|
|
|
|
#include <grub/normal.h>
|
|
|
|
#include <grub/types.h>
|
|
|
|
#include <grub/mm.h>
|
|
|
|
#include <grub/font.h>
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
struct entry
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_uint32_t code;
|
|
|
|
grub_uint32_t offset;
|
2003-09-25 20:15:53 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct font
|
|
|
|
{
|
|
|
|
struct font *next;
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_file_t file;
|
|
|
|
grub_uint32_t num;
|
2003-09-25 20:15:53 +00:00
|
|
|
struct entry table[0];
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct font *font_list;
|
|
|
|
|
2008-02-10 11:04:38 +00:00
|
|
|
/* Fill unknown glyph's with rounded question mark. */
|
|
|
|
static grub_uint8_t unknown_glyph[16] =
|
|
|
|
{ /* 76543210 */
|
|
|
|
0x7C, /* ooooo */
|
|
|
|
0x82, /* o o */
|
|
|
|
0xBA, /* o ooo o */
|
|
|
|
0xAA, /* o o o o */
|
|
|
|
0xAA, /* o o o o */
|
|
|
|
0x8A, /* o o o */
|
|
|
|
0x9A, /* o oo o */
|
|
|
|
0x92, /* o o o */
|
|
|
|
0x92, /* o o o */
|
|
|
|
0x92, /* o o o */
|
|
|
|
0x92, /* o o o */
|
|
|
|
0x82, /* o o */
|
|
|
|
0x92, /* o o o */
|
|
|
|
0x82, /* o o */
|
|
|
|
0x7C, /* ooooo */
|
|
|
|
0x00 /* */
|
|
|
|
};
|
|
|
|
|
2003-09-25 20:15:53 +00:00
|
|
|
static int
|
|
|
|
add_font (const char *filename)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_file_t file = 0;
|
2003-09-25 20:15:53 +00:00
|
|
|
char magic[4];
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_uint32_t num, i;
|
2003-09-25 20:15:53 +00:00
|
|
|
struct font *font = 0;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
file = grub_file_open (filename);
|
2003-09-25 20:15:53 +00:00
|
|
|
if (! file)
|
|
|
|
goto fail;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_file_read (file, magic, 4) != 4)
|
2003-09-25 20:15:53 +00:00
|
|
|
goto fail;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_memcmp (magic, GRUB_FONT_MAGIC, 4) != 0)
|
2003-09-25 20:15:53 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_error (GRUB_ERR_BAD_FONT, "invalid font magic");
|
2003-09-25 20:15:53 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_file_read (file, (char *) &num, 4) != 4)
|
2003-09-25 20:15:53 +00:00
|
|
|
goto fail;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
num = grub_le_to_cpu32 (num);
|
|
|
|
font = (struct font *) grub_malloc (sizeof (struct font)
|
2003-09-25 20:15:53 +00:00
|
|
|
+ sizeof (struct entry) * num);
|
|
|
|
if (! font)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
font->file = file;
|
|
|
|
font->num = num;
|
|
|
|
|
|
|
|
for (i = 0; i < num; i++)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_uint32_t code, offset;
|
2003-09-25 20:15:53 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_file_read (file, (char *) &code, 4) != 4)
|
2003-09-25 20:15:53 +00:00
|
|
|
goto fail;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_file_read (file, (char *) &offset, 4) != 4)
|
2003-09-25 20:15:53 +00:00
|
|
|
goto fail;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
font->table[i].code = grub_le_to_cpu32 (code);
|
|
|
|
font->table[i].offset = grub_le_to_cpu32 (offset);
|
2003-09-25 20:15:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
font->next = font_list;
|
|
|
|
font_list = font;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
if (font)
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (font);
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
if (file)
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_file_close (file);
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
remove_font (struct font *font)
|
|
|
|
{
|
|
|
|
struct font **p, *q;
|
|
|
|
|
|
|
|
for (p = &font_list, q = *p; q; p = &(q->next), q = q->next)
|
|
|
|
if (q == font)
|
|
|
|
{
|
|
|
|
*p = q->next;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_file_close (font->file);
|
|
|
|
grub_free (font);
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the offset of the glyph corresponding to the codepoint CODE
|
2006-03-14 19:08:34 +00:00
|
|
|
in the font FONT. If no found, return zero. */
|
2004-04-04 13:46:03 +00:00
|
|
|
static grub_uint32_t
|
|
|
|
find_glyph (const struct font *font, grub_uint32_t code)
|
2003-09-25 20:15:53 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_uint32_t start = 0;
|
|
|
|
grub_uint32_t end = font->num - 1;
|
2007-05-17 15:43:32 +00:00
|
|
|
const struct entry *table = font->table;
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
/* This shouldn't happen. */
|
|
|
|
if (font->num == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Do a binary search. */
|
|
|
|
while (start <= end)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_uint32_t i = (start + end) / 2;
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
if (table[i].code < code)
|
|
|
|
start = i + 1;
|
|
|
|
else if (table[i].code > code)
|
|
|
|
end = i - 1;
|
|
|
|
else
|
|
|
|
return table[i].offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the glyph to something stupid. */
|
|
|
|
static void
|
2006-03-14 19:08:34 +00:00
|
|
|
fill_with_default_glyph (grub_font_glyph_t glyph)
|
2003-09-25 20:15:53 +00:00
|
|
|
{
|
2006-03-14 19:08:34 +00:00
|
|
|
unsigned i;
|
2003-09-25 20:15:53 +00:00
|
|
|
|
2008-02-10 11:04:38 +00:00
|
|
|
/* Use pre-defined pattern to fill unknown glyphs. */
|
2006-03-14 19:08:34 +00:00
|
|
|
for (i = 0; i < 16; i++)
|
2008-02-10 11:04:38 +00:00
|
|
|
glyph->bitmap[i] = unknown_glyph[i];
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
glyph->char_width = 1;
|
|
|
|
glyph->width = glyph->char_width * 8;
|
|
|
|
glyph->height = 16;
|
|
|
|
glyph->baseline = (16 * 3) / 4;
|
2003-09-25 20:15:53 +00:00
|
|
|
}
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Get a glyph corresponding to the codepoint CODE. Always fill glyph
|
|
|
|
information with something, even if no glyph is found. */
|
2003-09-25 20:15:53 +00:00
|
|
|
int
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_font_get_glyph (grub_uint32_t code,
|
2006-03-14 19:08:34 +00:00
|
|
|
grub_font_glyph_t glyph)
|
2003-09-25 20:15:53 +00:00
|
|
|
{
|
|
|
|
struct font *font;
|
2006-03-14 19:08:34 +00:00
|
|
|
grub_uint8_t bitmap[32];
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
/* FIXME: It is necessary to cache glyphs! */
|
|
|
|
|
|
|
|
restart:
|
|
|
|
for (font = font_list; font; font = font->next)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_uint32_t offset;
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
offset = find_glyph (font, code);
|
|
|
|
if (offset)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_uint32_t w;
|
2006-03-14 19:08:34 +00:00
|
|
|
int len;
|
|
|
|
|
|
|
|
/* Make sure we can find glyphs for error messages. Push active
|
|
|
|
error message to error stack and reset error message. */
|
|
|
|
grub_error_push ();
|
2003-09-25 20:15:53 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_file_seek (font->file, offset);
|
2006-03-14 19:08:34 +00:00
|
|
|
if ((len = grub_file_read (font->file, (char *) &w, sizeof (w)))
|
|
|
|
!= sizeof (w))
|
2003-09-25 20:15:53 +00:00
|
|
|
{
|
2006-03-14 19:08:34 +00:00
|
|
|
remove_font (font);
|
|
|
|
goto restart;
|
2003-09-25 20:15:53 +00:00
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
w = grub_le_to_cpu32 (w);
|
2003-09-25 20:15:53 +00:00
|
|
|
if (w != 1 && w != 2)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
/* grub_error (GRUB_ERR_BAD_FONT, "invalid width"); */
|
2003-09-25 20:15:53 +00:00
|
|
|
remove_font (font);
|
|
|
|
goto restart;
|
|
|
|
}
|
|
|
|
|
2007-05-17 15:43:32 +00:00
|
|
|
if (grub_file_read (font->file, (char *) bitmap, w * 16)
|
|
|
|
!= (grub_ssize_t) w * 16)
|
2003-09-25 20:15:53 +00:00
|
|
|
{
|
|
|
|
remove_font (font);
|
|
|
|
goto restart;
|
|
|
|
}
|
2006-03-31 13:32:52 +00:00
|
|
|
|
|
|
|
/* Fill glyph with information. */
|
|
|
|
grub_memcpy (glyph->bitmap, bitmap, w * 16);
|
2006-03-14 19:08:34 +00:00
|
|
|
|
|
|
|
glyph->char_width = w;
|
|
|
|
glyph->width = glyph->char_width * 8;
|
|
|
|
glyph->height = 16;
|
|
|
|
glyph->baseline = (16 * 3) / 4;
|
|
|
|
|
|
|
|
/* Restore old error message. */
|
|
|
|
grub_error_pop ();
|
|
|
|
|
2003-09-25 20:15:53 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
/* Uggh... No font was found. */
|
|
|
|
fill_with_default_glyph (glyph);
|
2003-09-25 20:15:53 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
static grub_err_t
|
|
|
|
font_command (struct grub_arg_list *state __attribute__ ((unused)),
|
2004-03-14 Marco Gerards <metgerards@student.han.nl>
* commands/boot.c: New file.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/ls.c: Likewise.
* commands/terminal.c: Likewise.
* normal/command.c: Include <pupa/env.h> and <pupa/dl.h>.
(pupa_register_command): Changed interface to match the new
argument parser.
(pupa_command_execute): Changed (almost rewritten) so it uses
pupa_split_command. Added support for setting variables using the
syntax `foo=bar'.
(rescue_command): Changed to work with the new argument parser.
(terminal_command): Moved from here to commands/terminal.c.
(set_command): New function.
(unset_command): New function.
(insmod_command): New function.
(rmmod_command): New function.
(lsmod_command): New function.
(pupa_command_init): Don't initialize the command terminal
anymore. Initialize the commands set, unset, insmod, rmmod and
lsmod.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/env.c.
(kernel_img_HEADERS): Add arg.h and env.h.
(pupa_mkimage_LDFLAGS): Add kern/env.c.
(pupa_emu_SOURCES): Add kern/env.c, commands/ls.c,
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c,
normal/arg.c.
(pkgdata_MODULES): Add ls.mod, boot.mod, cmp.mod, cat.mod and
terminal.mod.
(normal_mod_SOURCES): Add normal/arg.c and normal/arg.c.
(boot_mod_SOURCES): New variable.
(terminal_mod_SOURCES): Likewise.
(ls_mod_SOURCES): Likewise.
(cmp_mod_SOURCES): Likewise.
(cat_mod_SOURCES): Likewise.
* normal/arg.c: New file.
* kern/env.c: Likewise.
* include/pupa/arg.h: Likewise.
* include/pupa/env.h: Likewise.
* font/manager.c (font_command): Changed to match argument parsing
interface changes.
(PUPA_MOD_INIT): Likewise.
* hello/hello.c (pupa_cmd_hello): Likewise.
(PUPA_MOD_INIT): Likewise.
* include/pupa/disk.h: Include <pupa/device.h>.
(pupa_print_partinfo): New prototype.
* include/pupa/dl.h (pupa_dl_set_prefix): Prototype removed.
(pupa_dl_get_prefix): Likewise.
* include/pupa/misc.h: Include <pupa/err.h>.
(pupa_isgraph): New prototype.
(pupa_isdigit): Likewise.
(pupa_split_cmdline): Likewise.
* include/pupa/normal.h: Include <pupa/arg.h>.
(pupa_command): Changed the prototype of the member `func' to
match the argument parsing interface. Added member `options'.
(pupa_register_command): Updated to match function.
(pupa_arg_parse): New prototype.
(pupa_hello_init) [PUPA_UTIL]: New prototype.
(pupa_hello_fini) [PUPA_UTIL]: Likewise.
(pupa_ls_init) [PUPA_UTIL]: Likewise.
(pupa_ls_fini) [PUPA_UTIL]: Likewise.
(pupa_cat_init) [PUPA_UTIL]: Likewise.
(pupa_cat_fini) [PUPA_UTIL]: Likewise.
(pupa_boot_init) [PUPA_UTIL]: Likewise.
(pupa_boot_fini) [PUPA_UTIL]: Likewise.
(pupa_cmp_init) [PUPA_UTIL]: Likewise.
(pupa_cmp_fini) [PUPA_UTIL]: Likewise.
(pupa_terminal_init) [PUPA_UTIL]: Likewise.
(pupa_terminal_fini) [PUPA_UTIL]: Likewise.
* kern/disk.c: Include <pupa/file.h>.
(pupa_print_partinfo): New function.
* kern/dl.c: Include <pupa/env.h>.
(pupa_dl_dir): Variable removed.
(pupa_dl_load): Use the environment variable `prefix' instead of
the variable pupa_dl_dir.
(pupa_dl_set_prefix): Function removed.
(pupa_dl_get_prefix): Likewise.
* kern/i386/pc/init.c: Include <pupa/env.h>.
(pupa_machine_init): Use the environment variable `prefix' instead of
using pupa_dl_set_prefix to set the prefix.
* kern/main.c: Include <pupa/env.h>.
(pupa_set_root_dev): Use the environment variable `prefix' instead of
using pupa_dl_get_prefix to get the prefix.
* kern/misc.c: Include <pupa/env.h>.
(pupa_isdigit): New function.
(pupa_isgraph): Likewise.
(pupa_ftoa): Likewise.
(pupa_vsprintf): Added support for printing values of the type
`double'. Make it possible to format variable output when using
formatting like `%1.2%f'.
(pupa_split_cmdline): New function.
* kern/rescue.c: Include <pupa/env.h>.
(next_word): Removed function.
(pupa_rescue_cmd_prefix): Likewise.
(pupa_rescue_cmd_set): New function.
(pupa_rescue_cmd_unset): New function.
(pupa_enter_rescue_mode): Use the `pupa_split_cmdline' function to
split the command line instead of splitting it here. Added
support for setting variables using the syntax `foo=bar'. Don't
initialize the prefix command anymore. Initialized the set and
unset commands.
* normal/cmdline.c: Include <pupa/env.h>.
(pupa_tab_complete): Added prototypes for print_simple_completion,
print_partition_completion, add_completion, iterate_commands,
iterate_dev, iterate_part and iterate_dir. Moved code to print
partition information from here to kern/disk.c.
(pupa_cmdline_run): Don't check if the funtion exists anymore.
* normal/main.c: Include <pupa/env.h>.
(pupa_rescue_cmd_normal): Use the environment variable `prefix'
instead of using pupa_dl_get_prefix to get the prefix.
* term/i386/pc/vga.c: Include <pupa/arg.h>.
(check_vga_mem): Cast pointers to `void *' to silence a gcc
warning.
(pupa_vga_putchar) [! DEBUG_VGA]: Removed for this case.
(pupa_vga_setcolor): Declare unused variables with `__attribute__
((unused))' to silence a gcc warning.
(pupa_vga_setcolor): Likewise.
(debug_command): Changed to match argument parsing
interface changes.
* util/pupa-emu.c: Include <pupa/env.h>.
(options): Added 0's for unused fields to silence a gcc warning.
(argp): Likewise.
(main): Use the environment variable `prefix' instead of using
pupa_dl_set_prefix to set the prefix. Initialize the commands ls,
boot, cmp, cat and terminal. Finish the commands boot, cmp, cat
and terminal.
* util/i386/pc/getroot.c: Include <pupa/i386/pc/util/biosdisk.h>.
* util/misc.c: Include <malloc.h>.
(pupa_malloc): Rewritten so errors are correctly reported.
(pupa_realloc): Likewise.
(pupa_memalign): Likewise.
(pupa_mm_init_region): Declare unused variables with
`__attribute__ ((unused))' to silence a gcc warning.
* normal/i386/setjmp.S: Remove tab at the end of the file to
silence a gcc warning.
* loader/i386/pc/linux.c (pupa_rescue_cmd_initrd): Declare unused
variables with `__attribute__ ((unused))' to silence a gcc
warning.
* loader/i386/pc/multiboot.c (pupa_multiboot_unload): Make the
local variable i unsigned to silence a gcc warning.
* kern/term.c: Include <pupa/misc.h>.
(pupa_more_lines): New variable.
(pupa_more): Likewise.
(pupa_putcode): When the pager is active pause at the end of every
screen.
(pupa_set_more): New function.
* include/pupa/term.h (pupa_set_more): New prototype.
2004-03-13 13:59:25 +00:00
|
|
|
int argc __attribute__ ((unused)),
|
|
|
|
char **args __attribute__ ((unused)))
|
2003-09-25 20:15:53 +00:00
|
|
|
{
|
|
|
|
if (argc == 0)
|
2004-04-04 13:46:03 +00:00
|
|
|
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no font specified");
|
2003-09-25 20:15:53 +00:00
|
|
|
|
|
|
|
while (argc--)
|
2004-03-14 Marco Gerards <metgerards@student.han.nl>
* commands/boot.c: New file.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/ls.c: Likewise.
* commands/terminal.c: Likewise.
* normal/command.c: Include <pupa/env.h> and <pupa/dl.h>.
(pupa_register_command): Changed interface to match the new
argument parser.
(pupa_command_execute): Changed (almost rewritten) so it uses
pupa_split_command. Added support for setting variables using the
syntax `foo=bar'.
(rescue_command): Changed to work with the new argument parser.
(terminal_command): Moved from here to commands/terminal.c.
(set_command): New function.
(unset_command): New function.
(insmod_command): New function.
(rmmod_command): New function.
(lsmod_command): New function.
(pupa_command_init): Don't initialize the command terminal
anymore. Initialize the commands set, unset, insmod, rmmod and
lsmod.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/env.c.
(kernel_img_HEADERS): Add arg.h and env.h.
(pupa_mkimage_LDFLAGS): Add kern/env.c.
(pupa_emu_SOURCES): Add kern/env.c, commands/ls.c,
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c,
normal/arg.c.
(pkgdata_MODULES): Add ls.mod, boot.mod, cmp.mod, cat.mod and
terminal.mod.
(normal_mod_SOURCES): Add normal/arg.c and normal/arg.c.
(boot_mod_SOURCES): New variable.
(terminal_mod_SOURCES): Likewise.
(ls_mod_SOURCES): Likewise.
(cmp_mod_SOURCES): Likewise.
(cat_mod_SOURCES): Likewise.
* normal/arg.c: New file.
* kern/env.c: Likewise.
* include/pupa/arg.h: Likewise.
* include/pupa/env.h: Likewise.
* font/manager.c (font_command): Changed to match argument parsing
interface changes.
(PUPA_MOD_INIT): Likewise.
* hello/hello.c (pupa_cmd_hello): Likewise.
(PUPA_MOD_INIT): Likewise.
* include/pupa/disk.h: Include <pupa/device.h>.
(pupa_print_partinfo): New prototype.
* include/pupa/dl.h (pupa_dl_set_prefix): Prototype removed.
(pupa_dl_get_prefix): Likewise.
* include/pupa/misc.h: Include <pupa/err.h>.
(pupa_isgraph): New prototype.
(pupa_isdigit): Likewise.
(pupa_split_cmdline): Likewise.
* include/pupa/normal.h: Include <pupa/arg.h>.
(pupa_command): Changed the prototype of the member `func' to
match the argument parsing interface. Added member `options'.
(pupa_register_command): Updated to match function.
(pupa_arg_parse): New prototype.
(pupa_hello_init) [PUPA_UTIL]: New prototype.
(pupa_hello_fini) [PUPA_UTIL]: Likewise.
(pupa_ls_init) [PUPA_UTIL]: Likewise.
(pupa_ls_fini) [PUPA_UTIL]: Likewise.
(pupa_cat_init) [PUPA_UTIL]: Likewise.
(pupa_cat_fini) [PUPA_UTIL]: Likewise.
(pupa_boot_init) [PUPA_UTIL]: Likewise.
(pupa_boot_fini) [PUPA_UTIL]: Likewise.
(pupa_cmp_init) [PUPA_UTIL]: Likewise.
(pupa_cmp_fini) [PUPA_UTIL]: Likewise.
(pupa_terminal_init) [PUPA_UTIL]: Likewise.
(pupa_terminal_fini) [PUPA_UTIL]: Likewise.
* kern/disk.c: Include <pupa/file.h>.
(pupa_print_partinfo): New function.
* kern/dl.c: Include <pupa/env.h>.
(pupa_dl_dir): Variable removed.
(pupa_dl_load): Use the environment variable `prefix' instead of
the variable pupa_dl_dir.
(pupa_dl_set_prefix): Function removed.
(pupa_dl_get_prefix): Likewise.
* kern/i386/pc/init.c: Include <pupa/env.h>.
(pupa_machine_init): Use the environment variable `prefix' instead of
using pupa_dl_set_prefix to set the prefix.
* kern/main.c: Include <pupa/env.h>.
(pupa_set_root_dev): Use the environment variable `prefix' instead of
using pupa_dl_get_prefix to get the prefix.
* kern/misc.c: Include <pupa/env.h>.
(pupa_isdigit): New function.
(pupa_isgraph): Likewise.
(pupa_ftoa): Likewise.
(pupa_vsprintf): Added support for printing values of the type
`double'. Make it possible to format variable output when using
formatting like `%1.2%f'.
(pupa_split_cmdline): New function.
* kern/rescue.c: Include <pupa/env.h>.
(next_word): Removed function.
(pupa_rescue_cmd_prefix): Likewise.
(pupa_rescue_cmd_set): New function.
(pupa_rescue_cmd_unset): New function.
(pupa_enter_rescue_mode): Use the `pupa_split_cmdline' function to
split the command line instead of splitting it here. Added
support for setting variables using the syntax `foo=bar'. Don't
initialize the prefix command anymore. Initialized the set and
unset commands.
* normal/cmdline.c: Include <pupa/env.h>.
(pupa_tab_complete): Added prototypes for print_simple_completion,
print_partition_completion, add_completion, iterate_commands,
iterate_dev, iterate_part and iterate_dir. Moved code to print
partition information from here to kern/disk.c.
(pupa_cmdline_run): Don't check if the funtion exists anymore.
* normal/main.c: Include <pupa/env.h>.
(pupa_rescue_cmd_normal): Use the environment variable `prefix'
instead of using pupa_dl_get_prefix to get the prefix.
* term/i386/pc/vga.c: Include <pupa/arg.h>.
(check_vga_mem): Cast pointers to `void *' to silence a gcc
warning.
(pupa_vga_putchar) [! DEBUG_VGA]: Removed for this case.
(pupa_vga_setcolor): Declare unused variables with `__attribute__
((unused))' to silence a gcc warning.
(pupa_vga_setcolor): Likewise.
(debug_command): Changed to match argument parsing
interface changes.
* util/pupa-emu.c: Include <pupa/env.h>.
(options): Added 0's for unused fields to silence a gcc warning.
(argp): Likewise.
(main): Use the environment variable `prefix' instead of using
pupa_dl_set_prefix to set the prefix. Initialize the commands ls,
boot, cmp, cat and terminal. Finish the commands boot, cmp, cat
and terminal.
* util/i386/pc/getroot.c: Include <pupa/i386/pc/util/biosdisk.h>.
* util/misc.c: Include <malloc.h>.
(pupa_malloc): Rewritten so errors are correctly reported.
(pupa_realloc): Likewise.
(pupa_memalign): Likewise.
(pupa_mm_init_region): Declare unused variables with
`__attribute__ ((unused))' to silence a gcc warning.
* normal/i386/setjmp.S: Remove tab at the end of the file to
silence a gcc warning.
* loader/i386/pc/linux.c (pupa_rescue_cmd_initrd): Declare unused
variables with `__attribute__ ((unused))' to silence a gcc
warning.
* loader/i386/pc/multiboot.c (pupa_multiboot_unload): Make the
local variable i unsigned to silence a gcc warning.
* kern/term.c: Include <pupa/misc.h>.
(pupa_more_lines): New variable.
(pupa_more): Likewise.
(pupa_putcode): When the pager is active pause at the end of every
screen.
(pupa_set_more): New function.
* include/pupa/term.h (pupa_set_more): New prototype.
2004-03-13 13:59:25 +00:00
|
|
|
if (! add_font (*args++))
|
2003-09-25 20:15:53 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
GRUB_MOD_INIT(font_manager)
|
2003-09-25 20:15:53 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_register_command ("font", font_command, GRUB_COMMAND_FLAG_BOTH,
|
2005-07-17 20:26:07 +00:00
|
|
|
"font FILE...",
|
|
|
|
"Specify one or more font files to display.", 0);
|
2003-09-25 20:15:53 +00:00
|
|
|
}
|
|
|
|
|
2006-03-14 19:08:34 +00:00
|
|
|
GRUB_MOD_FINI(font_manager)
|
2003-09-25 20:15:53 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_unregister_command ("font");
|
2003-09-25 20:15:53 +00:00
|
|
|
}
|