commands/ls: Send correct dirname to print functions

For each non-directory path argument to the ls command, the full path was
being sent to the print functions, instead of the dirname. The long output
print function expected dirname to be the directory containing the file
and so could not open the file to get the file size because the generated
path was incorrect. This caused the output to be a blank line.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
index 8e98c73ccf7bf57552edfb63e076aee883d8bba9..c746eae0c7e7bbccc975d48b4323e8c65231ae8a 100644 (file)
--- a/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@ -242,8 +242,8 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
          grub_file_close (file);
 
          p = grub_strrchr (dirname, '/') + 1;
-         dirname = grub_strndup (dirname, p - dirname);
-         if (! dirname)
+         ctx.dirname = grub_strndup (dirname, p - dirname);
+         if (ctx.dirname == NULL)
            goto fail;
 
          all = 1;
@@ -253,7 +253,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
          else
            print_files (p, &info, &ctx);
 
-         grub_free (dirname);
+         grub_free (ctx.dirname);
        }
 
       if (grub_errno == GRUB_ERR_NONE)