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

grep: Read patterns from a file with -f

Browse source
This commit is contained in:
Eli Youngs 2023-03-31 12:54:56 -07:00 • committed by Andrew Kaster
parent 57cdb0c972
commit 9bc45c0ae8
1 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/Utilities/grep.cpp
View file

@ -62,6 +62,7 @@ ErrorOr<int> serenity_main(Main::Arguments args)
bool use_ere = (program_name == "egrep"sv); bool use_ere = (program_name == "egrep"sv);
bool fixed_strings = (program_name == "fgrep"sv); bool fixed_strings = (program_name == "fgrep"sv);
Vector<DeprecatedString> patterns; Vector<DeprecatedString> patterns;
StringView pattern_file;
BinaryFileMode binary_mode { BinaryFileMode::Binary }; BinaryFileMode binary_mode { BinaryFileMode::Binary };
bool case_insensitive = false; bool case_insensitive = false;
bool line_numbers = false; bool line_numbers = false;
@ -88,6 +89,17 @@ ErrorOr<int> serenity_main(Main::Arguments args)
return true; return true;
}, },
}); });
args_parser.add_option(Core::ArgsParser::Option {
.argument_mode = Core::ArgsParser::OptionArgumentMode::Required,
.help_string = "Read patterns from a file",
.long_name = "file",
.short_name = 'f',
.value_name = "File",
.accept_value = [&](StringView str) {
pattern_file = str;
return true;
},
});
args_parser.add_option(case_insensitive, "Make matches case-insensitive", nullptr, 'i'); args_parser.add_option(case_insensitive, "Make matches case-insensitive", nullptr, 'i');
args_parser.add_option(line_numbers, "Output line-numbers", "line-numbers", 'n'); args_parser.add_option(line_numbers, "Output line-numbers", "line-numbers", 'n');
args_parser.add_option(invert_match, "Select non-matching lines", "invert-match", 'v'); args_parser.add_option(invert_match, "Select non-matching lines", "invert-match", 'v');
@ -149,6 +161,20 @@ ErrorOr<int> serenity_main(Main::Arguments args)
args_parser.add_positional_argument(files, "File(s) to process", "file", Core::ArgsParser::Required::No); args_parser.add_positional_argument(files, "File(s) to process", "file", Core::ArgsParser::Required::No);
args_parser.parse(args); args_parser.parse(args);
if (!pattern_file.is_empty()) {
auto file = TRY(Core::File::open(pattern_file, Core::File::OpenMode::Read));
auto buffered_file = TRY(Core::BufferedFile::create(move(file)));
Array<u8, PAGE_SIZE> buffer;
while (!buffered_file->is_eof()) {
auto next_pattern = TRY(buffered_file->read_line(buffer));
// Empty lines represent a valid pattern, but the trailing newline
// should be ignored.
if (next_pattern.is_empty() && buffered_file->is_eof())
break;
patterns.append(next_pattern.to_deprecated_string());
}
}
// mock grep behavior: if -e is omitted, use first positional argument as pattern // mock grep behavior: if -e is omitted, use first positional argument as pattern
if (patterns.size() == 0 && files.size()) if (patterns.size() == 0 && files.size())
patterns.append(files.take_first()); patterns.append(files.take_first());