mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-11-11 09:18:05 +03:00
e4a55404f1
When the root path of a DirIterator ends with '/', we don't need to add another '/' before appending the file name. Fixes an issue where files found by Assistant had 2 leading slashes.
115 lines
2.1 KiB
C++
115 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <AK/Vector.h>
|
|
#include <LibCore/DirIterator.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
|
|
namespace Core {
|
|
|
|
DirIterator::DirIterator(String path, Flags flags)
|
|
: m_path(move(path))
|
|
, m_flags(flags)
|
|
{
|
|
m_dir = opendir(m_path.characters());
|
|
if (!m_dir) {
|
|
m_error = errno;
|
|
}
|
|
}
|
|
|
|
DirIterator::~DirIterator()
|
|
{
|
|
if (m_dir) {
|
|
closedir(m_dir);
|
|
m_dir = nullptr;
|
|
}
|
|
}
|
|
|
|
bool DirIterator::advance_next()
|
|
{
|
|
if (!m_dir)
|
|
return false;
|
|
|
|
while (true) {
|
|
errno = 0;
|
|
auto* de = readdir(m_dir);
|
|
if (!de) {
|
|
m_error = errno;
|
|
m_next = String();
|
|
return false;
|
|
}
|
|
|
|
m_next = de->d_name;
|
|
if (m_next.is_null())
|
|
return false;
|
|
|
|
if (m_flags & Flags::SkipDots && m_next.starts_with('.'))
|
|
continue;
|
|
|
|
if (m_flags & Flags::SkipParentAndBaseDir && (m_next == "." || m_next == ".."))
|
|
continue;
|
|
|
|
return !m_next.is_empty();
|
|
}
|
|
}
|
|
|
|
bool DirIterator::has_next()
|
|
{
|
|
if (!m_next.is_null())
|
|
return true;
|
|
|
|
return advance_next();
|
|
}
|
|
|
|
String DirIterator::next_path()
|
|
{
|
|
if (m_next.is_null())
|
|
advance_next();
|
|
|
|
auto tmp = m_next;
|
|
m_next = String();
|
|
return tmp;
|
|
}
|
|
|
|
String DirIterator::next_full_path()
|
|
{
|
|
StringBuilder builder;
|
|
builder.append(m_path);
|
|
if (!m_path.ends_with('/'))
|
|
builder.append('/');
|
|
builder.append(next_path());
|
|
return builder.to_string();
|
|
}
|
|
|
|
String find_executable_in_path(String filename)
|
|
{
|
|
if (filename.starts_with('/')) {
|
|
if (access(filename.characters(), X_OK) == 0)
|
|
return filename;
|
|
|
|
return {};
|
|
}
|
|
|
|
for (auto directory : String { getenv("PATH") }.split(':')) {
|
|
auto fullpath = String::formatted("{}/{}", directory, filename);
|
|
|
|
if (access(fullpath.characters(), X_OK) == 0)
|
|
return fullpath;
|
|
}
|
|
|
|
return {};
|
|
}
|
|
|
|
int DirIterator::fd() const
|
|
{
|
|
if (!m_dir)
|
|
return -1;
|
|
return dirfd(m_dir);
|
|
}
|
|
|
|
}
|