grub/normal/command.c
marco_g db1771cfbe 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

326 lines
7.6 KiB
C

/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* Copyright (C) 2003 Free Software Foundation, Inc.
*
* 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.
*/
#include <pupa/normal.h>
#include <pupa/misc.h>
#include <pupa/mm.h>
#include <pupa/err.h>
#include <pupa/term.h>
#include <pupa/env.h>
#include <pupa/dl.h>
static pupa_command_t pupa_command_list;
void
pupa_register_command (const char *name,
pupa_err_t (*func) (struct pupa_arg_list *state,
int argc, char **args),
unsigned flags,
const char *summary,
const char *description,
const struct pupa_arg_option *options)
{
pupa_command_t cmd, *p;
cmd = (pupa_command_t) pupa_malloc (sizeof (*cmd));
if (! cmd)
return;
cmd->name = name;
cmd->func = func;
cmd->flags = flags;
cmd->summary = summary;
cmd->description = description;
cmd->options = options;
/* Keep the list sorted for simplicity. */
p = &pupa_command_list;
while (*p)
{
if (pupa_strcmp ((*p)->name, name) > 0)
break;
p = &((*p)->next);
}
cmd->next = *p;
*p = cmd;
}
void
pupa_unregister_command (const char *name)
{
pupa_command_t *p, q;
for (p = &pupa_command_list, q = *p; q; p = &(q->next), q = q->next)
if (pupa_strcmp (name, q->name) == 0)
{
*p = q->next;
pupa_free (q);
break;
}
}
pupa_command_t
pupa_command_find (char *cmdline)
{
char *first_space;
pupa_command_t cmd;
first_space = pupa_strchr (cmdline, ' ');
if (first_space)
*first_space = '\0';
for (cmd = pupa_command_list; cmd; cmd = cmd->next)
if (pupa_strcmp (cmdline, cmd->name) == 0)
break;
if (! cmd)
pupa_error (PUPA_ERR_UNKNOWN_COMMAND, "unknown command `%s'", cmdline);
if (first_space)
*first_space = ' ';
return cmd;
}
int
pupa_iterate_commands (int (*iterate) (pupa_command_t))
{
pupa_command_t cmd;
for (cmd = pupa_command_list; cmd; cmd = cmd->next)
iterate (cmd);
return 0;
}
int
pupa_command_execute (char *cmdline)
{
auto pupa_err_t cmdline_get (char **s);
pupa_err_t cmdline_get (char **s)
{
*s = pupa_malloc (PUPA_MAX_CMDLINE);
*s[0] = '\0';
return pupa_cmdline_get (">", *s, PUPA_MAX_CMDLINE, 0, 1);
}
pupa_command_t cmd;
pupa_err_t ret = 0;
char *pager;
int num;
char **args;
struct pupa_arg_list *state;
struct pupa_arg_option *parser;
int maxargs = 0;
char **arglist;
int numargs;
if (pupa_split_cmdline (cmdline, cmdline_get, &num, &args))
return 0;
/* In case of an assignment set the environment accordingly instead
of calling a function. */
if (num == 0 && pupa_strchr (args[0], '='))
{
char *val = pupa_strchr (args[0], '=');
val[0] = 0;
pupa_env_set (args[0], val + 1);
val[0] = '=';
return 0;
}
cmd = pupa_command_find (args[0]);
if (! cmd)
return -1;
/* Enable the pager if the environment pager is set to 1. */
pager = pupa_env_get ("pager");
if (pager && (! pupa_strcmp (pager, "1")))
pupa_set_more (1);
parser = (struct pupa_arg_option *) cmd->options;
while (parser && (parser++)->doc)
maxargs++;
state = pupa_malloc (sizeof (struct pupa_arg_list) * maxargs);
pupa_memset (state, 0, sizeof (struct pupa_arg_list) * maxargs);
if (pupa_arg_parse (cmd, num, &args[1], state, &arglist, &numargs))
ret = (cmd->func) (state, numargs, arglist);
pupa_free (state);
if (pager && (! pupa_strcmp (pager, "1")))
pupa_set_more (0);
pupa_free (args);
return ret;
}
static pupa_err_t
rescue_command (struct pupa_arg_list *state __attribute__ ((unused)),
int argc __attribute__ ((unused)),
char **args __attribute__ ((unused)))
{
pupa_longjmp (pupa_exit_env, 0);
/* Never reach here. */
return 0;
}
static pupa_err_t
set_command (struct pupa_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
char *var;
char *val;
auto int print_env (struct pupa_env_var *env);
int print_env (struct pupa_env_var *env)
{
pupa_printf ("%s=%s\n", env->name, env->value);
return 0;
}
if (! argc)
{
pupa_env_iterate (print_env);
return 0;
}
var = args[0];
val = pupa_strchr (var, '=');
if (! val)
{
pupa_error (PUPA_ERR_BAD_ARGUMENT, "not an assignment");
return pupa_errno;
}
val[0] = 0;
pupa_env_set (var, val + 1);
val[0] = '=';
return 0;
}
static pupa_err_t
unset_command (struct pupa_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
if (argc < 1)
return pupa_error (PUPA_ERR_BAD_ARGUMENT,
"no environment variable specified");
pupa_env_unset (args[0]);
return 0;
}
static pupa_err_t
insmod_command (struct pupa_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
char *p;
pupa_dl_t mod;
if (argc == 0)
return pupa_error (PUPA_ERR_BAD_ARGUMENT, "no module specified");
p = pupa_strchr (args[0], '/');
if (! p)
mod = pupa_dl_load (args[0]);
else
mod = pupa_dl_load_file (args[0]);
if (mod)
pupa_dl_ref (mod);
return 0;
}
static pupa_err_t
rmmod_command (struct pupa_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
pupa_dl_t mod;
if (argc == 0)
return pupa_error (PUPA_ERR_BAD_ARGUMENT, "no module specified");
mod = pupa_dl_get (args[0]);
if (! mod)
return pupa_error (PUPA_ERR_BAD_ARGUMENT, "no such module");
if (! pupa_dl_unref (mod))
pupa_dl_unload (mod);
return 0;
}
static pupa_err_t
lsmod_command (struct pupa_arg_list *state __attribute__ ((unused)),
int argc __attribute__ ((unused)),
char **args __attribute__ ((unused)))
{
auto int print_module (pupa_dl_t mod);
int print_module (pupa_dl_t mod)
{
pupa_dl_dep_t dep;
pupa_printf ("%s\t%d\t\t", mod->name, mod->ref_count);
for (dep = mod->dep; dep; dep = dep->next)
{
if (dep != mod->dep)
pupa_putchar (',');
pupa_printf ("%s", dep->mod->name);
}
pupa_putchar ('\n');
pupa_refresh ();
return 0;
}
pupa_printf ("Name\tRef Count\tDependencies\n");
pupa_dl_iterate (print_module);
return 0;
}
void
pupa_command_init (void)
{
/* This is a special command, because this never be called actually. */
pupa_register_command ("title", 0, PUPA_COMMAND_FLAG_TITLE, 0, 0, 0);
pupa_register_command ("rescue", rescue_command, PUPA_COMMAND_FLAG_BOTH,
"rescue", "Enter into the rescue mode.", 0);
pupa_register_command ("set", set_command, PUPA_COMMAND_FLAG_BOTH,
"unset ENVVAR", "Set an environment variable.", 0);
pupa_register_command ("unset", unset_command, PUPA_COMMAND_FLAG_BOTH,
"set [ENVVAR=VALUE]", "Remove an environment variable.", 0);
pupa_register_command ("insmod", insmod_command, PUPA_COMMAND_FLAG_BOTH,
"insmod MODULE|FILE", "Insert a module.", 0);
pupa_register_command ("rmmod", rmmod_command, PUPA_COMMAND_FLAG_BOTH,
"rmmod MODULE", "Remove a module.", 0);
pupa_register_command ("lsmod", lsmod_command, PUPA_COMMAND_FLAG_BOTH,
"lsmod", "Show loaded modules.", 0);
}