2003-01-20 Yoshinori K. Okuji <okuji@enbug.org>
* include/pupa/normal.h: New file. * include/pupa/setjmp.h: Likewise. * include/pupa/i386/setjmp.h: Likewise. * normal/cmdline.c: Likewise. * normal/command.c: Likewise. * normal/main.c: Likewise. * normal/menu.c: Likewise. * normal/i386/setjmp.S: Likewise. * loader/i386/pc/linux.c (pupa_rescue_cmd_linux): Made global. (pupa_rescue_cmd_initrd): Likewise. * loader/i386/pc/chainloader.c (pupa_rescue_cmd_chainloader): Likewise. * kern/i386/pc/startup.S (translation_table): New variable. (translate_keycode): New function. (pupa_console_getkey): Call translate_keycode. * kern/rescue.c (attempt_normal_mode): New function. (pupa_enter_rescue_mode): Attempt to execute the normal mode. If it failed, print a message. * kern/mm.c (pupa_real_malloc): Print more information when a free magic is broken. (pupa_free): If the first free header is not free actually, set it to P. * kern/main.c (pupa_load_normal_mode): Just load the module "normal". (pupa_main): Don't print the message "Entering into rescue mode..." here. * include/pupa/i386/pc/loader.h (pupa_rescue_cmd_initrd): Declared. (pupa_rescue_cmd_initrd): Likewise. (pupa_rescue_cmd_initrd): Likewise. * include/pupa/symbol.h (FUNCTION): Specify the type. (VARIABLE): Likewise. * include/pupa/err.h (pupa_err_t): Added PUPA_ERR_UNKNOWN_COMMAND. * include/pupa/dl.h (pupa_dl_set_prefix): Exported. (pupa_dl_get_prefix): Likewise. * conf/i386-pc.rmk (pkgdata_MODULES): Added normal.mod. Added _chain.mod and _linux.mod instead of chain.mod and linux.mod. (chain_mod_SOURCES): Renamed to ... (_chain_mod_SOURCES): ... this. (chain_mod_CFLAGS): Renamed to ... (_chain_mod_CFLAGS): ... this. (linux_mod_SOURCES): Renamed to ... (_linux_mod_SOURCES): ... this. (linux_mod_CFLAGS): Renamed to ... (_linux_mod_CFLAGS): ... this. (normal_mod_SOURCES): New variable. (normal_mod_CFLAGS): Likewise. (normal_mod_ASFLAGS): Likewise. 2003-01-18 Yoshinori K. Okuji <okuji@enbug.org> * kern/rescue.c (pupa_rescue_cmd_rmmod): Call pupa_dl_unload, if possible. * kern/dl.c (pupa_dl_ref): Refer dependending modules recursively. (pupa_dl_unref): Unrefer depending modules recursively. Don't call pupa_dl_unload implicitly, because PUPA can crash if a module is unloaded before one depending on that module is unloaded. (pupa_dl_unload): Unload depending modules explicitly, if possible.
This commit is contained in:
parent
82cefbd307
commit
ce5bf700ca
22 changed files with 1664 additions and 103 deletions
298
normal/cmdline.c
Normal file
298
normal/cmdline.c
Normal file
|
@ -0,0 +1,298 @@
|
|||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* Copyright (C) 1999,2000,2001,2002 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2003 Yoshinori K. Okuji <okuji@enbug.org>
|
||||
*
|
||||
* 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/term.h>
|
||||
#include <pupa/err.h>
|
||||
#include <pupa/types.h>
|
||||
#include <pupa/mm.h>
|
||||
|
||||
static char *kill_buf;
|
||||
|
||||
void
|
||||
pupa_cmdline_run (int nested)
|
||||
{
|
||||
pupa_normal_init_page ();
|
||||
|
||||
pupa_printf ("\
|
||||
[ Minimal BASH-like line editing is supported. For the first word, TAB\n\
|
||||
lists possible command completions. Anywhere else TAB lists possible\n\
|
||||
device/file completions.%s ]\n\n",
|
||||
nested ? " ESC at any time exits." : "");
|
||||
|
||||
while (1)
|
||||
{
|
||||
static char cmdline[PUPA_MAX_CMDLINE];
|
||||
pupa_command_t cmd;
|
||||
|
||||
pupa_print_error ();
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
cmdline[0] = '\0';
|
||||
|
||||
if (! pupa_cmdline_get ("pupa> ", cmdline, sizeof (cmdline), 0, 1)
|
||||
&& nested)
|
||||
return;
|
||||
|
||||
if (! *cmdline)
|
||||
continue;
|
||||
|
||||
cmd = pupa_command_find (cmdline);
|
||||
if (! cmd)
|
||||
continue;
|
||||
|
||||
if (! (cmd->flags & PUPA_COMMAND_FLAG_CMDLINE))
|
||||
{
|
||||
pupa_error (PUPA_ERR_UNKNOWN_COMMAND,
|
||||
"invalid command `%s'", cmd->name);
|
||||
continue;
|
||||
}
|
||||
|
||||
pupa_command_execute (cmdline);
|
||||
}
|
||||
}
|
||||
|
||||
/* Get a command-line. If ECHO_CHAR is not zero, echo it instead of input
|
||||
characters. If READLINE is non-zero, readline-like key bindings are
|
||||
available. If ESC is pushed, return non-zero, otherwise return zero. */
|
||||
/* FIXME: The dumb interface is not supported yet. */
|
||||
int
|
||||
pupa_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
|
||||
int echo_char, int readline)
|
||||
{
|
||||
unsigned xpos, ypos, ystart;
|
||||
pupa_size_t lpos, llen;
|
||||
pupa_size_t plen;
|
||||
char buf[max_len];
|
||||
int key;
|
||||
auto void cl_insert (const char *str);
|
||||
auto void cl_delete (unsigned len);
|
||||
auto void cl_print (int pos, int c);
|
||||
auto void cl_set_pos (void);
|
||||
|
||||
void cl_set_pos (void)
|
||||
{
|
||||
xpos = (plen + lpos) % 79;
|
||||
ypos = ystart + (plen + lpos) / 79;
|
||||
pupa_gotoxy (xpos, ypos);
|
||||
}
|
||||
|
||||
void cl_print (int pos, int c)
|
||||
{
|
||||
char *p;
|
||||
|
||||
for (p = buf + pos; *p; p++)
|
||||
{
|
||||
if (xpos++ > 78)
|
||||
{
|
||||
pupa_putchar ('\n');
|
||||
|
||||
xpos = 1;
|
||||
if (ypos == (unsigned) (pupa_getxy () & 0xFF))
|
||||
ystart--;
|
||||
else
|
||||
ypos++;
|
||||
}
|
||||
|
||||
if (c)
|
||||
pupa_putchar (c);
|
||||
else
|
||||
pupa_putchar (*p);
|
||||
}
|
||||
}
|
||||
|
||||
void cl_insert (const char *str)
|
||||
{
|
||||
pupa_size_t len = pupa_strlen (str);
|
||||
|
||||
if (len + llen < max_len)
|
||||
{
|
||||
pupa_memmove (buf + lpos + len, buf + lpos, llen - lpos + 1);
|
||||
pupa_memmove (buf + lpos, str, len);
|
||||
|
||||
llen += len;
|
||||
lpos += len;
|
||||
cl_print (lpos - len, echo_char);
|
||||
cl_set_pos ();
|
||||
}
|
||||
}
|
||||
|
||||
void cl_delete (unsigned len)
|
||||
{
|
||||
if (lpos + len <= llen)
|
||||
{
|
||||
pupa_size_t saved_lpos = lpos;
|
||||
|
||||
lpos = llen - len;
|
||||
cl_set_pos ();
|
||||
cl_print (lpos, ' ');
|
||||
lpos = saved_lpos;
|
||||
cl_set_pos ();
|
||||
|
||||
pupa_memmove (buf + lpos, buf + lpos + len, llen - lpos + 1);
|
||||
llen -= len;
|
||||
cl_print (lpos, echo_char);
|
||||
cl_set_pos ();
|
||||
}
|
||||
}
|
||||
|
||||
plen = pupa_strlen (prompt);
|
||||
lpos = llen = 0;
|
||||
buf[0] = '\0';
|
||||
|
||||
if ((pupa_getxy () >> 8) != 0)
|
||||
pupa_putchar ('\n');
|
||||
|
||||
pupa_printf (prompt);
|
||||
|
||||
xpos = plen;
|
||||
ystart = ypos = (pupa_getxy () & 0xFF);
|
||||
|
||||
cl_insert (cmdline);
|
||||
|
||||
while ((key = PUPA_TERM_ASCII_CHAR (pupa_getkey ())) != '\n' && key != '\r')
|
||||
{
|
||||
if (readline)
|
||||
{
|
||||
switch (key)
|
||||
{
|
||||
case 1: /* Ctrl-a */
|
||||
lpos = 0;
|
||||
cl_set_pos ();
|
||||
break;
|
||||
|
||||
case 2: /* Ctrl-b */
|
||||
if (lpos > 0)
|
||||
{
|
||||
lpos--;
|
||||
cl_set_pos ();
|
||||
}
|
||||
break;
|
||||
|
||||
case 5: /* Ctrl-e */
|
||||
lpos = llen;
|
||||
cl_set_pos ();
|
||||
break;
|
||||
|
||||
case 6: /* Ctrl-f */
|
||||
if (lpos < llen)
|
||||
{
|
||||
lpos++;
|
||||
cl_set_pos ();
|
||||
}
|
||||
break;
|
||||
|
||||
case 9: /* Ctrl-i or TAB */
|
||||
/* FIXME */
|
||||
break;
|
||||
|
||||
case 11: /* Ctrl-k */
|
||||
if (lpos < llen)
|
||||
{
|
||||
if (kill_buf)
|
||||
pupa_free (kill_buf);
|
||||
|
||||
kill_buf = pupa_strdup (buf + lpos);
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
|
||||
cl_delete (llen - lpos);
|
||||
}
|
||||
break;
|
||||
|
||||
case 14: /* Ctrl-n */
|
||||
/* FIXME */
|
||||
break;
|
||||
|
||||
case 16: /* Ctrl-p */
|
||||
/* FIXME */
|
||||
break;
|
||||
|
||||
case 21: /* Ctrl-u */
|
||||
if (lpos > 0)
|
||||
{
|
||||
pupa_size_t n = lpos;
|
||||
|
||||
if (kill_buf)
|
||||
pupa_free (kill_buf);
|
||||
|
||||
kill_buf = pupa_malloc (n + 1);
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
if (kill_buf)
|
||||
{
|
||||
pupa_memcpy (kill_buf, buf, n);
|
||||
kill_buf[n] = '\0';
|
||||
}
|
||||
|
||||
lpos = 0;
|
||||
cl_set_pos ();
|
||||
cl_delete (n);
|
||||
}
|
||||
break;
|
||||
|
||||
case 25: /* Ctrl-y */
|
||||
if (kill_buf)
|
||||
cl_insert (kill_buf);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
switch (key)
|
||||
{
|
||||
case '\e':
|
||||
return 0;
|
||||
|
||||
case '\b':
|
||||
if (lpos > 0)
|
||||
{
|
||||
lpos--;
|
||||
cl_set_pos ();
|
||||
}
|
||||
/* fall through */
|
||||
|
||||
case 4: /* Ctrl-d */
|
||||
if (lpos < llen)
|
||||
cl_delete (1);
|
||||
break;
|
||||
|
||||
default:
|
||||
if (pupa_isprint (key))
|
||||
{
|
||||
char str[2];
|
||||
|
||||
str[0] = key;
|
||||
str[1] = '\0';
|
||||
cl_insert (str);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
pupa_putchar ('\n');
|
||||
|
||||
/* If ECHO_CHAR is NUL, remove leading spaces. */
|
||||
lpos = 0;
|
||||
if (! echo_char)
|
||||
while (buf[lpos] == ' ')
|
||||
lpos++;
|
||||
|
||||
pupa_memcpy (cmdline, buf + lpos, llen - lpos + 1);
|
||||
|
||||
return 1;
|
||||
}
|
176
normal/command.c
Normal file
176
normal/command.c
Normal file
|
@ -0,0 +1,176 @@
|
|||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* Copyright (C) 2003 Yoshinori K. Okuji <okuji@enbug.org>
|
||||
*
|
||||
* 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>
|
||||
|
||||
static pupa_command_t pupa_command_list;
|
||||
|
||||
void
|
||||
pupa_register_command (const char *name,
|
||||
int (*func) (int argc, char *argv[]),
|
||||
unsigned flags,
|
||||
const char *summary,
|
||||
const char *description)
|
||||
{
|
||||
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;
|
||||
|
||||
/* 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_command_execute (char *cmdline)
|
||||
{
|
||||
pupa_command_t cmd;
|
||||
char *p;
|
||||
char **args;
|
||||
int num = 0;
|
||||
int i;
|
||||
int ret;
|
||||
|
||||
cmd = pupa_command_find (cmdline);
|
||||
if (! cmd)
|
||||
return -1;
|
||||
|
||||
/* Count arguments. */
|
||||
p = cmdline;
|
||||
while (1)
|
||||
{
|
||||
while (*p && *p != ' ')
|
||||
p++;
|
||||
|
||||
if (! *p)
|
||||
break;
|
||||
|
||||
while (*p == ' ')
|
||||
p++;
|
||||
|
||||
num++;
|
||||
}
|
||||
|
||||
args = (char **) pupa_malloc (sizeof (char *) * (num + 1));
|
||||
if (! args)
|
||||
return -1;
|
||||
|
||||
/* Fill arguments. */
|
||||
for (i = 0, p = pupa_strchr (cmdline, ' '); i < num && p; i++)
|
||||
{
|
||||
if (! p)
|
||||
break;
|
||||
|
||||
while (*p == ' ')
|
||||
p++;
|
||||
|
||||
args[i] = p;
|
||||
|
||||
while (*p && *p != ' ')
|
||||
p++;
|
||||
|
||||
*p++ = '\0';
|
||||
}
|
||||
|
||||
/* Terminate the array with NULL. */
|
||||
args[i] = 0;
|
||||
|
||||
ret = (cmd->func) (num, args);
|
||||
|
||||
pupa_free (args);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
rescue_command (int argc __attribute__ ((unused)),
|
||||
char *argv[] __attribute__ ((unused)))
|
||||
{
|
||||
pupa_longjmp (pupa_exit_env, 0);
|
||||
|
||||
/* Never reach here. */
|
||||
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);
|
||||
|
||||
pupa_register_command ("rescue", rescue_command, PUPA_COMMAND_FLAG_BOTH,
|
||||
"rescue",
|
||||
"Enter into the rescue mode.");
|
||||
}
|
57
normal/i386/setjmp.S
Normal file
57
normal/i386/setjmp.S
Normal file
|
@ -0,0 +1,57 @@
|
|||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* Copyright (C) 2003 Yoshinori K. Okuji <okuji@enbug.org>
|
||||
*
|
||||
* 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/symbol.h>
|
||||
|
||||
.file "setjmp.S"
|
||||
|
||||
.text
|
||||
|
||||
/*
|
||||
* int pupa_setjmp (pupa_jmp_buf env)
|
||||
*/
|
||||
FUNCTION(pupa_setjmp)
|
||||
movl %ebx, 0(%eax) /* EBX */
|
||||
movl %esi, 4(%eax) /* ESI */
|
||||
movl %edi, 8(%eax) /* EDI */
|
||||
movl %ebp, 12(%eax) /* EBP */
|
||||
popl %ecx
|
||||
movl %esp, 16(%eax) /* ESP */
|
||||
movl %ecx, 20(%eax) /* EIP */
|
||||
xorl %eax, %eax
|
||||
jmp *%ecx
|
||||
|
||||
|
||||
/*
|
||||
* int pupa_longjmp (pupa_jmp_buf env, int val)
|
||||
*/
|
||||
FUNCTION(pupa_longjmp)
|
||||
movl 0(%eax), %ebx
|
||||
movl 4(%eax), %esi
|
||||
movl 8(%eax), %edi
|
||||
movl 12(%eax), %ebp
|
||||
movl 16(%eax), %esp
|
||||
movl 20(%eax), %ecx
|
||||
|
||||
movl %edx, %eax
|
||||
testl %eax, %eax
|
||||
jnz 1f
|
||||
incl %eax
|
||||
1: jmp *%ecx
|
||||
|
351
normal/main.c
Normal file
351
normal/main.c
Normal file
|
@ -0,0 +1,351 @@
|
|||
/* main.c - the normal mode main routine */
|
||||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2002,2003 Yoshinori K. Okuji <okuji@enbug.org>
|
||||
*
|
||||
* 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/kernel.h>
|
||||
#include <pupa/normal.h>
|
||||
#include <pupa/dl.h>
|
||||
#include <pupa/rescue.h>
|
||||
#include <pupa/misc.h>
|
||||
#include <pupa/file.h>
|
||||
#include <pupa/mm.h>
|
||||
#include <pupa/term.h>
|
||||
|
||||
pupa_jmp_buf pupa_exit_env;
|
||||
|
||||
/* Read a line from the file FILE. */
|
||||
static int
|
||||
get_line (pupa_file_t file, char cmdline[], int max_len)
|
||||
{
|
||||
char c;
|
||||
int pos = 0;
|
||||
int literal = 0;
|
||||
int comment = 0;
|
||||
|
||||
while (1)
|
||||
{
|
||||
if (pupa_file_read (file, &c, 1) != 1)
|
||||
break;
|
||||
|
||||
/* Skip all carriage returns. */
|
||||
if (c == '\r')
|
||||
continue;
|
||||
|
||||
/* Replace tabs with spaces. */
|
||||
if (c == '\t')
|
||||
c = ' ';
|
||||
|
||||
/* The previous is a backslash, then... */
|
||||
if (literal)
|
||||
{
|
||||
/* If it is a newline, replace it with a space and continue. */
|
||||
if (c == '\n')
|
||||
{
|
||||
c = ' ';
|
||||
|
||||
/* Go back to overwrite the backslash. */
|
||||
if (pos > 0)
|
||||
pos--;
|
||||
}
|
||||
|
||||
literal = 0;
|
||||
}
|
||||
|
||||
if (c == '\\')
|
||||
literal = 1;
|
||||
|
||||
if (comment)
|
||||
{
|
||||
if (c == '\n')
|
||||
comment = 0;
|
||||
}
|
||||
else if (pos == 0)
|
||||
{
|
||||
if (c == '#')
|
||||
comment = 1;
|
||||
else if (! pupa_isspace (c))
|
||||
cmdline[pos++] = c;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (c == '\n')
|
||||
break;
|
||||
|
||||
if (pos < max_len)
|
||||
cmdline[pos++] = c;
|
||||
}
|
||||
}
|
||||
|
||||
cmdline[pos] = '\0';
|
||||
|
||||
return pos;
|
||||
}
|
||||
|
||||
static void
|
||||
free_menu (pupa_menu_t menu)
|
||||
{
|
||||
pupa_menu_entry_t entry = menu->entry_list;
|
||||
|
||||
while (entry)
|
||||
{
|
||||
pupa_menu_entry_t next_entry = entry->next;
|
||||
pupa_command_list_t cmd = entry->command_list;
|
||||
|
||||
while (cmd)
|
||||
{
|
||||
pupa_command_list_t next_cmd = cmd->next;
|
||||
|
||||
pupa_free ((void *) cmd->command);
|
||||
cmd = next_cmd;
|
||||
}
|
||||
|
||||
pupa_free ((void *) entry->title);
|
||||
entry = next_entry;
|
||||
}
|
||||
|
||||
pupa_free (menu);
|
||||
}
|
||||
|
||||
/* Read the config file CONFIG and return a menu. If no entry is present,
|
||||
return NULL. */
|
||||
static pupa_menu_t
|
||||
read_config_file (const char *config)
|
||||
{
|
||||
pupa_file_t file;
|
||||
static char cmdline[PUPA_MAX_CMDLINE];
|
||||
pupa_menu_t menu;
|
||||
pupa_menu_entry_t *next_entry, cur_entry = 0;
|
||||
pupa_command_list_t *next_cmd, cur_cmd;
|
||||
|
||||
/* Try to open the config file. */
|
||||
file = pupa_file_open (config);
|
||||
if (! file)
|
||||
return 0;
|
||||
|
||||
/* Initialize the menu. */
|
||||
menu = (pupa_menu_t) pupa_malloc (sizeof (*menu));
|
||||
if (! menu)
|
||||
{
|
||||
pupa_file_close (file);
|
||||
return 0;
|
||||
}
|
||||
menu->default_entry = 0;
|
||||
menu->fallback_entry = -1;
|
||||
menu->timeout = -1;
|
||||
menu->size = 0;
|
||||
menu->entry_list = 0;
|
||||
|
||||
next_entry = &(menu->entry_list);
|
||||
next_cmd = 0;
|
||||
|
||||
/* Read each line. */
|
||||
while (get_line (file, cmdline, sizeof (cmdline)))
|
||||
{
|
||||
pupa_command_t cmd;
|
||||
|
||||
cmd = pupa_command_find (cmdline);
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
if (! cmd)
|
||||
{
|
||||
pupa_printf ("Unknown command `%s' is ignored.\n", cmdline);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (cmd->flags & PUPA_COMMAND_FLAG_TITLE)
|
||||
{
|
||||
char *p;
|
||||
|
||||
cur_entry = (pupa_menu_entry_t) pupa_malloc (sizeof (*cur_entry));
|
||||
if (! cur_entry)
|
||||
goto fail;
|
||||
|
||||
p = pupa_strchr (cmdline, ' ');
|
||||
if (p)
|
||||
cur_entry->title = pupa_strdup (p);
|
||||
else
|
||||
cur_entry->title = pupa_strdup ("");
|
||||
|
||||
if (! cur_entry->title)
|
||||
{
|
||||
pupa_free (cur_entry);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
cur_entry->num = 0;
|
||||
cur_entry->command_list = 0;
|
||||
cur_entry->next = 0;
|
||||
|
||||
*next_entry = cur_entry;
|
||||
next_entry = &(cur_entry->next);
|
||||
|
||||
next_cmd = &(cur_entry->command_list);
|
||||
|
||||
menu->size++;
|
||||
}
|
||||
else if (! cur_entry)
|
||||
{
|
||||
/* Run the command if possible. */
|
||||
if (cmd->flags & PUPA_COMMAND_FLAG_MENU)
|
||||
{
|
||||
pupa_command_execute (cmdline);
|
||||
pupa_print_error ();
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
}
|
||||
else
|
||||
{
|
||||
pupa_printf ("Invalid command `%s' is ignored.\n", cmdline);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
cur_cmd = (pupa_command_list_t) pupa_malloc (sizeof (*cur_cmd));
|
||||
if (! cur_cmd)
|
||||
goto fail;
|
||||
|
||||
cur_cmd->command = pupa_strdup (cmdline);
|
||||
if (! cur_cmd->command)
|
||||
{
|
||||
pupa_free (cur_cmd);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
cur_cmd->next = 0;
|
||||
|
||||
*next_cmd = cur_cmd;
|
||||
next_cmd = &(cur_cmd->next);
|
||||
|
||||
cur_entry->num++;
|
||||
}
|
||||
}
|
||||
|
||||
fail:
|
||||
|
||||
pupa_file_close (file);
|
||||
|
||||
/* If no entry was found or any error occurred, return NULL. */
|
||||
if (menu->size == 0 || pupa_errno != PUPA_ERR_NONE)
|
||||
{
|
||||
free_menu (menu);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Check values of the default entry and the fallback one. */
|
||||
if (menu->fallback_entry >= menu->size)
|
||||
menu->fallback_entry = -1;
|
||||
|
||||
if (menu->default_entry < 0 || menu->default_entry >= menu->size)
|
||||
{
|
||||
if (menu->fallback_entry < 0)
|
||||
menu->default_entry = 0;
|
||||
else
|
||||
{
|
||||
menu->default_entry = menu->fallback_entry;
|
||||
menu->fallback_entry = -1;
|
||||
}
|
||||
}
|
||||
|
||||
return menu;
|
||||
}
|
||||
|
||||
/* This starts the normal mode. */
|
||||
void
|
||||
pupa_enter_normal_mode (const char *config)
|
||||
{
|
||||
if (pupa_setjmp (pupa_exit_env) == 0)
|
||||
pupa_normal_execute (config, 0);
|
||||
}
|
||||
|
||||
/* Initialize the screen. */
|
||||
void
|
||||
pupa_normal_init_page (void)
|
||||
{
|
||||
pupa_cls ();
|
||||
pupa_printf ("\n\
|
||||
PUPA version %s\n\n",
|
||||
PACKAGE_VERSION);
|
||||
}
|
||||
|
||||
/* Read the config file CONFIG and execute the menu interface or
|
||||
the command-line interface. */
|
||||
void
|
||||
pupa_normal_execute (const char *config, int nested)
|
||||
{
|
||||
pupa_menu_t menu = 0;
|
||||
|
||||
if (config)
|
||||
{
|
||||
menu = read_config_file (config);
|
||||
|
||||
/* Ignore any error. */
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
}
|
||||
|
||||
if (menu)
|
||||
pupa_menu_run (menu, nested);
|
||||
else
|
||||
pupa_cmdline_run (nested);
|
||||
}
|
||||
|
||||
/* Enter normal mode from rescue mode. */
|
||||
static void
|
||||
pupa_rescue_cmd_normal (int argc, char *argv[])
|
||||
{
|
||||
if (argc == 0)
|
||||
{
|
||||
/* Guess the config filename. */
|
||||
char *config;
|
||||
const char *prefix;
|
||||
|
||||
prefix = pupa_dl_get_prefix ();
|
||||
if (prefix)
|
||||
{
|
||||
config = pupa_malloc (pupa_strlen (prefix) + sizeof ("/pupa.cfg"));
|
||||
if (! config)
|
||||
return;
|
||||
|
||||
pupa_sprintf (config, "%s/pupa.cfg", prefix);
|
||||
pupa_enter_normal_mode (config);
|
||||
pupa_free (config);
|
||||
}
|
||||
else
|
||||
pupa_enter_normal_mode (0);
|
||||
}
|
||||
else
|
||||
pupa_enter_normal_mode (argv[0]);
|
||||
}
|
||||
|
||||
PUPA_MOD_INIT
|
||||
{
|
||||
/* Normal mode shouldn't be unloaded. */
|
||||
pupa_dl_ref (mod);
|
||||
|
||||
/* Register a command "normal" for the rescue mode. */
|
||||
pupa_rescue_register_command ("normal", pupa_rescue_cmd_normal,
|
||||
"enter normal mode");
|
||||
|
||||
/* This registers some built-in commands. */
|
||||
pupa_command_init ();
|
||||
}
|
||||
|
||||
PUPA_MOD_FINI
|
||||
{
|
||||
pupa_rescue_unregister_command ("normal");
|
||||
}
|
272
normal/menu.c
Normal file
272
normal/menu.c
Normal file
|
@ -0,0 +1,272 @@
|
|||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* Copyright (C) 2003 Yoshinori K. Okuji <okuji@enbug.org>
|
||||
*
|
||||
* 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/term.h>
|
||||
#include <pupa/misc.h>
|
||||
|
||||
/* FIXME: These below are all runaround. */
|
||||
|
||||
#define DISP_UP 0x18
|
||||
#define DISP_DOWN 0x19
|
||||
#define DISP_RIGHT 0x1a
|
||||
#define DISP_HLINE 0xc4
|
||||
#define DISP_VLINE 0xb3
|
||||
#define DISP_UL 0xda
|
||||
#define DISP_UR 0xbf
|
||||
#define DISP_LL 0xc0
|
||||
#define DISP_LR 0xd9
|
||||
|
||||
static void
|
||||
draw_border (void)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
pupa_setcolorstate (PUPA_TERM_COLOR_NORMAL);
|
||||
|
||||
pupa_gotoxy (1, 3);
|
||||
pupa_putchar (DISP_UL);
|
||||
for (i = 0; i < 73; i++)
|
||||
pupa_putchar (DISP_HLINE);
|
||||
pupa_putchar (DISP_UR);
|
||||
|
||||
i = 1;
|
||||
while (1)
|
||||
{
|
||||
pupa_gotoxy (1, 3 + i);
|
||||
|
||||
if (i > 12)
|
||||
break;
|
||||
|
||||
pupa_putchar (DISP_VLINE);
|
||||
pupa_gotoxy (75, 3 + i);
|
||||
pupa_putchar (DISP_VLINE);
|
||||
|
||||
i++;
|
||||
}
|
||||
|
||||
pupa_putchar (DISP_LL);
|
||||
for (i = 0; i < 73; i++)
|
||||
pupa_putchar (DISP_HLINE);
|
||||
pupa_putchar (DISP_LR);
|
||||
|
||||
pupa_setcolorstate (PUPA_TERM_COLOR_STANDARD);
|
||||
}
|
||||
|
||||
static void
|
||||
print_message (int nested)
|
||||
{
|
||||
pupa_printf ("\n\
|
||||
Use the %c and %c keys to select which entry is highlighted.\n",
|
||||
DISP_UP, DISP_DOWN);
|
||||
pupa_printf ("\
|
||||
Press enter to boot the selected OS, \'e\' to edit the\n\
|
||||
commands before booting, or \'c\' for a command-line.");
|
||||
if (nested)
|
||||
pupa_printf ("\
|
||||
ESC to return previous menu.");
|
||||
}
|
||||
|
||||
static pupa_menu_entry_t
|
||||
get_entry (pupa_menu_t menu, int no)
|
||||
{
|
||||
pupa_menu_entry_t e;
|
||||
|
||||
for (e = menu->entry_list; e && no > 0; e = e->next, no--)
|
||||
;
|
||||
|
||||
return e;
|
||||
}
|
||||
|
||||
static void
|
||||
print_entry (int y, int highlight, pupa_menu_entry_t entry)
|
||||
{
|
||||
int x;
|
||||
const char *title;
|
||||
|
||||
title = entry ? entry->title : "";
|
||||
|
||||
pupa_setcolorstate (highlight
|
||||
? PUPA_TERM_COLOR_HIGHLIGHT
|
||||
: PUPA_TERM_COLOR_NORMAL);
|
||||
|
||||
pupa_gotoxy (2, y);
|
||||
pupa_putchar (' ');
|
||||
for (x = 3; x < 75; x++)
|
||||
{
|
||||
if (*title && x <= 72)
|
||||
{
|
||||
if (x == 72)
|
||||
pupa_putchar (DISP_RIGHT);
|
||||
else
|
||||
pupa_putchar (*title++);
|
||||
}
|
||||
else
|
||||
pupa_putchar (' ');
|
||||
}
|
||||
pupa_gotoxy (74, y);
|
||||
|
||||
pupa_setcolorstate (PUPA_TERM_COLOR_STANDARD);
|
||||
}
|
||||
|
||||
static void
|
||||
print_entries (pupa_menu_t menu, int first, int offset)
|
||||
{
|
||||
pupa_menu_entry_t e;
|
||||
int i;
|
||||
|
||||
pupa_gotoxy (77, 4);
|
||||
|
||||
if (first)
|
||||
pupa_putchar (DISP_UP);
|
||||
else
|
||||
pupa_putchar (' ');
|
||||
|
||||
e = get_entry (menu, first);
|
||||
|
||||
for (i = 0; i < 12; i++)
|
||||
{
|
||||
print_entry (4 + i, offset == i, e);
|
||||
if (e)
|
||||
e = e->next;
|
||||
}
|
||||
|
||||
pupa_gotoxy (77, 4 + 12);
|
||||
|
||||
if (e)
|
||||
pupa_putchar (DISP_DOWN);
|
||||
else
|
||||
pupa_putchar (' ');
|
||||
|
||||
pupa_gotoxy (74, 4 + offset);
|
||||
}
|
||||
|
||||
static void
|
||||
init_page (int nested)
|
||||
{
|
||||
pupa_normal_init_page ();
|
||||
draw_border ();
|
||||
print_message (nested);
|
||||
}
|
||||
|
||||
static int
|
||||
run_menu (pupa_menu_t menu, int nested)
|
||||
{
|
||||
int first, offset;
|
||||
|
||||
pupa_setcursor (0);
|
||||
|
||||
first = 0;
|
||||
offset = menu->default_entry;
|
||||
if (offset > 11)
|
||||
{
|
||||
first = offset - 11;
|
||||
offset = 11;
|
||||
}
|
||||
|
||||
init_page (nested);
|
||||
print_entries (menu, first, offset);
|
||||
|
||||
while (1)
|
||||
{
|
||||
int c;
|
||||
|
||||
c = PUPA_TERM_ASCII_CHAR (pupa_getkey ());
|
||||
switch (c)
|
||||
{
|
||||
case 16:
|
||||
case '^':
|
||||
if (offset > 0)
|
||||
{
|
||||
print_entry (4 + offset, 0, get_entry (menu, first + offset));
|
||||
offset--;
|
||||
print_entry (4 + offset, 1, get_entry (menu, first + offset));
|
||||
}
|
||||
else if (first > 0)
|
||||
{
|
||||
first--;
|
||||
print_entries (menu, first, offset);
|
||||
}
|
||||
break;
|
||||
|
||||
case 14:
|
||||
case 'v':
|
||||
if (menu->size > first + offset + 1)
|
||||
{
|
||||
if (offset < 11)
|
||||
{
|
||||
print_entry (4 + offset, 0,
|
||||
get_entry (menu, first + offset));
|
||||
offset++;
|
||||
print_entry (4 + offset, 1,
|
||||
get_entry (menu, first + offset));
|
||||
}
|
||||
else
|
||||
{
|
||||
first++;
|
||||
print_entries (menu, first, offset);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case '\n':
|
||||
case '\r':
|
||||
case 6:
|
||||
pupa_setcursor (1);
|
||||
return first + offset;
|
||||
|
||||
case '\e':
|
||||
if (nested)
|
||||
{
|
||||
pupa_setcursor (1);
|
||||
return -1;
|
||||
}
|
||||
break;
|
||||
|
||||
case 'c':
|
||||
pupa_setcursor (1);
|
||||
pupa_cmdline_run (1);
|
||||
pupa_setcursor (0);
|
||||
init_page (nested);
|
||||
print_entries (menu, first, offset);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Never reach here. */
|
||||
return -1;
|
||||
}
|
||||
|
||||
void
|
||||
pupa_menu_run (pupa_menu_t menu, int nested)
|
||||
{
|
||||
while (1)
|
||||
{
|
||||
int boot_entry;
|
||||
|
||||
boot_entry = run_menu (menu, nested);
|
||||
if (boot_entry < 0)
|
||||
break;
|
||||
|
||||
/* FIXME: Boot the entry. */
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue