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.

diff --git a/ChangeLog b/ChangeLog
index 76f2d65298965c7b409ee7e5005d4247fbc98379..46a4a160f5785240b0cce9b4f450622f350bdad5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/commands/ls.c b/commands/ls.c
index 04a3f6069c3c771bc3e539c073efa56cdc54ff28..8089c6f30bf96d5d9860af9cee4dfd7db79b145e 100644 (file)
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -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");

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 78795ceba1db7f787a62408e831b69f524dc0f22..4b7d731095668f3d9a9dc4d84b2ec63293201bad 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -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 \

diff --git a/kern/rescue.c b/kern/rescue.c
index 764343550163cb74102818be2cdf903d4b878ae1..f6a7a5515b043f5e80cb0ba93fb89b04639f7925 100644 (file)
--- a/kern/rescue.c
+++ b/kern/rescue.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");