2004-09-22 Hollis Blanchard <hollis@penguinppc.org>
* commands/ls.c (grub_ls_list_files): Use the string following the initial ')', if present, as the filesystem path. * kern/rescue.c (grub_rescue_cmd_ls): Likewise. * conf/powerpc-ieee1275.rmk (grubof_SOURCES): List crt0.S first.
This commit is contained in:
parent
18aa81f206
commit
8a572cd742
4 changed files with 23 additions and 7 deletions
|
@ -1,3 +1,11 @@
|
|||
2004-09-22 Hollis Blanchard <hollis@penguinppc.org>
|
||||
|
||||
* commands/ls.c (grub_ls_list_files): Use the string following the
|
||||
initial ')', if present, as the filesystem path.
|
||||
* kern/rescue.c (grub_rescue_cmd_ls): Likewise.
|
||||
|
||||
* conf/powerpc-ieee1275.rmk (grubof_SOURCES): List crt0.S first.
|
||||
|
||||
2004-09-18 Yoshinori K. Okuji <okuji@enbug.org>
|
||||
|
||||
Make the source code of the menu interface more readable.
|
||||
|
|
|
@ -100,7 +100,7 @@ grub_ls_list_files (const char *dirname, int longlist, int all, int human)
|
|||
{
|
||||
char *device_name;
|
||||
grub_fs_t fs;
|
||||
char *path;
|
||||
const char *path;
|
||||
grub_device_t dev;
|
||||
|
||||
static int print_files (const char *filename, int dir)
|
||||
|
@ -177,8 +177,12 @@ grub_ls_list_files (const char *dirname, int longlist, int all, int human)
|
|||
goto fail;
|
||||
|
||||
fs = grub_fs_probe (dev);
|
||||
path = grub_strchr (dirname, '/');
|
||||
|
||||
path = grub_strchr (dirname, ')');
|
||||
if (! path)
|
||||
path = dirname;
|
||||
else
|
||||
path++;
|
||||
|
||||
if (! path && ! device_name)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid argument");
|
||||
|
|
|
@ -33,8 +33,8 @@ grub_emu_SOURCES = kern/main.c kern/device.c \
|
|||
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c
|
||||
grub_emu_LDFLAGS = -lncurses
|
||||
|
||||
grubof_SOURCES = boot/powerpc/ieee1275/cmain.c boot/powerpc/ieee1275/ieee1275.c \
|
||||
boot/powerpc/ieee1275/crt0.S kern/main.c kern/device.c \
|
||||
grubof_SOURCES = boot/powerpc/ieee1275/crt0.S boot/powerpc/ieee1275/cmain.c \
|
||||
boot/powerpc/ieee1275/ieee1275.c kern/main.c kern/device.c \
|
||||
kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c fs/fshelp.c \
|
||||
kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \
|
||||
kern/powerpc/ieee1275/init.c term/powerpc/ieee1275/ofconsole.c \
|
||||
|
|
|
@ -236,8 +236,12 @@ grub_rescue_cmd_ls (int argc, char *argv[])
|
|||
goto fail;
|
||||
|
||||
fs = grub_fs_probe (dev);
|
||||
path = grub_strchr (argv[0], '/');
|
||||
|
||||
path = grub_strchr (argv[0], ')');
|
||||
if (! path)
|
||||
path = argv[0];
|
||||
else
|
||||
path++;
|
||||
|
||||
if (! path && ! device_name)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid argument");
|
||||
|
|
Loading…
Reference in a new issue