mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-11-22 23:50:19 +00:00
sed: Write substitution output to a file with "/w"
A substitution command like "s/x/y/wabc" will now write all substituted lines to a file called "abc". Note that this is in addition to writing to stdout.
This commit is contained in:
parent
0ecbc5c02a
commit
0dc65cd835
Notes:
sideshowbarker
2024-07-17 09:49:33 +09:00
Author: https://github.com/water-ghosts Commit: https://github.com/SerenityOS/serenity/commit/0dc65cd835 Pull-request: https://github.com/SerenityOS/serenity/pull/16584 Reviewed-by: https://github.com/ADKaster ✅ Reviewed-by: https://github.com/gmta Reviewed-by: https://github.com/kleinesfilmroellchen Reviewed-by: https://github.com/rtobar
1 changed files with 52 additions and 6 deletions
|
@ -4,6 +4,7 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <AK/CharacterTypes.h>
|
||||||
#include <AK/GenericLexer.h>
|
#include <AK/GenericLexer.h>
|
||||||
#include <AK/Vector.h>
|
#include <AK/Vector.h>
|
||||||
#include <LibCore/ArgsParser.h>
|
#include <LibCore/ArgsParser.h>
|
||||||
|
@ -17,8 +18,31 @@ struct SubstitutionCommand {
|
||||||
Regex<PosixExtended> regex;
|
Regex<PosixExtended> regex;
|
||||||
StringView replacement;
|
StringView replacement;
|
||||||
PosixOptions options;
|
PosixOptions options;
|
||||||
|
Optional<StringView> output_filepath;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static Vector<StringView> split_flags(StringView const& input)
|
||||||
|
{
|
||||||
|
Vector<StringView> flags;
|
||||||
|
|
||||||
|
auto lexer = GenericLexer(input);
|
||||||
|
while (!lexer.is_eof()) {
|
||||||
|
StringView flag;
|
||||||
|
|
||||||
|
if (lexer.next_is(is_ascii_digit)) {
|
||||||
|
flag = lexer.consume_while(is_ascii_digit);
|
||||||
|
} else if (lexer.peek() == 'w') {
|
||||||
|
flag = lexer.consume_all();
|
||||||
|
} else {
|
||||||
|
flag = lexer.consume(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
flags.append(flag);
|
||||||
|
}
|
||||||
|
|
||||||
|
return flags;
|
||||||
|
}
|
||||||
|
|
||||||
static ErrorOr<SubstitutionCommand> parse_command(StringView command)
|
static ErrorOr<SubstitutionCommand> parse_command(StringView command)
|
||||||
{
|
{
|
||||||
auto generic_error_message = "Incomplete substitution command"sv;
|
auto generic_error_message = "Incomplete substitution command"sv;
|
||||||
|
@ -53,18 +77,30 @@ static ErrorOr<SubstitutionCommand> parse_command(StringView command)
|
||||||
if (!lexer.consume_specific(delimiter))
|
if (!lexer.consume_specific(delimiter))
|
||||||
return Error::from_string_literal("The substitution command was not properly terminated.");
|
return Error::from_string_literal("The substitution command was not properly terminated.");
|
||||||
|
|
||||||
PosixOptions const options = PosixOptions(PosixFlags::Global | PosixFlags::SingleMatch);
|
PosixOptions options = PosixOptions(PosixFlags::Global | PosixFlags::SingleMatch);
|
||||||
|
Optional<StringView> output_filepath;
|
||||||
|
|
||||||
auto flags = lexer.consume_all();
|
auto flags = split_flags(lexer.consume_all());
|
||||||
if (!flags.is_empty())
|
for (auto const& flag : flags) {
|
||||||
warnln("sed: Flags are currently ignored");
|
if (flag.starts_with('w')) {
|
||||||
|
auto flag_filepath = flag.substring_view(1).trim_whitespace();
|
||||||
|
if (flag_filepath.is_empty())
|
||||||
|
return Error::from_string_literal("No filepath was provided for the 'w' flag.");
|
||||||
|
output_filepath = flag_filepath;
|
||||||
|
} else if (flag == "g"sv) {
|
||||||
|
// Allow multiple matches per line by un-setting the SingleMatch flag
|
||||||
|
options &= ~PosixFlags::SingleMatch;
|
||||||
|
} else {
|
||||||
|
warnln("sed: Unsupported flag: {}", flag);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return SubstitutionCommand { Regex<PosixExtended> { pattern }, replacement, options };
|
return SubstitutionCommand { Regex<PosixExtended> { pattern }, replacement, options, output_filepath };
|
||||||
}
|
}
|
||||||
|
|
||||||
ErrorOr<int> serenity_main(Main::Arguments args)
|
ErrorOr<int> serenity_main(Main::Arguments args)
|
||||||
{
|
{
|
||||||
TRY(Core::System::pledge("stdio rpath"));
|
TRY(Core::System::pledge("stdio cpath rpath wpath"));
|
||||||
|
|
||||||
Core::ArgsParser args_parser;
|
Core::ArgsParser args_parser;
|
||||||
|
|
||||||
|
@ -78,6 +114,10 @@ ErrorOr<int> serenity_main(Main::Arguments args)
|
||||||
|
|
||||||
auto command = TRY(parse_command(command_input));
|
auto command = TRY(parse_command(command_input));
|
||||||
|
|
||||||
|
Optional<NonnullOwnPtr<Core::Stream::File>> maybe_output_file;
|
||||||
|
if (command.output_filepath.has_value())
|
||||||
|
maybe_output_file = TRY(Core::Stream::File::open_file_or_standard_stream(command.output_filepath.release_value(), Core::Stream::OpenMode::Write));
|
||||||
|
|
||||||
if (filepaths.is_empty())
|
if (filepaths.is_empty())
|
||||||
filepaths = { "-"sv };
|
filepaths = { "-"sv };
|
||||||
|
|
||||||
|
@ -96,6 +136,12 @@ ErrorOr<int> serenity_main(Main::Arguments args)
|
||||||
|
|
||||||
auto result = command.regex.replace(line, command.replacement, command.options);
|
auto result = command.regex.replace(line, command.replacement, command.options);
|
||||||
outln(result);
|
outln(result);
|
||||||
|
|
||||||
|
if (maybe_output_file.has_value()) {
|
||||||
|
auto const& output_file = maybe_output_file.value();
|
||||||
|
TRY(output_file->write(result.bytes()));
|
||||||
|
TRY(output_file->write("\n"sv.bytes()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue