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:
parent
1f7315a3de
commit
5aded270b6
15 changed files with 793 additions and 6 deletions
26
fs/ext2.c
26
fs/ext2.c
|
@ -687,6 +687,31 @@ pupa_ext2_dir (pupa_device_t device, const char *path,
|
|||
return pupa_errno;
|
||||
}
|
||||
|
||||
static pupa_err_t
|
||||
pupa_ext2_label (pupa_device_t device, char **label)
|
||||
{
|
||||
struct pupa_ext2_data *data;
|
||||
pupa_disk_t disk = device->disk;
|
||||
|
||||
#ifndef PUPA_UTIL
|
||||
pupa_dl_ref (my_mod);
|
||||
#endif
|
||||
|
||||
data = pupa_ext2_mount (disk);
|
||||
if (data)
|
||||
*label = pupa_strndup (data->sblock.volume_name, 14);
|
||||
else
|
||||
*label = 0;
|
||||
|
||||
#ifndef PUPA_UTIL
|
||||
pupa_dl_unref (my_mod);
|
||||
#endif
|
||||
|
||||
pupa_free (data);
|
||||
|
||||
return pupa_errno;
|
||||
}
|
||||
|
||||
|
||||
static struct pupa_fs pupa_ext2_fs =
|
||||
{
|
||||
|
@ -695,6 +720,7 @@ static struct pupa_fs pupa_ext2_fs =
|
|||
.open = pupa_ext2_open,
|
||||
.read = pupa_ext2_read,
|
||||
.close = pupa_ext2_close,
|
||||
.label = pupa_ext2_label,
|
||||
.next = 0
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue