2003-12-03 Marco Gerards <metgerards@student.han.nl>
* fs/ext2.c (pupa_ext2_label): New function. (pupa_ext2_fs): Added label. * fs/fat.c (pupa_fat_label): New function. (pupa_fat_fs): Added label. * include/pupa/fs.h (struct pupa_fs): Added prototype label. * kern/misc.c (pupa_strndup): New function. * include/pupa/misc.h (pupa_strndup): New prototype. * include/pupa/normal.h: Include <pupa/err.h>. (pupa_set_history): New prototype. (pupa_iterate_commands): New prototype. * normal/cmdline.c: Include <pupa/machine/partition.h>, <pupa/disk.h>, <pupa/file.h>. (hist_size): New variable. (hist_lines): Likewise. (hist_end): Likewise. (hist_used): Likewise. (pupa_set_history): New function. (pupa_history_get): Likewise. (pupa_history_add): Likewise. (pupa_history_replace): Likewise. (pupa_tab_complete): Likewise. (pupa_cmdline_run): Added tab completion and history buffer. Tab completion shows partitionnames while completing partitions, this feature was suggested by Jeff Bailey. * normal/command.c (pupa_iterate_commands): New function. * normal/main.c (PUPA_DEFAULT_HISTORY_SIZE): New macro. (pupa_normal_init): Initialize history buffer. (PUPA_MOD_INIT): Likewise. (pupa_normal_fini): Free the history buffer. (PUPA_MOD_FINI): Likewise. * util/console.c (pupa_ncurses_getkey): Accept 127 as backspace key. * aclocal.m4 (pupa_I386_CHECK_REGPARM_BUG): New DEFUN. * configure.ac [i386]: Check for regparam bug. (NESTED_FUNC_ATTR) [! i386]: Defined.
This commit is contained in:
marco_g
parent
1f7315a3de
commit
5aded270b6
15 changed files with 793 additions and 6 deletions
484
normal/cmdline.c
484
normal/cmdline.c
|
|
@ -2,6 +2,7 @@
|
|||
* 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>
|
||||
* Copyright (C) 2003 Marco Gerards <metgerards@student.han.nl>
|
||||
*
|
||||
* 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
|
||||
|
|
@ -24,9 +25,429 @@
|
|||
#include <pupa/err.h>
|
||||
#include <pupa/types.h>
|
||||
#include <pupa/mm.h>
|
||||
#include <pupa/machine/partition.h>
|
||||
#include <pupa/disk.h>
|
||||
#include <pupa/file.h>
|
||||
|
||||
static char *kill_buf;
|
||||
|
||||
static int hist_size;
|
||||
static char **hist_lines = 0;
|
||||
static int hist_pos = 0;
|
||||
static int hist_end = 0;
|
||||
static int hist_used = 0;
|
||||
|
||||
pupa_err_t
|
||||
pupa_set_history (int newsize)
|
||||
{
|
||||
char **old_hist_lines = hist_lines;
|
||||
hist_lines = pupa_malloc (sizeof (char *) * newsize);
|
||||
|
||||
/* Copy the old lines into the new buffer. */
|
||||
if (old_hist_lines)
|
||||
{
|
||||
/* Remove the lines that don't fit in the new buffer. */
|
||||
if (newsize < hist_used)
|
||||
{
|
||||
int i;
|
||||
int delsize = hist_used - newsize;
|
||||
hist_used = newsize;
|
||||
|
||||
for (i = 0; i < delsize; i++)
|
||||
{
|
||||
int pos = hist_end - i;
|
||||
if (pos > hist_size)
|
||||
pos -= hist_size;
|
||||
pupa_free (old_hist_lines[pos]);
|
||||
}
|
||||
|
||||
hist_end -= delsize;
|
||||
if (hist_end < 0)
|
||||
hist_end = hist_size - hist_end;
|
||||
}
|
||||
|
||||
if (hist_pos < hist_end)
|
||||
pupa_memmove (hist_lines, old_hist_lines + hist_pos,
|
||||
(hist_end - hist_pos) * sizeof (char *));
|
||||
else
|
||||
{
|
||||
/* Copy the first part. */
|
||||
pupa_memmove (hist_lines, old_hist_lines,
|
||||
hist_pos * sizeof (char *));
|
||||
|
||||
|
||||
/* Copy the last part. */
|
||||
pupa_memmove (hist_lines + hist_pos, old_hist_lines + hist_pos,
|
||||
(hist_size - hist_pos) * sizeof (char *));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
pupa_free (old_hist_lines);
|
||||
|
||||
hist_size = newsize;
|
||||
hist_pos = 0;
|
||||
hist_end = hist_used;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Get the entry POS from the history where `0' is the newest
|
||||
entry. */
|
||||
static char *
|
||||
pupa_history_get (int pos)
|
||||
{
|
||||
pos = (hist_pos + pos) % hist_size;
|
||||
return hist_lines[pos];
|
||||
}
|
||||
|
||||
|
||||
/* Insert a new history line S on the top of the history. */
|
||||
static void
|
||||
pupa_history_add (char *s)
|
||||
{
|
||||
/* Remove the oldest entry in the history to make room for a new
|
||||
entry. */
|
||||
if (hist_used + 1 > hist_size)
|
||||
{
|
||||
hist_end--;
|
||||
if (hist_end < 0)
|
||||
hist_end = hist_size + hist_end;
|
||||
|
||||
pupa_free (hist_lines[hist_end]);
|
||||
}
|
||||
else
|
||||
hist_used++;
|
||||
|
||||
/* Move to the next position. */
|
||||
hist_pos--;
|
||||
if (hist_pos < 0)
|
||||
hist_pos = hist_size + hist_pos;
|
||||
|
||||
/* Insert into history. */
|
||||
hist_lines[hist_pos] = pupa_strdup (s);
|
||||
}
|
||||
|
||||
/* Replace the history entry on position POS with the string S. */
|
||||
static void
|
||||
pupa_history_replace (int pos, char *s)
|
||||
{
|
||||
pos = (hist_pos + pos) % hist_size;
|
||||
pupa_free (hist_lines[pos]);
|
||||
hist_lines[pos] = pupa_strdup (s);
|
||||
}
|
||||
|
||||
/* Try to complete the string in BUF, return the characters that
|
||||
should be added to the string. This command outputs the possible
|
||||
completions, in that case set RESTORE to 1 so the caller can
|
||||
restore the prompt. */
|
||||
static char *
|
||||
pupa_tab_complete (char *buf, int *restore)
|
||||
{
|
||||
char *pos = buf;
|
||||
char *path;
|
||||
|
||||
char *found = 0;
|
||||
int begin;
|
||||
int end;
|
||||
int len;
|
||||
int numfound = 0;
|
||||
|
||||
/* The disk that is used for pupa_partition_iterate. */
|
||||
pupa_device_t partdev;
|
||||
|
||||
/* String that is added when matched. */
|
||||
char *matchstr;
|
||||
|
||||
void print_simple_completion (char *comp)
|
||||
{
|
||||
pupa_printf (" %s", comp);
|
||||
}
|
||||
|
||||
void print_partition_completion (char *comp)
|
||||
{
|
||||
pupa_fs_t fs = 0;
|
||||
pupa_device_t part;
|
||||
char devname[20];
|
||||
|
||||
pupa_sprintf (devname, "%s,%s", partdev->disk->name, comp);
|
||||
part = pupa_device_open (devname);
|
||||
if (!part)
|
||||
pupa_printf ("\n\tPartition num:%s, Filesystem cannot be accessed",
|
||||
comp);
|
||||
else
|
||||
{
|
||||
char *label;
|
||||
|
||||
fs = pupa_fs_probe (part);
|
||||
/* Ignore all errors. */
|
||||
pupa_errno = 0;
|
||||
|
||||
pupa_printf ("\n\tPartition num:%s, Filesystem type %s",
|
||||
comp, fs ? fs->name : "Unknown");
|
||||
|
||||
if (fs)
|
||||
{
|
||||
(fs->label) (part, &label);
|
||||
if (pupa_errno == PUPA_ERR_NONE)
|
||||
{
|
||||
if (label && pupa_strlen (label))
|
||||
pupa_printf (", Label: %s", label);
|
||||
pupa_free (label);
|
||||
}
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
}
|
||||
pupa_device_close (part);
|
||||
}
|
||||
}
|
||||
|
||||
/* Add a string to the list of possible completions. COMP is the
|
||||
string that should be added. If this string completely matches
|
||||
add the string MATCH to the input after adding COMP. The string
|
||||
WHAT contains a discription of the kind of data that is added.
|
||||
Use PRINT_COMPLETION to show the completions if there are
|
||||
multiple matches. XXX: Because of a bug in gcc it is required to
|
||||
use __regparm__ in some cases. */
|
||||
|
||||
int NESTED_FUNC_ATTR
|
||||
add_completion (const char *comp, const char *match, const char *what,
|
||||
void (*print_completion) (char *))
|
||||
{
|
||||
/* Bug in strncmp then len ==0. */
|
||||
if (!len || pupa_strncmp (pos, comp, len) == 0)
|
||||
{
|
||||
numfound++;
|
||||
|
||||
if (numfound == 1)
|
||||
{
|
||||
begin = len;
|
||||
found = pupa_strdup (comp);
|
||||
end = pupa_strlen (found);
|
||||
matchstr = (char *) match;
|
||||
}
|
||||
/* Multiple matches found, print the first instead of completing. */
|
||||
else if (numfound == 2)
|
||||
{
|
||||
pupa_printf ("\nPossible %s are: ", what);
|
||||
print_completion (found);
|
||||
}
|
||||
|
||||
if (numfound > 1)
|
||||
{
|
||||
char *s1 = found;
|
||||
const char *s2 = comp;
|
||||
int cnt = 0;
|
||||
|
||||
print_completion ((char *) comp);
|
||||
|
||||
/* Find out how many characters match. */
|
||||
while ((cnt < end) && *s1 && *s2 && (*s1 == *s2))
|
||||
{
|
||||
s1++;
|
||||
s2++;
|
||||
cnt++;
|
||||
}
|
||||
end = cnt;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int iterate_part (const pupa_partition_t p)
|
||||
{
|
||||
add_completion (pupa_partition_get_name (p), ")", "partitions",
|
||||
print_partition_completion);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int iterate_dir (const char *filename, int dir)
|
||||
{
|
||||
if (!dir)
|
||||
add_completion (filename, " ", "files", print_simple_completion);
|
||||
else
|
||||
{
|
||||
char fname[pupa_strlen (filename) + 2];
|
||||
pupa_strcpy (fname, filename);
|
||||
pupa_sprintf (fname, "%s/", filename);
|
||||
add_completion (fname, "", "files", print_simple_completion);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int iterate_dev (const char *devname)
|
||||
{
|
||||
pupa_device_t dev;
|
||||
|
||||
/* Complete the partition part. */
|
||||
dev = pupa_device_open (devname);
|
||||
|
||||
if (dev)
|
||||
{
|
||||
if (dev->disk && dev->disk->has_partitions)
|
||||
add_completion (devname, ",", "disks", print_simple_completion);
|
||||
else
|
||||
add_completion (devname, ")", "disks", print_simple_completion);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int iterate_commands (pupa_command_t cmd)
|
||||
{
|
||||
if (cmd->flags & PUPA_COMMAND_FLAG_CMDLINE)
|
||||
add_completion (cmd->name, " ", "commands", print_simple_completion);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Remove blank space on the beginning of the line. */
|
||||
while (*pos == ' ')
|
||||
pos++;
|
||||
|
||||
/* Check if the string is a command or path. */
|
||||
path = pupa_strchr (pos, ' ');
|
||||
|
||||
if (!path)
|
||||
{
|
||||
/* Tab complete a command. */
|
||||
len = pupa_strlen (pos);
|
||||
|
||||
pupa_iterate_commands (iterate_commands);
|
||||
}
|
||||
else
|
||||
{
|
||||
pos = path;
|
||||
|
||||
/* Remove blank space on the beginning of the line. */
|
||||
while (*pos == ' ')
|
||||
pos++;
|
||||
|
||||
/* Check if this is a completion for a device name. */
|
||||
if (*pos == '(' && !pupa_strchr (pos, ')'))
|
||||
{
|
||||
/* Check if this is a device or partition. */
|
||||
char *partition = pupa_strchr (++pos, ',');
|
||||
|
||||
if (!partition)
|
||||
{
|
||||
/* Complete the disk part. */
|
||||
len = pupa_strlen (pos);
|
||||
pupa_disk_dev_iterate (iterate_dev);
|
||||
if (pupa_errno)
|
||||
goto fail;
|
||||
}
|
||||
else
|
||||
{
|
||||
*partition = '\0';
|
||||
|
||||
/* Complete the partition part. */
|
||||
partdev = pupa_device_open (pos);
|
||||
*partition = ',';
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
|
||||
if (partdev)
|
||||
{
|
||||
if (partdev->disk && partdev->disk->has_partitions)
|
||||
{
|
||||
pos = partition + 1;
|
||||
len = pupa_strlen (pos);
|
||||
|
||||
pupa_partition_iterate (partdev->disk, iterate_part);
|
||||
if (pupa_errno)
|
||||
pupa_errno = 0;
|
||||
}
|
||||
|
||||
pupa_device_close (partdev);
|
||||
}
|
||||
else
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
char *device = pupa_file_get_device_name (pos);
|
||||
pupa_device_t dev;
|
||||
pupa_fs_t fs;
|
||||
|
||||
dev = pupa_device_open (device);
|
||||
if (!dev)
|
||||
goto fail;
|
||||
|
||||
fs = pupa_fs_probe (dev);
|
||||
if (pupa_errno)
|
||||
goto fail;
|
||||
|
||||
pos = pupa_strrchr (pos, '/');
|
||||
if (pos)
|
||||
{
|
||||
char *dir;
|
||||
char *dirfile;
|
||||
pos++;
|
||||
len = pupa_strlen (pos);
|
||||
|
||||
dir = pupa_strchr (path, '/');
|
||||
if (!dir)
|
||||
{
|
||||
*restore = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
dir = pupa_strdup (dir);
|
||||
|
||||
/* Cut away the filename part. */
|
||||
dirfile = pupa_strrchr (dir, '/');
|
||||
dirfile[1] = '\0';
|
||||
|
||||
/* Tab complete a file. */
|
||||
(fs->dir) (dev, dir, iterate_dir);
|
||||
if (dev)
|
||||
pupa_device_close (dev);
|
||||
|
||||
pupa_free (device);
|
||||
pupa_free (dir);
|
||||
|
||||
if (pupa_errno)
|
||||
goto fail;
|
||||
}
|
||||
else
|
||||
{
|
||||
found = pupa_strdup ("/");
|
||||
matchstr = "";
|
||||
numfound = 1;
|
||||
begin = 0;
|
||||
end = 1;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* If more than one match is found those matches will be printed and
|
||||
the prompt should be restored. */
|
||||
if (numfound > 1)
|
||||
*restore = 1;
|
||||
else
|
||||
*restore = 0;
|
||||
|
||||
/* Return the part that matches. */
|
||||
if (end && found)
|
||||
{
|
||||
char *insert;
|
||||
insert = pupa_malloc (end - begin + 1 + sizeof (matchstr));
|
||||
pupa_strncpy (insert, found + begin, end - begin);
|
||||
insert[end - begin] = '\0';
|
||||
if (numfound == 1)
|
||||
pupa_strcat (insert, matchstr);
|
||||
pupa_free (found);
|
||||
|
||||
return insert;
|
||||
}
|
||||
|
||||
fail:
|
||||
pupa_free (found);
|
||||
pupa_errno = PUPA_ERR_NONE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
pupa_cmdline_run (int nested)
|
||||
{
|
||||
|
|
@ -82,6 +503,7 @@ pupa_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
|
|||
pupa_size_t plen;
|
||||
char buf[max_len];
|
||||
int key;
|
||||
int histpos = 0;
|
||||
auto void cl_insert (const char *str);
|
||||
auto void cl_delete (unsigned len);
|
||||
auto void cl_print (int pos, int c);
|
||||
|
|
@ -167,6 +589,8 @@ pupa_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
|
|||
|
||||
cl_insert (cmdline);
|
||||
|
||||
pupa_history_add (buf);
|
||||
|
||||
while ((key = PUPA_TERM_ASCII_CHAR (pupa_getkey ())) != '\n' && key != '\r')
|
||||
{
|
||||
if (readline)
|
||||
|
|
@ -200,7 +624,34 @@ pupa_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
|
|||
break;
|
||||
|
||||
case 9: /* Ctrl-i or TAB */
|
||||
/* FIXME */
|
||||
{
|
||||
char *insert;
|
||||
int restore;
|
||||
|
||||
/* Backup the next character and make it 0 so it will
|
||||
be easy to use string functions. */
|
||||
char backup = buf[lpos];
|
||||
buf[lpos] = '\0';
|
||||
|
||||
|
||||
insert = pupa_tab_complete (buf, &restore);
|
||||
/* Restore the original string. */
|
||||
buf[lpos] = backup;
|
||||
|
||||
if (restore)
|
||||
{
|
||||
/* Restore the prompt. */
|
||||
pupa_printf ("\n%s%s", prompt, buf);
|
||||
xpos = plen;
|
||||
ystart = ypos = (pupa_getxy () & 0xFF);
|
||||
}
|
||||
|
||||
if (insert)
|
||||
{
|
||||
cl_insert (insert);
|
||||
pupa_free (insert);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 11: /* Ctrl-k */
|
||||
|
|
@ -217,11 +668,34 @@ pupa_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
|
|||
break;
|
||||
|
||||
case 14: /* Ctrl-n */
|
||||
/* FIXME */
|
||||
break;
|
||||
{
|
||||
char *hist;
|
||||
|
||||
lpos = 0;
|
||||
|
||||
if (histpos > 0)
|
||||
histpos--;
|
||||
|
||||
cl_delete (llen);
|
||||
hist = pupa_history_get (histpos);
|
||||
cl_insert (hist);
|
||||
|
||||
break;
|
||||
}
|
||||
case 16: /* Ctrl-p */
|
||||
/* FIXME */
|
||||
{
|
||||
char *hist;
|
||||
|
||||
lpos = 0;
|
||||
|
||||
if (histpos < hist_used - 1)
|
||||
histpos++;
|
||||
|
||||
cl_delete (llen);
|
||||
hist = pupa_history_get (histpos);
|
||||
|
||||
cl_insert (hist);
|
||||
}
|
||||
break;
|
||||
|
||||
case 21: /* Ctrl-u */
|
||||
|
|
@ -282,6 +756,8 @@ pupa_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
|
|||
}
|
||||
break;
|
||||
}
|
||||
|
||||
pupa_history_replace (histpos, buf);
|
||||
}
|
||||
|
||||
pupa_putchar ('\n');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue