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

Shell: Use DirIterator::SkipParentAndBaseDir

Browse source
This commit is contained in:
Shannon Booth 2020-05-16 18:54:38 +12:00 • committed by Andreas Kling
parent e5ad6a491e
commit 154a6e69a4
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Shell/main.cpp
View file

@ -1369,13 +1369,10 @@ int main(int argc, char** argv)
// only suggest dot-files if path starts with a dot // only suggest dot-files if path starts with a dot
Core::DirIterator files(path, Core::DirIterator files(path,
token.starts_with('.') ? Core::DirIterator::NoFlags : Core::DirIterator::SkipDots); token.starts_with('.') ? Core::DirIterator::SkipParentAndBaseDir : Core::DirIterator::SkipDots);
while (files.has_next()) { while (files.has_next()) {
auto file = files.next_path(); auto file = files.next_path();
// manually skip `.' and `..'
if (file == "." || file == "..")
continue;
auto trivia = " "; auto trivia = " ";
if (file.starts_with(token)) { if (file.starts_with(token)) {
String file_path = String::format("%s/%s", path.characters(), file.characters()); String file_path = String::format("%s/%s", path.characters(), file.characters());
@ -1450,13 +1447,10 @@ int main(int argc, char** argv)
// only suggest dot-files if path starts with a dot // only suggest dot-files if path starts with a dot
Core::DirIterator files(path, Core::DirIterator files(path,
token.starts_with('.') ? Core::DirIterator::NoFlags : Core::DirIterator::SkipDots); token.starts_with('.') ? Core::DirIterator::SkipParentAndBaseDir : Core::DirIterator::SkipDots);
while (files.has_next()) { while (files.has_next()) {
auto file = files.next_path(); auto file = files.next_path();
// manually skip `.' and `..'
if (file == "." || file == "..")
continue;
if (file.starts_with(token)) { if (file.starts_with(token)) {
struct stat program_status; struct stat program_status;
String file_path = String::format("%s/%s", path.characters(), file.characters()); String file_path = String::format("%s/%s", path.characters(), file.characters());