RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:37:35 +00:00
Code Issues Activity Actions

ls: ls will print directory name when listing multiple directories

Browse source
This commit is contained in:
setepenre 2021-04-11 16:48:50 +02:00 • committed by Andreas Kling
parent 433a23cfde
commit fe8cefa7c1
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Utilities/ls.cpp
View file

@ -145,8 +145,22 @@ int main(int argc, char** argv)
} else if (paths.size() == 1) { } else if (paths.size() == 1) {
status = do_file_system_object(paths[0]); status = do_file_system_object(paths[0]);
} else { } else {
Vector<const char*> exists;
for (auto& path : paths) { 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); status = do_file_system_object(path);
if (i + 1 == exists.size() - 1) {
printf("\n");
}
} }
} }
return status; return status;