tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commands/ls: Send correct dirname to print functions

Browse Source 
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>
This commit is contained in:
Glenn Washburn 2023-08-14 01:16:53 -05:00 committed by Daniel Kiper
parent fcbea18c58
commit 6889c67fe7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grub-core/commands/ls.c
View File

@ -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)