grub/kern/env.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

209 lines
4.6 KiB
C

/* env.c - Environment variables */
/*
* PUPA -- Preliminary Universal Programming Architecture for GRUB
* Copyright (C) 2003 Free Software Foundation, Inc.
*
* PUPA 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 PUPA; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <pupa/env.h>
#include <pupa/misc.h>
#include <pupa/mm.h>
/* XXX: What would be a good size for the hashtable? */
#define HASHSZ 123
/* A hashtable for quick lookup of variables. */
static struct pupa_env_var *pupa_env[HASHSZ];
/* The variables in a sorted list. */
static struct pupa_env_var *pupa_env_sorted;
/* Return the hash representation of the string S. */
static unsigned int pupa_env_hashval (const char *s)
{
unsigned int i = 0;
/* XXX: This can be done much more effecient. */
while (*s)
i += 5 * *(s++);
return i % HASHSZ;
}
static struct pupa_env_var *
pupa_env_find (const char *name)
{
struct pupa_env_var *var;
int idx = pupa_env_hashval (name);
for (var = pupa_env[idx]; var; var = var->next)
if (! pupa_strcmp (var->name, name))
return var;
return 0;
}
pupa_err_t
pupa_env_set (const char *var, const char *val)
{
int idx = pupa_env_hashval (var);
struct pupa_env_var *env;
struct pupa_env_var *sort;
struct pupa_env_var **sortp;
/* If the variable does already exist, just update the variable. */
env = pupa_env_find (var);
if (env)
{
char *old = env->value;
env->value = pupa_strdup (val);
if (! env->name)
{
env->value = old;
return pupa_errno;
}
if (env->write_hook)
(env->write_hook) (env);
pupa_free (old);
return 0;
}
/* The variable does not exist, create it. */
env = pupa_malloc (sizeof (struct pupa_env_var));
if (! env)
return pupa_errno;
pupa_memset (env, 0, sizeof (struct pupa_env_var));
env->name = pupa_strdup (var);
if (! env->name)
goto fail;
env->value = pupa_strdup (val);
if (! env->name)
goto fail;
/* Insert it in the hashtable. */
env->prevp = &pupa_env[idx];
env->next = pupa_env[idx];
if (pupa_env[idx])
pupa_env[idx]->prevp = &env->next;
pupa_env[idx] = env;
/* Insert it in the sorted list. */
sortp = &pupa_env_sorted;
sort = pupa_env_sorted;
while (sort)
{
if (pupa_strcmp (sort->name, var) > 0)
break;
sortp = &sort->sort_next;
sort = sort->sort_next;
}
env->sort_prevp = sortp;
env->sort_next = sort;
if (sort)
sort->sort_prevp = &env->sort_next;
*sortp = env;
fail:
if (pupa_errno)
{
pupa_free (env->name);
pupa_free (env->value);
pupa_free (env);
}
return 0;
}
char *
pupa_env_get (const char *name)
{
struct pupa_env_var *env;
env = pupa_env_find (name);
if (! env)
return 0;
if (env->read_hook)
{
char *val;
env->read_hook (env, &val);
return val;
}
return env->value;
}
void
pupa_env_unset (const char *name)
{
struct pupa_env_var *env;
env = pupa_env_find (name);
if (! env)
return;
/* XXX: It is not possible to unset variables with a read or write
hook. */
if (env->read_hook || env->write_hook)
return;
*env->prevp = env->next;
if (env->next)
env->next->prevp = env->prevp;
*env->sort_prevp = env->sort_next;
if (env->sort_next)
env->sort_next->sort_prevp = env->sort_prevp;
pupa_free (env->name);
pupa_free (env->value);
pupa_free (env);
return;
}
void
pupa_env_iterate (int (* func) (struct pupa_env_var *var))
{
struct pupa_env_var *env;
for (env = pupa_env_sorted; env; env = env->sort_next)
if (func (env))
return;
}
pupa_err_t
pupa_register_variable_hook (const char *var,
pupa_err_t (*read_hook) (struct pupa_env_var *var, char **),
pupa_err_t (*write_hook) (struct pupa_env_var *var))
{
struct pupa_env_var *env = pupa_env_find (var);
if (! env)
if (pupa_env_set (var, "") != PUPA_ERR_NONE)
return pupa_errno;
env = pupa_env_find (var);
/* XXX Insert an assertion? */
env->read_hook = read_hook;
env->write_hook = write_hook;
return PUPA_ERR_NONE;
}