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

grep: Remove separate stdin handling logic

Browse source 
Previously we had two somewhat duplicated methods: one just for handling
stdin with the standard C API, and the other one used for everything
else with our Core::File class. By using always Core::File, the code
should be now a little bit cleaner.

Additionally, grep will now use the standard input when it finds a '-'
argument (previously it tried to open a file with that name.)
This commit is contained in:
Karol Kosek 2023-09-14 17:44:06 +02:00 • committed by Andreas Kling
parent e48b9d74ac
commit 94eb31865a
1 changed files with 17 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Userland/Utilities/grep.cpp
View file

@ -223,8 +223,10 @@ ErrorOr<int> serenity_main(Main::Arguments args)
auto handle_file = [&matches, binary_mode, count_lines, quiet_mode, auto handle_file = [&matches, binary_mode, count_lines, quiet_mode,
user_specified_multiple_files, &matched_line_count, &did_match_something](StringView filename, bool print_filename) -> ErrorOr<void> { user_specified_multiple_files, &matched_line_count, &did_match_something](StringView filename, bool print_filename) -> ErrorOr<void> {
auto file = TRY(Core::File::open(filename, Core::File::OpenMode::Read)); auto file = TRY(Core::File::open_file_or_standard_stream(filename, Core::File::OpenMode::Read));
auto buffered_file = TRY(Core::InputBufferedFile::create(move(file))); auto buffered_file = TRY(Core::InputBufferedFile::create(move(file)));
if (filename == '-')
filename = "stdin"sv;
for (size_t line_number = 1; TRY(buffered_file->can_read_line()); ++line_number) { for (size_t line_number = 1; TRY(buffered_file->can_read_line()); ++line_number) {
Array<u8, PAGE_SIZE> buffer; Array<u8, PAGE_SIZE> buffer;
@ -265,43 +267,17 @@ ErrorOr<int> serenity_main(Main::Arguments args)
} }
}; };
if (!files.size() && !recursive) {
char* line = nullptr;
size_t line_len = 0;
ssize_t nread = 0;
ScopeGuard free_line = [line] { free(line); };
size_t line_number = 0;
while ((nread = getline(&line, &line_len, stdin)) != -1) {
VERIFY(nread > 0);
if (line[nread - 1] == '\n')
--nread;
// Human-readable indexes start at 1, so it's fine to increment already.
line_number += 1;
StringView line_view(line, nread);
bool is_binary = line_view.contains('\0');
if (is_binary && binary_mode == BinaryFileMode::Skip)
return 1;
auto matched = matches(line_view, "stdin"sv, line_number, false, is_binary);
did_match_something = did_match_something || matched;
if (matched && is_binary && binary_mode == BinaryFileMode::Binary)
break;
}
if (count_lines && !quiet_mode)
outln("{}", matched_line_count);
} else {
if (recursive) { if (recursive) {
if (user_has_specified_files) { if (!user_has_specified_files)
files.append("."sv);
for (auto& filename : files) { for (auto& filename : files) {
add_directory(filename, {}, add_directory); add_directory(filename, {}, add_directory);
} }
} else { } else {
add_directory(".", {}, add_directory); if (!user_has_specified_files)
} files.append("-"sv);
} else {
bool print_filename { files.size() > 1 }; bool print_filename { files.size() > 1 };
for (auto& filename : files) { for (auto& filename : files) {
auto result = handle_file(filename, print_filename); auto result = handle_file(filename, print_filename);
@ -312,7 +288,6 @@ ErrorOr<int> serenity_main(Main::Arguments args)
} }
} }
} }
}
return did_match_something ? 0 : 1; return did_match_something ? 0 : 1;
}; };