vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge multiterm into gfxmenu+multiterm

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-29 17:56:46 +01:00
commit c99f206280
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
commands/terminal.c
View file

@ -26,7 +26,7 @@
struct grub_term_autoload *grub_term_input_autoload = NULL; struct grub_term_autoload *grub_term_input_autoload = NULL;
struct grub_term_autoload *grub_term_output_autoload = NULL; struct grub_term_autoload *grub_term_output_autoload = NULL;
grub_err_t static grub_err_t
grub_cmd_terminal_input (grub_command_t cmd __attribute__ ((unused)), grub_cmd_terminal_input (grub_command_t cmd __attribute__ ((unused)),
int argc, char **args) int argc, char **args)
{ {
@ -183,7 +183,7 @@ grub_cmd_terminal_input (grub_command_t cmd __attribute__ ((unused)),
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
grub_err_t static grub_err_t
grub_cmd_terminal_output (grub_command_t cmd __attribute__ ((unused)), grub_cmd_terminal_output (grub_command_t cmd __attribute__ ((unused)),
int argc, char **args) int argc, char **args)
{ {

2
normal/cmdline.c
View file

@ -227,6 +227,8 @@ grub_cmdline_get (const char *prompt)
auto void cl_set_pos (struct cmdline_term *cl_term); auto void cl_set_pos (struct cmdline_term *cl_term);
auto void cl_print_all (int pos, grub_uint32_t c); auto void cl_print_all (int pos, grub_uint32_t c);
auto void cl_set_pos_all (void); auto void cl_set_pos_all (void);
auto void init_clterm (struct cmdline_term *cl_term_cur);
auto void init_clterm_all (void);
const char *prompt_translated = _(prompt); const char *prompt_translated = _(prompt);
struct cmdline_term *cl_terms; struct cmdline_term *cl_terms;
char *ret; char *ret;