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
|
@ -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");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue