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

2003-11-17 Marco Gerards <metgerards@student.han.nl>

Browse source 
* conf/i386-pc.rmk (sbin_UTILITIES): Added pupa-emu.
	(pupa_setup_SOURCES): Added util/i386/pc/getroot.c.
	(pupa_emu_SOURCES): New variable.
	(pupa_emu_LDFLAGS): Likewise.
	* include/pupa/fs.h (pupa_ext2_init) [PUPA_UTIL]: New prototype.
	(pupa_ext2_fini) [PUPA_UTIL]: Likewise.
	* include/pupa/normal.h (pupa_normal_init) [PUPA_UTIL]: Likewise.
	(pupa_normal_fini) [PUPA_UTIL]: Likewise.
	* include/pupa/setjmp.h [PUPA_UTIL]: Include <setjmp.h>.
	(pupa_jmp_buf): New typedef.
	(pupa_setjmp) [PUPA_UTIL]: New macro.
	(pupa_longjmp) [PUPA_UTIL]: Likewise.
	* include/pupa/term.h (struct pupa_term): New member `refresh'.
	(pupa_refresh): New prototype.
	* include/pupa/util/getroot.h: New file.
	* kern/misc.c (pupa_vsprintf): Refresh the screen after updating
	it.
	* kern/rescue.c (pupa_rescue_get_command_line): Likewise.
	(pupa_rescue_cmd_cat): Likewise.
	(pupa_rescue_cmd_ls): Likewise.
	(pupa_rescue_cmd_testload): Likewise.
	(pupa_rescue_cmd_lsmod): Likewise.
	* normal/cmdline.c (pupa_cmdline_get): Likewise.
	* normal/menu.c (run_menu): Likewise.
	* kern/term.c (pupa_cls): Likewise.
	(pupa_refresh): New function.
	* normal/normal.c (pupa_normal_init) [PUPA_UTIL]: New function.
	(pupa_normal_fini) [PUPA_UTIL]: Likewise.
	* util/console.c: New file.

	* util/i386/pc/getroot.c: New file.
	* util/i386/pc/pupa-setup.c: Include <pupa/util/getroot.h>.
	(pupa_putchar): New function.
	(pupa_refresh): Likewise.
	(xgetcwd): Function moved to ...
	(strip_extra_slashes): Likewise.
	(get_prefix): Likewise.
	* util/i386/pc/getroot.c: ... here.
	(find_root_device): Function moved and renamed to...
	* util/i386/pc/getroot.c (pupa_find_root_device): ... here.
	Changed all callers.
	* util/i386/pc/pupa-setup.c (guess_root_device): Function moved
	and renamed to...
	* util/i386/pc/getroot.c (pupa_guess_root_device): ... here.
	Changed all callers.
	* util/misc.c (pupa_memalign): New function.
	(pupa_mm_init_region): Likewise.
	(pupa_register_exported_symbols): Likewise.
	(pupa_putchar): Function removed.
	* util/pupa-emu.c: New file.
This commit is contained in:
marco_g 2003-11-17 18:07:09 +00:00
parent 9a5c1adeaa
commit 1f7315a3de
19 changed files with 1027 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

1
normal/cmdline.c
View file

@ -285,6 +285,7 @@ pupa_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
}
pupa_putchar ('\n');
pupa_refresh ();
/* If ECHO_CHAR is NUL, remove leading spaces. */
lpos = 0;

22
normal/main.c
View file

@ -332,6 +332,27 @@ pupa_rescue_cmd_normal (int argc, char *argv[])
pupa_enter_normal_mode (argv[0]);
}
#ifdef PUPA_UTIL
void
pupa_normal_init (void)
{
/* Register a command "normal" for the rescue mode. */
pupa_rescue_register_command ("normal", pupa_rescue_cmd_normal,
"enter normal mode");
/* This registers some built-in commands. */
pupa_command_init ();
}
void
pupa_normal_fini (void)
{
pupa_rescue_unregister_command ("normal");
}
#else /* ! PUPA_UTIL */
PUPA_MOD_INIT
{
/* Normal mode shouldn't be unloaded. */
@ -349,3 +370,4 @@ PUPA_MOD_FINI
{
pupa_rescue_unregister_command ("normal");
}
#endif /* ! PUPA_UTIL */

3
normal/menu.c
View file

@ -183,6 +183,7 @@ run_menu (pupa_menu_t menu, int nested)
init_page (nested);
print_entries (menu, first, offset);
pupa_refresh ();
while (1)
{
@ -251,6 +252,8 @@ run_menu (pupa_menu_t menu, int nested)
default:
break;
}
pupa_refresh ();
}
/* Never reach here. */