2002-12-27 08:53:07 +00:00
|
|
|
/* misc.h - prototypes for misc functions */
|
|
|
|
|
/*
|
2004-04-04 13:46:03 +00:00
|
|
|
* GRUB -- GRand Unified Bootloader
|
2005-01-29 22:01:54 +00:00
|
|
|
* Copyright (C) 2002,2003,2005 Free Software Foundation, Inc.
|
2002-12-27 08:53:07 +00:00
|
|
|
*
|
2004-04-04 13:46:03 +00:00
|
|
|
* GRUB is free software; you can redistribute it and/or modify
|
2002-12-27 08:53:07 +00:00
|
|
|
* 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
|
2004-04-04 13:46:03 +00:00
|
|
|
* along with GRUB; if not, write to the Free Software
|
2002-12-27 08:53:07 +00:00
|
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#ifndef GRUB_MISC_HEADER
|
|
|
|
|
#define GRUB_MISC_HEADER 1
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
#include <stdarg.h>
|
2004-04-04 13:46:03 +00:00
|
|
|
#include <grub/types.h>
|
|
|
|
|
#include <grub/symbol.h>
|
|
|
|
|
#include <grub/err.h>
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2005-05-09 01:47:37 +00:00
|
|
|
#define grub_dprintf(condition, fmt, args...) grub_real_dprintf(__FILE__, __LINE__, condition, fmt, ## args);
|
2004-04-04 13:46:03 +00:00
|
|
|
/* XXX: If grub_memmove is too slow, we must implement grub_memcpy. */
|
|
|
|
|
#define grub_memcpy(d,s,n) grub_memmove ((d), (s), (n))
|
2003-01-06 00:01:35 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
void *EXPORT_FUNC(grub_memmove) (void *dest, const void *src, grub_size_t n);
|
|
|
|
|
char *EXPORT_FUNC(grub_strcpy) (char *dest, const char *src);
|
|
|
|
|
char *EXPORT_FUNC(grub_strncpy) (char *dest, const char *src, int c);
|
|
|
|
|
char *EXPORT_FUNC(grub_stpcpy) (char *dest, const char *src);
|
|
|
|
|
char *EXPORT_FUNC(grub_strcat) (char *dest, const char *src);
|
2004-11-01 16:14:16 +00:00
|
|
|
char *EXPORT_FUNC(grub_strncat) (char *dest, const char *src, int c);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
2005-01-29 22:01:54 +00:00
|
|
|
/* Prototypes for aliases. */
|
|
|
|
|
void *EXPORT_FUNC(memmove) (void *dest, const void *src, grub_size_t n);
|
|
|
|
|
void *EXPORT_FUNC(memcpy) (void *dest, const void *src, grub_size_t n);
|
2003-10-29 18:44:30 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
int EXPORT_FUNC(grub_memcmp) (const void *s1, const void *s2, grub_size_t n);
|
|
|
|
|
int EXPORT_FUNC(grub_strcmp) (const char *s1, const char *s2);
|
|
|
|
|
int EXPORT_FUNC(grub_strncmp) (const char *s1, const char *s2, int c);
|
2004-08-18 09:00:01 +00:00
|
|
|
int EXPORT_FUNC(grub_strncasecmp) (const char *s1, const char *s2, int c);
|
2004-04-04 13:46:03 +00:00
|
|
|
char *EXPORT_FUNC(grub_strchr) (const char *s, int c);
|
|
|
|
|
char *EXPORT_FUNC(grub_strrchr) (const char *s, int c);
|
2005-05-09 01:47:37 +00:00
|
|
|
int EXPORT_FUNC(grub_strword) (const char *s, const char *w);
|
|
|
|
|
int EXPORT_FUNC(grub_iswordseparator) (int c);
|
2004-04-04 13:46:03 +00:00
|
|
|
int EXPORT_FUNC(grub_isspace) (int c);
|
|
|
|
|
int EXPORT_FUNC(grub_isprint) (int c);
|
|
|
|
|
int EXPORT_FUNC(grub_isalpha) (int c);
|
|
|
|
|
int EXPORT_FUNC(grub_isgraph) (int c);
|
|
|
|
|
int EXPORT_FUNC(grub_isdigit) (int c);
|
|
|
|
|
int EXPORT_FUNC(grub_tolower) (int c);
|
|
|
|
|
unsigned long EXPORT_FUNC(grub_strtoul) (const char *str, char **end, int base);
|
|
|
|
|
char *EXPORT_FUNC(grub_strdup) (const char *s);
|
|
|
|
|
char *EXPORT_FUNC(grub_strndup) (const char *s, grub_size_t n);
|
|
|
|
|
void *EXPORT_FUNC(grub_memset) (void *s, int c, grub_size_t n);
|
|
|
|
|
grub_size_t EXPORT_FUNC(grub_strlen) (const char *s);
|
|
|
|
|
int EXPORT_FUNC(grub_printf) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
|
2005-05-09 01:47:37 +00:00
|
|
|
void EXPORT_FUNC(grub_real_dprintf) (const char *file,
|
|
|
|
|
const int line,
|
|
|
|
|
const char *condition,
|
|
|
|
|
const char *fmt, ...) __attribute__ ((format (printf, 4, 5)));
|
2004-04-04 13:46:03 +00:00
|
|
|
int EXPORT_FUNC(grub_vprintf) (const char *fmt, va_list args);
|
|
|
|
|
int EXPORT_FUNC(grub_sprintf) (char *str, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
|
|
|
|
|
int EXPORT_FUNC(grub_vsprintf) (char *str, const char *fmt, va_list args);
|
|
|
|
|
void EXPORT_FUNC(grub_stop) (void) __attribute__ ((noreturn));
|
2004-08-28 13:14:29 +00:00
|
|
|
grub_uint8_t *EXPORT_FUNC(grub_utf16_to_utf8) (grub_uint8_t *dest,
|
|
|
|
|
grub_uint16_t *src,
|
|
|
|
|
grub_size_t size);
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_err_t EXPORT_FUNC(grub_split_cmdline) (const char *str,
|
|
|
|
|
grub_err_t (* getline) (char **),
|
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 *argc, char ***argv);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#endif /* ! GRUB_MISC_HEADER */
|