Specifically, return GRUB_ERR_BAD_FILE_TYPE because this is what is
expected by the ls command when it is given a path to a non-directory.
This fixes a bug where calling ls with a list of non-directory paths
outputs a blank line for each such argument.
Signed-off-by: Glenn Washburn <developm...@efficientek.com>
---
grub-core/fs/archelp.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/grub-core/fs/archelp.c b/grub-core/fs/archelp.c
index 998de88b865c..c1dcc62858a9 100644
--- a/grub-core/fs/archelp.c
+++ b/grub-core/fs/archelp.c
@@ -180,6 +180,14 @@ grub_archelp_dir (struct grub_archelp_data *data,
if (p)
*p = 0;
+ if ((*n == 0) && ((mode & GRUB_ARCHELP_ATTR_TYPE)
+ != GRUB_ARCHELP_ATTR_DIR))
+ {
+ grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory"));
+ grub_free (name);
+ goto fail;
+ }
+
if (((!prev) || (grub_strcmp (prev, name) != 0)) && *n != 0)
{
struct grub_dirhook_info info;
--
2.34.1
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
