okuji
93f3a1d868
2005-02-27 Yoshinori K. Okuji <okuji@enbug.org>
...
* commands/default.h: New file.
* commands/timeout.h: Likewise.
* normal/context.c: Likewise.
* util/misc.c: Do not include sys/times.h.
Include sys/time.h and grub/machine/time.h.
(grub_get_rtc): Rewritten with gettimeofday.
* util/grub-emu.c (main): Call grub_default_init and
grub_timeout_init before grub_normal_init, and call
grub_timeout_fini and grub_default_fini after grub_main.
* util/console.c (grub_ncurses_checkkey): Return the read
character or -1.
* normal/menu.c (run_menu): Set MENU->TIMEOUT to -1 once it
timeouts.
* normal/main.c (read_config_file): Push MENU. If this fails,
print an error and wait for a user input.
Print an error only if GRUB_ERRNO is not GRUB_ERR_NONE.
If a menu is empty or an error occurs, pop MENU.
(grub_normal_execute): Pop and free MENU after grub_menu_run
returns.
* kern/loader.c (grub_loader_boot): Call grub_machine_fini.
* include/grub/powerpc/ieee1275/time.h [GRUB_UTIL]: Do not
include time.h.
[GRUB_UTIL] (GRUB_TICKS_PER_SECOND): Use the same definition as
without GRUB_UTIL.
* include/grub/i386/pc/time.h [GRUB_UTIL]: Do not include
time.h.
[GRUB_UTIL] (GRUB_TICKS_PER_SECOND): Use the same definition as
without GRUB_UTIL.
* include/grub/normal.h (struct grub_menu_list): New struct.
(grub_menu_list_t): New type.
(struct grub_context): New struct.
(grub_context_t): New type.
(grub_register_command): Got rid of EXPORT_FUNC.
(grub_unregister_command): Likewise.
(grub_context_get): New prototype.
(grub_context_get_current_menu): Likewise.
(grub_context_push_menu): Likewise.
(grub_context_pop_menu): Likewise.
[GRUB_UTIL] (grub_default_init): Likewise.
[GRUB_UTIL] (grub_default_fini): Likewise.
[GRUB_UTIL] (grub_timeout_init): Likewise.
[GRUB_UTIL] (grub_timeout_fini): Likewise.
* conf/i386-pc.rmk (grub_emu_SOURCES): Added commands/default.c,
commands/timeout.c and normal/context.c.
(pkgdata_MODULES): Added default.mod and timeout.mod.
(normal_mod_SOURCES): Added normal/context.c.
(default_mod_SOURCES): New variable.
(default_mod_CFLAGS): Likewise.
(timeout_mod_SOURCES): Likewise.
(timeout_mod_CFLAGS): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Copied from
conf/i386-pc.rmk.
(pkgdata_MODULES): Added default.mod and timeout.mod.
(normal_mod_SOURCES): Added normal/context.c.
(default_mod_SOURCES): New variable.
(default_mod_CFLAGS): Likewise.
(timeout_mod_SOURCES): Likewise.
(timeout_mod_CFLAGS): Likewise.
* Makefile.in (all-local): Added $(MKFILES).
2005-02-27 21:19:06 +00:00
okuji
4d4e372ebd
2005-02-19 Yoshinori K. Okuji <okuji@enbug.org>
...
This implements an Emacs-like menu entry editor.
* normal/menu_entry.c: New file.
* util/console.c (grub_ncurses_putchar): Translate some Unicode
characters to ASCII.
(saved_char): New variable.
(grub_ncurses_checkkey): Rewritten completely.
(grub_ncurses_getkey): Likewise.
(grub_ncurses_init): Call raw instead of cbreak.
* normal/menu.c (print_entry): Do not put a space.
(init_page): Renamed to ...
(grub_menu_init_page): ... this. All callers changed.
(edit_menu_entry): Removed.
(run_menu): Call grub_menu_entry_run instead of edit_menu_entry.
* normal/cmdline.c (grub_cmdline_run): Call grub_setcursor.
* kern/misc.c (grub_vprintf): Call grub_refresh.
* normal/menu.c (DISP_LEFT): Renamed to ...
* include/grub/term.h (GRUB_TERM_DISP_LEFT): ... this.
* normal/menu.c (DISP_UP): Renamed to ...
* include/grub/term.h (GRUB_TERM_DISP_UP): ... this.
* normal/menu.c (DISP_RIGHT): Renamed to ...
* include/grub/term.h (GRUB_TERM_DISP_RIGHT): ... this.
* normal/menu.c (DISP_DOWN): Renamed to ...
* include/grub/term.h (GRUB_TERM_DISP_DOWN): ... this.
* normal/menu.c (DISP_HLINE): Renamed to ...
* include/grub/term.h (GRUB_TERM_DISP_HLINE): ... this.
* normal/menu.c (DISP_VLINE): Renamed to ...
* include/grub/term.h (GRUB_TERM_DISP_VLINE): ... this.
* normal/menu.c (DISP_UL): Renamed to ...
* include/grub/term.h (GRUB_TERM_DISP_UL): ... this.
* normal/menu.c (DISP_UR): Renamed to ...
* include/grub/term.h (GRUB_TERM_DISP_UR): ... this.
* normal/menu.c (DISP_LL): Renamed to ...
* include/grub/term.h (GRUB_TERM_DISP_LL): ... this.
* normal/menu.c (DISP_LR): Renamed to ...
* include/grub/term.h (GRUB_TERM_DISP_LR): ... this.
* normal/menu.c (TERM_WIDTH): Renamed to ...
* include/grub/term.h (GRUB_TERM_WIDTH): ... this.
* normal/menu.c (TERM_HEIGHT): Renamed to ...
* include/grub/term.h (GRUB_TERM_HEIGHT): ... this.
* normal/menu.c (TERM_INFO_HEIGHT): Renamed to ...
* include/grub/term.h (GRUB_TERM_INFO_HEIGHT): ... this.
* normal/menu.c (TERM_MARGIN): Renamed to ...
* include/grub/term.h (GRUB_TERM_MARGIN): ... this.
* normal/menu.c (TERM_SCROLL_WIDTH): Renamed to ...
* include/grub/term.h (GRUB_TERM_SCROLL_WIDTH): ... this.
* normal/menu.c (TERM_TOP_BORDER_Y): Renamed to ...
* include/grub/term.h (GRUB_TERM_TOP_BORDER_Y): ... this.
* normal/menu.c (TERM_LEFT_BORDER_X): Renamed to ...
* include/grub/term.h (GRUB_TERM_LEFT_BORDER_X): ... this.
* normal/menu.c (TERM_BORDER_WIDTH): Renamed to ...
* include/grub/term.h (GRUB_TERM_BORDER_WIDTH): ... this.
* normal/menu.c (TERM_MESSAGE_HEIGHT): Renamed to ...
* include/grub/term.h (GRUB_TERM_MESSAGE_HEIGHT): ... this.
* normal/menu.c (TERM_BORDER_HEIGHT): Renamed to ...
* include/grub/term.h (GRUB_TERM_BORDER_HEIGHT): ... this.
* normal/menu.c (TERM_NUM_ENTRIES): Renamed to ...
* include/grub/term.h (GRUB_TERM_NUM_ENTRIES): ... this.
* normal/menu.c (TERM_FIRST_ENTRY_Y): Renamed to ...
* include/grub/term.h (GRUB_TERM_FIRST_ENTRY_Y): ... this.
* normal/menu.c (TERM_ENTRY_WIDTH): Renamed to ...
* include/grub/term.h (GRUB_TERM_ENTRY_WIDTH): ... this.
* normal/menu.c (TERM_CURSOR_X): Renamed to ...
* include/grub/term.h (GRUB_TERM_CURSOR_X): ... this.
All callers changed.
* include/grub/normal.h: New prototype.
* conf/i386-pc.rmk (grub_emu_SOURCES): Added
normal/menu_entry.c.
(normal_mod_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
(normal_mod_SOURCES): Likewise.
2005-02-15 Yoshinori K. Okuji <okuji@enbug.org>
* include/grub/normal.h (grub_halt_init): New prototype.
(grub_halt_fini): Likewise.
(grub_reboot_init): Likewise.
(grub_reboot_fini): Likewise.
* util/grub-emu.c: Include signal.h.
(main_env): New global variable.
(grub_machine_init): Ignore SIGINT. Otherwise grub-emu cannot
catch C-c.
(grub_machine_fini): New function.
(main): Call grub_halt_init and grub_reboot_init before
grub_main, and grub_reboot_fini and grub_halt_fini after it.
Call setjmp with MAIN_ENV to go back afterwards.
Call grub_machine_fini right before return.
* include/grub/util/misc.h: Include setjmp.h.
(main_env): New prototype.
* include/grub/kernel.h (grub_machine_fini): New prototype.
* include/grub/i386/pc/biosdisk.h (grub_biosdisk_fini): Likewise.
* include/grub/i386/pc/console.h (grub_console_fini): Likewise.
* disk/i386/pc/biosdisk.c (grub_biosdisk_fini): New function.
* kern/i386/pc/init.c (grub_machine_fini): Likewise.
* term/i386/pc/console.c (grub_console_fini): Likewise.
* util/i386/pc/misc.c: New file.
* conf/i386-pc.rmk (grub_emu_SOURCES): Added
util/i386/pc/misc.c, commands/i386/pc/halt.c and
commands/i386/pc/reboot.c.
2005-02-19 20:56:07 +00:00
okuji
e6b92c8afb
2005-02-15 Yoshinori K. Okuji <okuji@enbug.org>
...
* include/grub/normal.h (grub_halt_init): New prototype.
(grub_halt_fini): Likewise.
(grub_reboot_init): Likewise.
(grub_reboot_fini): Likewise.
* util/grub-emu.c: Include signal.h.
(main_env): New global variable.
(grub_machine_init): Ignore SIGINT. Otherwise grub-emu cannot
catch C-c.
(grub_machine_fini): New function.
(main): Call grub_halt_init and grub_reboot_init before
grub_main, and grub_reboot_fini and grub_halt_fini after it.
Call setjmp with MAIN_ENV to go back afterwards.
Call grub_machine_fini right before return.
* include/grub/util/misc.h: Include setjmp.h.
(main_env): New prototype.
* include/grub/kernel.h (grub_machine_fini): New prototype.
* include/grub/i386/pc/biosdisk.h (grub_biosdisk_fini): Likewise.
* include/grub/i386/pc/console.h (grub_console_fini): Likewise.
* disk/i386/pc/biosdisk.c (grub_biosdisk_fini): New function.
* kern/i386/pc/init.c (grub_machine_fini): Likewise.
* term/i386/pc/console.c (grub_console_fini): Likewise.
* util/i386/pc/misc.c: New file.
* conf/i386-pc.rmk (grub_emu_SOURCES): Added
util/i386/pc/misc.c, commands/i386/pc/halt.c and
commands/i386/pc/reboot.c.
2005-02-15 00:07:01 +00:00
okuji
4b13b216f4
2004-04-04 Yoshinori K. Okuji <okuji@enbug.org>
...
All symbols prefixed with PUPA_ and pupa_ are renamed to GRUB_
and grub_, respectively. Because the conversion is trivial and
mechanical, I omit the details here. Please refer to the CVS
if you need more information.
2004-04-04 13:46:03 +00:00
jeroen
8c8cc20511
2004-03-14 Jeroen Dekkers <jeroen@dekkers.cx>
...
* Makefile.in: Update copyright.
* genmodsrc.sh: Likewise.
* gensymlist.sh: Likewise.
* term/i386/pc/vga.c: Indent correctly.
* util/i386/pc/pupa-mkimage.c (usage): Use PACKAGE_BUGREPORT as
bugreporting address.
* util/i386/pc/pupa-setup.c (usage): Likewise,
(main): Call pupa_ext2_init and pupa_ext2_fini.
* fs/fat.c (log2): Renamed to ...
(fat_log2): ... this.
All callers changed.
* kern/misc.c (memcpy): Alias to pupa_memmove.
* loader/i386/pc/multiboot.c (pupa_rescue_cmd_multiboot): Fix
lvalue cast.
* util/console.c (pupa_ncurses_fini): Return 0.
* util/i386/pc/biosdisk.c (pupa_util_biosdisk_open)[__linux__]:
Move fail label here.
[__GNU__]: Don't warn when using stat.
(open_device)[!__linux__]: Check if FD < 0 instead of !FD.
(pupa_util_biosdisk_get_pupa_dev)[__GNU__]: Change type of N to
long int. Use strtol instead of strtoul.
2004-03-14 17:48:25 +00:00
okuji
8367695cff
shinori K. Okuji <okuji@enbug.org>
...
* genkernsyms.sh: Updated copyright information.
* genmk.rb: Likewise.
* genmodsrc.sh: Likewise.
* gensymlist.sh: Likewise.
* boot/i386/pc/boot.S: Likewise.
* boot/i386/pc/diskboot.S: Likewise.
* disk/i386/pc/biosdisk.c: Likewise.
* disk/i386/pc/partition.c: Likewise.
* font/manager.c: Likewise.
* fs/ext2.c: Likewise.
* fs/fat.c: Likewise.
* include/pupa/boot.h: Likewise.
* include/pupa/device.h: Likewise.
* include/pupa/disk.h: Likewise.
* include/pupa/dl.h: Likewise.
* include/pupa/elf.h: Likewise.
* include/pupa/err.h: Likewise.
* include/pupa/file.h: Likewise.
* include/pupa/font.h: Likewise.
* include/pupa/fs.h: Likewise.
* include/pupa/kernel.h: Likewise.
* include/pupa/loader.h: Likewise.
* include/pupa/misc.h: Likewise.
* include/pupa/mm.h: Likewise.
* include/pupa/net.h: Likewise.
* include/pupa/normal.h: Likewise.
* include/pupa/rescue.h: Likewise.
* include/pupa/setjmp.h: Likewise.
* include/pupa/symbol.h: Likewise.
* include/pupa/term.h: Likewise.
* include/pupa/types.h: Likewise.
* include/pupa/i386/setjmp.h: Likewise.
* include/pupa/i386/types.h: Likewise.
* include/pupa/i386/pc/biosdisk.h: Likewise.
* include/pupa/i386/pc/boot.h: Likewise.
* include/pupa/i386/pc/console.h: Likewise.
* include/pupa/i386/pc/init.h: Likewise.
* include/pupa/i386/pc/kernel.h: Likewise.
* include/pupa/i386/pc/linux.h: Likewise.
* include/pupa/i386/pc/loader.h: Likewise.
* include/pupa/i386/pc/memory.h: Likewise.
* include/pupa/i386/pc/multiboot.h: Likewise.
* include/pupa/i386/pc/partition.h: Likewise.
* include/pupa/i386/pc/time.h: Likewise.
* include/pupa/i386/pc/vga.h: Likewise.
* include/pupa/i386/pc/util/biosdisk.h: Likewise.
* include/pupa/util/getroot.h: Likewise.
* include/pupa/util/misc.h: Likewise.
* include/pupa/util/resolve.h: Likewise.
* kern/device.c: Likewise.
* kern/disk.c: Likewise.
* kern/dl.c: Likewise.
* kern/err.c: Likewise.
* kern/file.c: Likewise.
* kern/fs.c: Likewise.
* kern/loader.c: Likewise.
* kern/main.c: Likewise.
* kern/misc.c: Likewise.
* kern/mm.c: Likewise.
* kern/rescue.c: Likewise.
* kern/term.c: Likewise.
* kern/i386/dl.c: Likewise.
* kern/i386/pc/init.c: Likewise.
* kern/i386/pc/lzo1x.S: Likewise.
* kern/i386/pc/startup.S: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/i386/pc/multiboot.c: Likewise.
* normal/cmdline.c: Likewise.
* normal/command.c: Likewise.
* normal/main.c: Likewise.
* normal/menu.c: Likewise.
* normal/i386/setjmp.S: Likewise.
* term/i386/pc/console.c: Likewise.
* term/i386/pc/vga.c: Likewise.
* util/console.c: Likewise.
* util/genmoddep.c: Likewise.
* util/misc.c: Likewise.
* util/pupa-emu.c: Likewise.
* util/resolve.c: Likewise.
* util/unifont2pff.rb: Likewise.
* util/i386/pc/biosdisk.c: Likewise.
* util/i386/pc/getroot.c: Likewise.
* util/i386/pc/pupa-mkimage.c: Likewise.
* util/i386/pc/pupa-setup.c: Likewise.
2004-02-24 17:21:53 +00:00
marco_g
5aded270b6
2003-12-03 Marco Gerards <metgerards@student.han.nl>
...
* fs/ext2.c (pupa_ext2_label): New function.
(pupa_ext2_fs): Added label.
* fs/fat.c (pupa_fat_label): New function.
(pupa_fat_fs): Added label.
* include/pupa/fs.h (struct pupa_fs): Added prototype label.
* kern/misc.c (pupa_strndup): New function.
* include/pupa/misc.h (pupa_strndup): New prototype.
* include/pupa/normal.h: Include <pupa/err.h>.
(pupa_set_history): New prototype.
(pupa_iterate_commands): New prototype.
* normal/cmdline.c: Include <pupa/machine/partition.h>,
<pupa/disk.h>, <pupa/file.h>.
(hist_size): New variable.
(hist_lines): Likewise.
(hist_end): Likewise.
(hist_used): Likewise.
(pupa_set_history): New function.
(pupa_history_get): Likewise.
(pupa_history_add): Likewise.
(pupa_history_replace): Likewise.
(pupa_tab_complete): Likewise.
(pupa_cmdline_run): Added tab completion and history buffer. Tab
completion shows partitionnames while completing partitions, this
feature was suggested by Jeff Bailey.
* normal/command.c (pupa_iterate_commands): New function.
* normal/main.c (PUPA_DEFAULT_HISTORY_SIZE): New macro.
(pupa_normal_init): Initialize history buffer.
(PUPA_MOD_INIT): Likewise.
(pupa_normal_fini): Free the history buffer.
(PUPA_MOD_FINI): Likewise.
* util/console.c (pupa_ncurses_getkey): Accept 127 as backspace
key.
* aclocal.m4 (pupa_I386_CHECK_REGPARM_BUG): New DEFUN.
* configure.ac [i386]: Check for regparam bug.
(NESTED_FUNC_ATTR) [! i386]: Defined.
2003-12-03 19:17:27 +00:00
marco_g
1f7315a3de
2003-11-17 Marco Gerards <metgerards@student.han.nl>
...
* 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.
2003-11-17 18:07:09 +00:00
okuji
jeroen
marco_g