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

LibCore: Add CDirIterator, and use it in everything rather than readdir

Browse source
This commit is contained in:
Robin Burchell 2019-05-27 09:26:54 +02:00 • committed by Andreas Kling
parent f352a5094d
commit 9d2b08e06e
9 changed files with 152 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/ls.cpp
View file

@ -10,6 +10,7 @@
#include <sys/stat.h>
#include <AK/AKString.h>
#include <AK/Vector.h>
#include <LibCore/CDirIterator.h>
static int do_file_system_object_long(const char* path);
static int do_file_system_object_short(const char* path);
@ -221,9 +222,9 @@ int do_file_system_object_short(const char* path)
int columns;
get_geometry(rows, columns);
DIR* dirp = opendir(path);
if (!dirp) {
if (errno == ENOTDIR) {
CDirIterator di(path, !flag_show_dotfiles ? CDirIterator::SkipDots : CDirIterator::Flags::NoFlags);
if (di.has_error()) {
if (di.error() == ENOTDIR) {
int nprinted;
bool status = print_filesystem_object_short(path, path, &nprinted);
printf("\n");
@ -231,20 +232,18 @@ int do_file_system_object_short(const char* path)
return 0;
return 2;
}
perror("opendir");
fprintf(stderr, "CDirIterator: %s\n", di.error_string());
return 1;
}
Vector<String, 1024> names;
int longest_name = 0;
while (auto* de = readdir(dirp)) {
if (de->d_name[0] == '.' && !flag_show_dotfiles)
continue;
names.append(de->d_name);
while (di.has_next()) {
String name = di.next_path();
names.append(name);
if (names.last().length() > longest_name)
longest_name = names.last().length();
longest_name = name.length();
}
closedir(dirp);
int printed_on_row = 0;
int nprinted;