2003-01-20 04:13:46 +00:00
|
|
|
/*
|
2004-04-04 13:46:03 +00:00
|
|
|
* GRUB -- GRand Unified Bootloader
|
2005-01-31 21:40:25 +00:00
|
|
|
* Copyright (C) 1999,2000,2001,2002,2003,2004,2005 Free Software Foundation, Inc.
|
2003-01-20 04:13:46 +00:00
|
|
|
*
|
|
|
|
* This program 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 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program 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 this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*/
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#include <grub/normal.h>
|
|
|
|
#include <grub/misc.h>
|
|
|
|
#include <grub/term.h>
|
|
|
|
#include <grub/err.h>
|
|
|
|
#include <grub/types.h>
|
|
|
|
#include <grub/mm.h>
|
2004-12-04 Marco Gerards <metgerards@student.han.nl>
Modulize the partition map support and add support for the amiga
partition map.
* commands/ls.c: Include <grub/partition.h> instead of
<grub/machine/partition.h>.
* kern/disk.c: Likewise.
* kern/rescue.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* normal/cmdline.c: Likewise.
* kern/powerpc/ieee1275/init.c: Likewise.
(grub_machine_init): Call `grub_pc_partition_map_init',
`grub_amiga_partition_map_init' and
`grub_apple_partition_map_init'.
* conf/i386-pc.rmk (kernel_img_SOURCES): Remove
`disk/i386/pc/partition.c'. Add `kern/partition.c'.
(kernel_img_HEADERS): Remove `machine/partition.h'. Add
`partition.h' and `pc_partition.h'.
(grub_setup_SOURCES): Remove
`disk/i386/pc/partition.c'. Add `kern/partition.c',
`partmap/amiga.c', `partmap/apple.c' and `partmap/pc.c'.
(grub_emu_SOURCES): Likewise.
(pkgdata_MODULES): Add `amiga.mod', `apple.mod' and `pc.mod'.
(amiga_mod_SOURCES, amiga_mod_CFLAGS, apple_mod_SOURCES)
(apple_mod_CFLAGS, pc_mod_SOURCES, pc_mod_CFLAGS): New variables.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Remove
`disk/powerpc/ieee1275/partition.c'. Add `kern/partition.c',
`partmap/amiga.c', `partmap/apple.c' and `partmap/pc.c'.
(grubof_SOURCES): Likewise.
* disk/i386/pc/partition.c: File removed.
* disk/powerpc/ieee1275/partition.c: Likewise.
* include/grub/powerpc/ieee1275/partition.h: Likewise.
* include/grub/i386/pc/partition.h: Likewise.
* kern/partition.c: New file.
* partmap/amiga.c: Likewise.
* partmap/apple.c: Likewise.
* partmap/pc.c: Likewise.
* include/grub/partition.h: Likewise..
* include/grub/pc_partition.h: Likewise.
* util/grub-emu.c: Include <grub/partition.h> instead of
<grub/machine/partition.h>.
(main): Call `grub_pc_partition_map_init',
`grub_amiga_partition_map_init' and
`grub_apple_partition_map_init' and deinitialize afterwards.
* util/i386/pc/biosdisk.c: Include `#include
<grub/partition.h>' and `include <grub/pc_partition.h>' instead of
`<grub/machine/partition.h>'.
* util/i386/pc/grub-setup.c: Likewise.
* util/i386/pc/biosdisk.c: Likewise.
(grub_util_biosdisk_get_grub_dev): Only access the PC specific
partition information in case of a PC partition.
* util/i386/pc/grub-setup.c: Include `#include
<grub/partition.h>' and `include <grub/pc_partition.h>' instead of
`<grub/machine/partition.h>'.
(setup): Only access the PC specific partition information in case
of a PC partition.
2004-12-04 18:45:46 +00:00
|
|
|
#include <grub/partition.h>
|
2004-04-04 13:46:03 +00:00
|
|
|
#include <grub/disk.h>
|
|
|
|
#include <grub/file.h>
|
|
|
|
#include <grub/env.h>
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
static char *kill_buf;
|
|
|
|
|
2003-12-03 19:17:27 +00:00
|
|
|
static int hist_size;
|
|
|
|
static char **hist_lines = 0;
|
|
|
|
static int hist_pos = 0;
|
|
|
|
static int hist_end = 0;
|
|
|
|
static int hist_used = 0;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_err_t
|
|
|
|
grub_set_history (int newsize)
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
|
|
|
char **old_hist_lines = hist_lines;
|
2004-04-04 13:46:03 +00:00
|
|
|
hist_lines = grub_malloc (sizeof (char *) * newsize);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
/* Copy the old lines into the new buffer. */
|
|
|
|
if (old_hist_lines)
|
|
|
|
{
|
|
|
|
/* Remove the lines that don't fit in the new buffer. */
|
|
|
|
if (newsize < hist_used)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int delsize = hist_used - newsize;
|
|
|
|
hist_used = newsize;
|
|
|
|
|
2004-06-27 11:03:24 +00:00
|
|
|
for (i = 1; i <= delsize; i++)
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
|
|
|
int pos = hist_end - i;
|
2004-06-27 11:03:24 +00:00
|
|
|
if (pos < 0)
|
|
|
|
pos += hist_size;
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (old_hist_lines[pos]);
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
hist_end -= delsize;
|
|
|
|
if (hist_end < 0)
|
2004-06-27 11:03:24 +00:00
|
|
|
hist_end += hist_size;
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (hist_pos < hist_end)
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_memmove (hist_lines, old_hist_lines + hist_pos,
|
2003-12-03 19:17:27 +00:00
|
|
|
(hist_end - hist_pos) * sizeof (char *));
|
2004-06-27 11:03:24 +00:00
|
|
|
else if (hist_used)
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
2004-06-27 11:03:24 +00:00
|
|
|
/* Copy the older part. */
|
|
|
|
grub_memmove (hist_lines, old_hist_lines + hist_pos,
|
|
|
|
(hist_size - hist_pos) * sizeof (char *));
|
|
|
|
|
|
|
|
/* Copy the newer part. */
|
|
|
|
grub_memmove (hist_lines + hist_size - hist_pos, old_hist_lines,
|
|
|
|
hist_end * sizeof (char *));
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (old_hist_lines);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
hist_size = newsize;
|
|
|
|
hist_pos = 0;
|
|
|
|
hist_end = hist_used;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the entry POS from the history where `0' is the newest
|
|
|
|
entry. */
|
|
|
|
static char *
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_history_get (int pos)
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
|
|
|
pos = (hist_pos + pos) % hist_size;
|
|
|
|
return hist_lines[pos];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Insert a new history line S on the top of the history. */
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_history_add (char *s)
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
|
|
|
/* Remove the oldest entry in the history to make room for a new
|
|
|
|
entry. */
|
|
|
|
if (hist_used + 1 > hist_size)
|
|
|
|
{
|
|
|
|
hist_end--;
|
|
|
|
if (hist_end < 0)
|
|
|
|
hist_end = hist_size + hist_end;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (hist_lines[hist_end]);
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
hist_used++;
|
|
|
|
|
|
|
|
/* Move to the next position. */
|
|
|
|
hist_pos--;
|
|
|
|
if (hist_pos < 0)
|
|
|
|
hist_pos = hist_size + hist_pos;
|
|
|
|
|
|
|
|
/* Insert into history. */
|
2004-04-04 13:46:03 +00:00
|
|
|
hist_lines[hist_pos] = grub_strdup (s);
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Replace the history entry on position POS with the string S. */
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_history_replace (int pos, char *s)
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
|
|
|
pos = (hist_pos + pos) % hist_size;
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (hist_lines[pos]);
|
|
|
|
hist_lines[pos] = grub_strdup (s);
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Try to complete the string in BUF, return the characters that
|
|
|
|
should be added to the string. This command outputs the possible
|
|
|
|
completions, in that case set RESTORE to 1 so the caller can
|
|
|
|
restore the prompt. */
|
|
|
|
static char *
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_tab_complete (char *buf, int *restore)
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
|
|
|
char *pos = buf;
|
|
|
|
char *path;
|
|
|
|
|
|
|
|
char *found = 0;
|
|
|
|
int begin;
|
|
|
|
int end;
|
|
|
|
int len;
|
|
|
|
int numfound = 0;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
/* The disk that is used for grub_partition_iterate. */
|
|
|
|
grub_device_t partdev;
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
/* String that is added when matched. */
|
|
|
|
char *matchstr;
|
|
|
|
|
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
|
|
|
auto void print_simple_completion (char *comp);
|
|
|
|
auto void print_partition_completion (char *comp);
|
|
|
|
auto int NESTED_FUNC_ATTR add_completion (const char *comp, const char *match,
|
|
|
|
const char *what,
|
|
|
|
void (*print_completion) (char *));
|
2004-04-04 13:46:03 +00:00
|
|
|
auto int iterate_commands (grub_command_t cmd);
|
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
|
|
|
auto int iterate_dev (const char *devname);
|
2004-04-04 13:46:03 +00:00
|
|
|
auto int iterate_part (const grub_partition_t p);
|
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
|
|
|
auto int iterate_dir (const char *filename, int dir);
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-12-03 19:17:27 +00:00
|
|
|
void print_simple_completion (char *comp)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_printf (" %s", comp);
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void print_partition_completion (char *comp)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_print_partinfo (partdev, comp);
|
|
|
|
grub_errno = 0;
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Add a string to the list of possible completions. COMP is the
|
|
|
|
string that should be added. If this string completely matches
|
|
|
|
add the string MATCH to the input after adding COMP. The string
|
|
|
|
WHAT contains a discription of the kind of data that is added.
|
|
|
|
Use PRINT_COMPLETION to show the completions if there are
|
|
|
|
multiple matches. XXX: Because of a bug in gcc it is required to
|
|
|
|
use __regparm__ in some cases. */
|
|
|
|
|
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 NESTED_FUNC_ATTR add_completion (const char *comp, const char *match,
|
|
|
|
const char *what,
|
|
|
|
void (*print_completion) (char *))
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
|
|
|
/* Bug in strncmp then len ==0. */
|
2004-04-04 13:46:03 +00:00
|
|
|
if (!len || grub_strncmp (pos, comp, len) == 0)
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
|
|
|
numfound++;
|
|
|
|
|
|
|
|
if (numfound == 1)
|
|
|
|
{
|
|
|
|
begin = len;
|
2004-04-04 13:46:03 +00:00
|
|
|
found = grub_strdup (comp);
|
|
|
|
end = grub_strlen (found);
|
2003-12-03 19:17:27 +00:00
|
|
|
matchstr = (char *) match;
|
|
|
|
}
|
|
|
|
/* Multiple matches found, print the first instead of completing. */
|
|
|
|
else if (numfound == 2)
|
|
|
|
{
|
2004-12-13 17:26:17 +00:00
|
|
|
grub_printf ("\nPossible %s are:\n", what);
|
2003-12-03 19:17:27 +00:00
|
|
|
print_completion (found);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (numfound > 1)
|
|
|
|
{
|
|
|
|
char *s1 = found;
|
|
|
|
const char *s2 = comp;
|
|
|
|
int cnt = 0;
|
|
|
|
|
|
|
|
print_completion ((char *) comp);
|
|
|
|
|
|
|
|
/* Find out how many characters match. */
|
|
|
|
while ((cnt < end) && *s1 && *s2 && (*s1 == *s2))
|
|
|
|
{
|
|
|
|
s1++;
|
|
|
|
s2++;
|
|
|
|
cnt++;
|
|
|
|
}
|
|
|
|
end = cnt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
int iterate_part (const grub_partition_t p)
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
add_completion (grub_partition_get_name (p), ")", "partitions",
|
2003-12-03 19:17:27 +00:00
|
|
|
print_partition_completion);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int iterate_dir (const char *filename, int dir)
|
|
|
|
{
|
|
|
|
if (!dir)
|
|
|
|
add_completion (filename, " ", "files", print_simple_completion);
|
|
|
|
else
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
char fname[grub_strlen (filename) + 2];
|
|
|
|
grub_strcpy (fname, filename);
|
|
|
|
grub_sprintf (fname, "%s/", filename);
|
2003-12-03 19:17:27 +00:00
|
|
|
add_completion (fname, "", "files", print_simple_completion);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int iterate_dev (const char *devname)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_device_t dev;
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
/* Complete the partition part. */
|
2004-04-04 13:46:03 +00:00
|
|
|
dev = grub_device_open (devname);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
if (dev)
|
|
|
|
{
|
|
|
|
if (dev->disk && dev->disk->has_partitions)
|
|
|
|
add_completion (devname, ",", "disks", print_simple_completion);
|
|
|
|
else
|
|
|
|
add_completion (devname, ")", "disks", print_simple_completion);
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_errno = GRUB_ERR_NONE;
|
2003-12-03 19:17:27 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
int iterate_commands (grub_command_t cmd)
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE)
|
2003-12-03 19:17:27 +00:00
|
|
|
add_completion (cmd->name, " ", "commands", print_simple_completion);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remove blank space on the beginning of the line. */
|
|
|
|
while (*pos == ' ')
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
/* Check if the string is a command or path. */
|
2004-04-04 13:46:03 +00:00
|
|
|
path = grub_strchr (pos, ' ');
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
if (!path)
|
|
|
|
{
|
|
|
|
/* Tab complete a command. */
|
2004-04-04 13:46:03 +00:00
|
|
|
len = grub_strlen (pos);
|
2004-03-28 21:52:02 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_iterate_commands (iterate_commands);
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pos = path;
|
|
|
|
|
|
|
|
/* Remove blank space on the beginning of the line. */
|
|
|
|
while (*pos == ' ')
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
/* Check if this is a completion for a device name. */
|
2004-04-04 13:46:03 +00:00
|
|
|
if (*pos == '(' && !grub_strchr (pos, ')'))
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
|
|
|
/* Check if this is a device or partition. */
|
2004-04-04 13:46:03 +00:00
|
|
|
char *partition = grub_strchr (++pos, ',');
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
if (!partition)
|
|
|
|
{
|
|
|
|
/* Complete the disk part. */
|
2004-04-04 13:46:03 +00:00
|
|
|
len = grub_strlen (pos);
|
|
|
|
grub_disk_dev_iterate (iterate_dev);
|
|
|
|
if (grub_errno)
|
2003-12-03 19:17:27 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*partition = '\0';
|
|
|
|
|
|
|
|
/* Complete the partition part. */
|
2004-04-04 13:46:03 +00:00
|
|
|
partdev = grub_device_open (pos);
|
2003-12-03 19:17:27 +00:00
|
|
|
*partition = ',';
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_errno = GRUB_ERR_NONE;
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
if (partdev)
|
|
|
|
{
|
|
|
|
if (partdev->disk && partdev->disk->has_partitions)
|
|
|
|
{
|
|
|
|
pos = partition + 1;
|
2004-04-04 13:46:03 +00:00
|
|
|
len = grub_strlen (pos);
|
2004-03-28 21:52:02 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_partition_iterate (partdev->disk, iterate_part);
|
|
|
|
if (grub_errno)
|
|
|
|
grub_errno = 0;
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_device_close (partdev);
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
char *device = grub_file_get_device_name (pos);
|
|
|
|
grub_device_t dev;
|
|
|
|
grub_fs_t fs;
|
2003-12-03 19:17:27 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
dev = grub_device_open (device);
|
2003-12-03 19:17:27 +00:00
|
|
|
if (!dev)
|
|
|
|
goto fail;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
fs = grub_fs_probe (dev);
|
|
|
|
if (grub_errno)
|
2003-12-03 19:17:27 +00:00
|
|
|
goto fail;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
pos = grub_strrchr (pos, '/');
|
2003-12-03 19:17:27 +00:00
|
|
|
if (pos)
|
|
|
|
{
|
|
|
|
char *dir;
|
|
|
|
char *dirfile;
|
|
|
|
pos++;
|
2004-04-04 13:46:03 +00:00
|
|
|
len = grub_strlen (pos);
|
2004-03-28 21:52:02 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
dir = grub_strchr (path, '/');
|
2003-12-03 19:17:27 +00:00
|
|
|
if (!dir)
|
|
|
|
{
|
|
|
|
*restore = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
dir = grub_strdup (dir);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
/* Cut away the filename part. */
|
2004-04-04 13:46:03 +00:00
|
|
|
dirfile = grub_strrchr (dir, '/');
|
2003-12-03 19:17:27 +00:00
|
|
|
dirfile[1] = '\0';
|
|
|
|
|
|
|
|
/* Tab complete a file. */
|
|
|
|
(fs->dir) (dev, dir, iterate_dir);
|
|
|
|
if (dev)
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_device_close (dev);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (device);
|
|
|
|
grub_free (dir);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_errno)
|
2003-12-03 19:17:27 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
found = grub_strdup ("/");
|
2003-12-03 19:17:27 +00:00
|
|
|
matchstr = "";
|
|
|
|
numfound = 1;
|
|
|
|
begin = 0;
|
|
|
|
end = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If more than one match is found those matches will be printed and
|
|
|
|
the prompt should be restored. */
|
|
|
|
if (numfound > 1)
|
|
|
|
*restore = 1;
|
|
|
|
else
|
|
|
|
*restore = 0;
|
|
|
|
|
|
|
|
/* Return the part that matches. */
|
|
|
|
if (end && found)
|
|
|
|
{
|
|
|
|
char *insert;
|
2004-04-04 13:46:03 +00:00
|
|
|
insert = grub_malloc (end - begin + 1 + sizeof (matchstr));
|
|
|
|
grub_strncpy (insert, found + begin, end - begin);
|
2003-12-03 19:17:27 +00:00
|
|
|
insert[end - begin] = '\0';
|
|
|
|
if (numfound == 1)
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_strcat (insert, matchstr);
|
|
|
|
grub_free (found);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
return insert;
|
|
|
|
}
|
|
|
|
|
|
|
|
fail:
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (found);
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-01-20 04:13:46 +00:00
|
|
|
void
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_cmdline_run (int nested)
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_normal_init_page ();
|
2005-02-19 20:56:07 +00:00
|
|
|
grub_setcursor (1);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_printf ("\
|
2003-01-20 04:13:46 +00:00
|
|
|
[ Minimal BASH-like line editing is supported. For the first word, TAB\n\
|
|
|
|
lists possible command completions. Anywhere else TAB lists possible\n\
|
|
|
|
device/file completions.%s ]\n\n",
|
|
|
|
nested ? " ESC at any time exits." : "");
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
static char cmdline[GRUB_MAX_CMDLINE];
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_print_error ();
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
2003-01-20 04:13:46 +00:00
|
|
|
cmdline[0] = '\0';
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if (! grub_cmdline_get ("grub> ", cmdline, sizeof (cmdline), 0, 1)
|
2003-01-20 04:13:46 +00:00
|
|
|
&& nested)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (! *cmdline)
|
|
|
|
continue;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_command_execute (cmdline);
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get a command-line. If ECHO_CHAR is not zero, echo it instead of input
|
|
|
|
characters. If READLINE is non-zero, readline-like key bindings are
|
2005-01-31 21:40:25 +00:00
|
|
|
available. If ESC is pushed, return zero, otherwise return non-zero. */
|
2003-01-20 04:13:46 +00:00
|
|
|
/* FIXME: The dumb interface is not supported yet. */
|
|
|
|
int
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
|
2003-01-20 04:13:46 +00:00
|
|
|
int echo_char, int readline)
|
|
|
|
{
|
|
|
|
unsigned xpos, ypos, ystart;
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_size_t lpos, llen;
|
|
|
|
grub_size_t plen;
|
2003-01-20 04:13:46 +00:00
|
|
|
char buf[max_len];
|
|
|
|
int key;
|
2003-12-03 19:17:27 +00:00
|
|
|
int histpos = 0;
|
2003-01-20 04:13:46 +00:00
|
|
|
auto void cl_insert (const char *str);
|
|
|
|
auto void cl_delete (unsigned len);
|
|
|
|
auto void cl_print (int pos, int c);
|
|
|
|
auto void cl_set_pos (void);
|
|
|
|
|
|
|
|
void cl_set_pos (void)
|
|
|
|
{
|
|
|
|
xpos = (plen + lpos) % 79;
|
|
|
|
ypos = ystart + (plen + lpos) / 79;
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_gotoxy (xpos, ypos);
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void cl_print (int pos, int c)
|
|
|
|
{
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
for (p = buf + pos; *p; p++)
|
|
|
|
{
|
|
|
|
if (xpos++ > 78)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_putchar ('\n');
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
xpos = 1;
|
2004-04-04 13:46:03 +00:00
|
|
|
if (ypos == (unsigned) (grub_getxy () & 0xFF))
|
2003-01-20 04:13:46 +00:00
|
|
|
ystart--;
|
|
|
|
else
|
|
|
|
ypos++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (c)
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_putchar (c);
|
2003-01-20 04:13:46 +00:00
|
|
|
else
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_putchar (*p);
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void cl_insert (const char *str)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_size_t len = grub_strlen (str);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
if (len + llen < max_len)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_memmove (buf + lpos + len, buf + lpos, llen - lpos + 1);
|
|
|
|
grub_memmove (buf + lpos, str, len);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
llen += len;
|
|
|
|
lpos += len;
|
|
|
|
cl_print (lpos - len, echo_char);
|
|
|
|
cl_set_pos ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void cl_delete (unsigned len)
|
|
|
|
{
|
|
|
|
if (lpos + len <= llen)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_size_t saved_lpos = lpos;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
lpos = llen - len;
|
|
|
|
cl_set_pos ();
|
|
|
|
cl_print (lpos, ' ');
|
|
|
|
lpos = saved_lpos;
|
|
|
|
cl_set_pos ();
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_memmove (buf + lpos, buf + lpos + len, llen - lpos + 1);
|
2003-01-20 04:13:46 +00:00
|
|
|
llen -= len;
|
|
|
|
cl_print (lpos, echo_char);
|
|
|
|
cl_set_pos ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
plen = grub_strlen (prompt);
|
2003-01-20 04:13:46 +00:00
|
|
|
lpos = llen = 0;
|
|
|
|
buf[0] = '\0';
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
if ((grub_getxy () >> 8) != 0)
|
|
|
|
grub_putchar ('\n');
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_printf (prompt);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
xpos = plen;
|
2004-04-04 13:46:03 +00:00
|
|
|
ystart = ypos = (grub_getxy () & 0xFF);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
cl_insert (cmdline);
|
|
|
|
|
2004-12-29 22:43:48 +00:00
|
|
|
if (hist_used == 0)
|
|
|
|
grub_history_add (buf);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
while ((key = GRUB_TERM_ASCII_CHAR (grub_getkey ())) != '\n' && key != '\r')
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
|
|
|
if (readline)
|
|
|
|
{
|
|
|
|
switch (key)
|
|
|
|
{
|
|
|
|
case 1: /* Ctrl-a */
|
|
|
|
lpos = 0;
|
|
|
|
cl_set_pos ();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2: /* Ctrl-b */
|
|
|
|
if (lpos > 0)
|
|
|
|
{
|
|
|
|
lpos--;
|
|
|
|
cl_set_pos ();
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 5: /* Ctrl-e */
|
|
|
|
lpos = llen;
|
|
|
|
cl_set_pos ();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 6: /* Ctrl-f */
|
|
|
|
if (lpos < llen)
|
|
|
|
{
|
|
|
|
lpos++;
|
|
|
|
cl_set_pos ();
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 9: /* Ctrl-i or TAB */
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
|
|
|
char *insert;
|
|
|
|
int restore;
|
|
|
|
|
|
|
|
/* Backup the next character and make it 0 so it will
|
|
|
|
be easy to use string functions. */
|
|
|
|
char backup = buf[lpos];
|
|
|
|
buf[lpos] = '\0';
|
|
|
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
insert = grub_tab_complete (buf, &restore);
|
2003-12-03 19:17:27 +00:00
|
|
|
/* Restore the original string. */
|
|
|
|
buf[lpos] = backup;
|
|
|
|
|
|
|
|
if (restore)
|
|
|
|
{
|
|
|
|
/* Restore the prompt. */
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_printf ("\n%s%s", prompt, buf);
|
2003-12-03 19:17:27 +00:00
|
|
|
xpos = plen;
|
2004-04-04 13:46:03 +00:00
|
|
|
ystart = ypos = (grub_getxy () & 0xFF);
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (insert)
|
|
|
|
{
|
|
|
|
cl_insert (insert);
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (insert);
|
2003-12-03 19:17:27 +00:00
|
|
|
}
|
|
|
|
}
|
2003-01-20 04:13:46 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 11: /* Ctrl-k */
|
|
|
|
if (lpos < llen)
|
|
|
|
{
|
|
|
|
if (kill_buf)
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (kill_buf);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
kill_buf = grub_strdup (buf + lpos);
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
cl_delete (llen - lpos);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 14: /* Ctrl-n */
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
|
|
|
char *hist;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2003-12-03 19:17:27 +00:00
|
|
|
lpos = 0;
|
|
|
|
|
|
|
|
if (histpos > 0)
|
2004-12-29 22:43:48 +00:00
|
|
|
{
|
|
|
|
grub_history_replace (histpos, buf);
|
|
|
|
histpos--;
|
|
|
|
}
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
cl_delete (llen);
|
2004-04-04 13:46:03 +00:00
|
|
|
hist = grub_history_get (histpos);
|
2003-12-03 19:17:27 +00:00
|
|
|
cl_insert (hist);
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
2003-01-20 04:13:46 +00:00
|
|
|
case 16: /* Ctrl-p */
|
2003-12-03 19:17:27 +00:00
|
|
|
{
|
|
|
|
char *hist;
|
|
|
|
|
|
|
|
lpos = 0;
|
|
|
|
|
|
|
|
if (histpos < hist_used - 1)
|
2004-12-29 22:43:48 +00:00
|
|
|
{
|
|
|
|
grub_history_replace (histpos, buf);
|
|
|
|
histpos++;
|
|
|
|
}
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
cl_delete (llen);
|
2004-04-04 13:46:03 +00:00
|
|
|
hist = grub_history_get (histpos);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
|
|
|
cl_insert (hist);
|
|
|
|
}
|
2003-01-20 04:13:46 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 21: /* Ctrl-u */
|
|
|
|
if (lpos > 0)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_size_t n = lpos;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
if (kill_buf)
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (kill_buf);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
kill_buf = grub_malloc (n + 1);
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
2003-01-20 04:13:46 +00:00
|
|
|
if (kill_buf)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_memcpy (kill_buf, buf, n);
|
2003-01-20 04:13:46 +00:00
|
|
|
kill_buf[n] = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
lpos = 0;
|
|
|
|
cl_set_pos ();
|
|
|
|
cl_delete (n);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 25: /* Ctrl-y */
|
|
|
|
if (kill_buf)
|
|
|
|
cl_insert (kill_buf);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (key)
|
|
|
|
{
|
|
|
|
case '\e':
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
case '\b':
|
|
|
|
if (lpos > 0)
|
|
|
|
{
|
|
|
|
lpos--;
|
|
|
|
cl_set_pos ();
|
|
|
|
}
|
|
|
|
/* fall through */
|
|
|
|
|
|
|
|
case 4: /* Ctrl-d */
|
|
|
|
if (lpos < llen)
|
|
|
|
cl_delete (1);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_isprint (key))
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
|
|
|
char str[2];
|
|
|
|
|
|
|
|
str[0] = key;
|
|
|
|
str[1] = '\0';
|
|
|
|
cl_insert (str);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_putchar ('\n');
|
|
|
|
grub_refresh ();
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
/* If ECHO_CHAR is NUL, remove leading spaces. */
|
|
|
|
lpos = 0;
|
|
|
|
if (! echo_char)
|
|
|
|
while (buf[lpos] == ' ')
|
|
|
|
lpos++;
|
|
|
|
|
2004-12-29 22:43:48 +00:00
|
|
|
histpos = 0;
|
|
|
|
if (grub_strlen (buf) > 0)
|
|
|
|
{
|
|
|
|
grub_history_replace (histpos, buf);
|
|
|
|
grub_history_add ("");
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_memcpy (cmdline, buf + lpos, llen - lpos + 1);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|