db1771cfbe
* 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.
183 lines
4.2 KiB
C
183 lines
4.2 KiB
C
/*
|
||
* 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 <stdlib.h>
|
||
#include <malloc.h>
|
||
#include <sys/stat.h>
|
||
#include <argp.h>
|
||
#include <string.h>
|
||
|
||
#include <pupa/mm.h>
|
||
#include <pupa/setjmp.h>
|
||
#include <pupa/fs.h>
|
||
#include <pupa/i386/pc/util/biosdisk.h>
|
||
#include <pupa/dl.h>
|
||
#include <pupa/machine/console.h>
|
||
#include <pupa/util/misc.h>
|
||
#include <pupa/kernel.h>
|
||
#include <pupa/normal.h>
|
||
#include <pupa/util/getroot.h>
|
||
#include <pupa/env.h>
|
||
|
||
#ifdef __NetBSD__
|
||
/* NetBSD uses /boot for its boot block. */
|
||
# define DEFAULT_DIRECTORY "/pupa"
|
||
#else
|
||
# define DEFAULT_DIRECTORY "/boot/pupa"
|
||
#endif
|
||
|
||
#define DEFAULT_DEVICE_MAP DEFAULT_DIRECTORY "/device.map"
|
||
|
||
/* XXX. */
|
||
pupa_addr_t pupa_end_addr = -1;
|
||
pupa_addr_t pupa_total_module_size = 0;
|
||
|
||
int
|
||
pupa_arch_dl_check_header (void *ehdr, pupa_size_t size)
|
||
{
|
||
(void) ehdr;
|
||
(void) size;
|
||
|
||
return PUPA_ERR_BAD_MODULE;
|
||
}
|
||
|
||
pupa_err_t
|
||
pupa_arch_dl_relocate_symbols (pupa_dl_t mod, void *ehdr)
|
||
{
|
||
(void) mod;
|
||
(void) ehdr;
|
||
|
||
return PUPA_ERR_BAD_MODULE;
|
||
}
|
||
|
||
void
|
||
pupa_machine_init (void)
|
||
{
|
||
pupa_console_init ();
|
||
}
|
||
|
||
|
||
const char *argp_program_version = PACKAGE_STRING;
|
||
const char *argp_program_bug_address = PACKAGE_BUGREPORT;
|
||
static char doc[] = "PUPA emulator";
|
||
|
||
static struct argp_option options[] = {
|
||
{"root-device", 'r', "DEV", 0, "use DEV as the root device [default=guessed]", 0},
|
||
{"device-map", 'm', "FILE", 0, "use FILE as the device map", 0},
|
||
{"directory", 'd', "DIR", 0, "use PUPA files in the directory DIR", 0},
|
||
{"verbose", 'v', 0 , 0, "print verbose messages", 0},
|
||
{ 0, 0, 0, 0, 0, 0 }
|
||
};
|
||
|
||
struct arguments
|
||
{
|
||
char *root_dev;
|
||
char *dev_map;
|
||
char *dir;
|
||
};
|
||
|
||
static error_t
|
||
parse_opt (int key, char *arg, struct argp_state *state)
|
||
{
|
||
struct arguments *args = state->input;
|
||
|
||
switch (key)
|
||
{
|
||
case 'r':
|
||
args->root_dev = arg;
|
||
break;
|
||
case 'd':
|
||
args->dir = arg;
|
||
break;
|
||
case 'm':
|
||
args->dev_map = arg;
|
||
break;
|
||
case 'v':
|
||
verbosity++;
|
||
break;
|
||
case ARGP_KEY_END:
|
||
break;
|
||
default:
|
||
return ARGP_ERR_UNKNOWN;
|
||
}
|
||
return 0;
|
||
}
|
||
|
||
static struct argp argp = {options, parse_opt, 0, doc, 0, 0, 0};
|
||
|
||
|
||
int
|
||
main (int argc, char *argv[])
|
||
{
|
||
char *prefix = 0;
|
||
char rootprefix[100];
|
||
struct arguments args =
|
||
{
|
||
.dir = DEFAULT_DIRECTORY,
|
||
.dev_map = DEFAULT_DEVICE_MAP
|
||
};
|
||
|
||
argp_parse (&argp, argc, argv, 0, 0, &args);
|
||
|
||
/* More sure there is a root device. */
|
||
if (! args.root_dev)
|
||
{
|
||
args.root_dev = pupa_guess_root_device (args.dir ? : DEFAULT_DIRECTORY);
|
||
if (! args.root_dev)
|
||
{
|
||
pupa_util_info ("guessing the root device failed, because of `%s'",
|
||
pupa_errmsg);
|
||
pupa_util_error ("Cannot guess the root device. Specify the option ``--root-device''.");
|
||
}
|
||
}
|
||
|
||
prefix = pupa_get_prefix (args.dir ? : DEFAULT_DIRECTORY);
|
||
sprintf (rootprefix, "%s%s", args.root_dev, prefix);
|
||
|
||
pupa_env_set ("prefix", rootprefix);
|
||
|
||
/* XXX: This is a bit unportable. */
|
||
pupa_util_biosdisk_init (args.dev_map);
|
||
|
||
/* Initialize the default modules. */
|
||
pupa_fat_init ();
|
||
pupa_ext2_init ();
|
||
pupa_ls_init ();
|
||
pupa_boot_init ();
|
||
pupa_cmp_init ();
|
||
pupa_cat_init ();
|
||
pupa_terminal_init ();
|
||
|
||
/* XXX: Should normal mode be started by default? */
|
||
pupa_normal_init ();
|
||
|
||
/* Start PUPA! */
|
||
pupa_main ();
|
||
|
||
pupa_util_biosdisk_fini ();
|
||
pupa_normal_fini ();
|
||
pupa_ext2_fini ();
|
||
pupa_fat_fini ();
|
||
pupa_boot_fini ();
|
||
pupa_cmp_fini ();
|
||
pupa_cat_fini ();
|
||
pupa_terminal_fini ();
|
||
|
||
return 0;
|
||
}
|