mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 05:37:34 +00:00
LibCore: Add CDirIterator, and use it in everything rather than readdir
This commit is contained in:
parent
f352a5094d
commit
9d2b08e06e
9 changed files with 152 additions and 55 deletions
68
LibCore/CDirIterator.cpp
Normal file
68
LibCore/CDirIterator.cpp
Normal file
|
@ -0,0 +1,68 @@
|
|||
#include "CDirIterator.h"
|
||||
#include <cerrno>
|
||||
|
||||
CDirIterator::CDirIterator(const String& path, Flags flags)
|
||||
: m_flags(flags)
|
||||
{
|
||||
m_dir = opendir(path.characters());
|
||||
if (m_dir == nullptr) {
|
||||
m_error = errno;
|
||||
}
|
||||
}
|
||||
|
||||
CDirIterator::~CDirIterator()
|
||||
{
|
||||
if (m_dir != nullptr) {
|
||||
closedir(m_dir);
|
||||
m_dir = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
bool CDirIterator::advance_next()
|
||||
{
|
||||
if (m_dir == nullptr)
|
||||
return false;
|
||||
|
||||
bool keep_advancing = true;
|
||||
while (keep_advancing) {
|
||||
errno = 0;
|
||||
auto* de = readdir(m_dir);
|
||||
if (de) {
|
||||
m_next = de->d_name;
|
||||
} else {
|
||||
m_error = errno;
|
||||
m_next = String();
|
||||
}
|
||||
|
||||
if (m_next.is_null()) {
|
||||
keep_advancing = false;
|
||||
} else if (m_flags & Flags::SkipDots) {
|
||||
if (m_next.length() < 1 || m_next[0] != '.') {
|
||||
keep_advancing = false;
|
||||
}
|
||||
} else {
|
||||
keep_advancing = false;
|
||||
}
|
||||
}
|
||||
|
||||
return m_next.length() > 0;
|
||||
}
|
||||
|
||||
bool CDirIterator::has_next()
|
||||
{
|
||||
if (!m_next.is_null())
|
||||
return true;
|
||||
|
||||
return advance_next();
|
||||
}
|
||||
|
||||
String CDirIterator::next_path()
|
||||
{
|
||||
if (m_next.is_null())
|
||||
advance_next();
|
||||
|
||||
auto tmp = m_next;
|
||||
m_next = String();
|
||||
return tmp;
|
||||
}
|
||||
|
30
LibCore/CDirIterator.h
Normal file
30
LibCore/CDirIterator.h
Normal file
|
@ -0,0 +1,30 @@
|
|||
#pragma once
|
||||
|
||||
#include <dirent.h>
|
||||
#include <AK/AKString.h>
|
||||
|
||||
class CDirIterator {
|
||||
public:
|
||||
enum Flags {
|
||||
NoFlags = 0x0,
|
||||
SkipDots = 0x1,
|
||||
};
|
||||
|
||||
CDirIterator(const String& path, Flags = Flags::NoFlags);
|
||||
~CDirIterator();
|
||||
|
||||
bool has_error() const { return m_error != 0; }
|
||||
int error() const { return m_error; }
|
||||
const char* error_string() const { return strerror(m_error); }
|
||||
bool has_next();
|
||||
String next_path();
|
||||
|
||||
private:
|
||||
DIR* m_dir = nullptr;
|
||||
int m_error = 0;
|
||||
String m_next;
|
||||
int m_flags;
|
||||
|
||||
bool advance_next();
|
||||
};
|
||||
|
|
@ -18,7 +18,8 @@ OBJS = \
|
|||
CEventLoop.o \
|
||||
CConfigFile.o \
|
||||
CEvent.o \
|
||||
CProcessStatisticsReader.o
|
||||
CProcessStatisticsReader.o \
|
||||
CDirIterator.o
|
||||
|
||||
LIBRARY = libcore.a
|
||||
DEFINES += -DUSERLAND
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue