From fe8cefa7c1b056bb4097c4dce27a0304295d8429 Mon Sep 17 00:00:00 2001 From: setepenre Date: Sun, 11 Apr 2021 16:48:50 +0200 Subject: [PATCH] ls: ls will print directory name when listing multiple directories --- Userland/Utilities/ls.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Userland/Utilities/ls.cpp b/Userland/Utilities/ls.cpp index 7dffbe405d..5f30c71db2 100644 --- a/Userland/Utilities/ls.cpp +++ b/Userland/Utilities/ls.cpp @@ -145,8 +145,22 @@ int main(int argc, char** argv) } else if (paths.size() == 1) { status = do_file_system_object(paths[0]); } else { + Vector exists; for (auto& path : paths) { + if (Core::File::exists(path)) { + exists.append(path); + } else { + status = do_file_system_object(path); + } + } + for (size_t i = 0; i < exists.size(); ++i) { + auto path = exists.at(i); + printf("%s:\n", path); status = do_file_system_object(path); + + if (i + 1 == exists.size() - 1) { + printf("\n"); + } } } return status;