system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-07 00:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shell: Use AllocatingMemoryStream to search for the IFS

Browse source
This commit is contained in:
Tim Schumacher 2023-01-13 13:41:48 +01:00 committed by Ali Mohammad Pur
parent 156b6e83cd
commit 2150e1b3a5
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Userland/Shell/AST.cpp
View file

@ -7,13 +7,13 @@
#include "AST.h"
#include "Shell.h"
#include <AK/DeprecatedString.h>
#include <AK/MemoryStream.h>
#include <AK/ScopeGuard.h>
#include <AK/ScopedValueRollback.h>
#include <AK/StringBuilder.h>
#include <AK/URL.h>
#include <LibCore/EventLoop.h>
#include <LibCore/File.h>
#include <LibCore/MemoryStream.h>
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
@ -1641,7 +1641,7 @@ void Execute::for_each_entry(RefPtr<Shell> shell, Function<IterationDecision(Non
Core::EventLoop loop;
auto notifier = Core::Notifier::construct(pipefd[0], Core::Notifier::Read);
DuplexMemoryStream stream;
Core::Stream::AllocatingMemoryStream stream;
enum {
Continue,
@ -1651,11 +1651,10 @@ void Execute::for_each_entry(RefPtr<Shell> shell, Function<IterationDecision(Non
auto check_and_call = [&] {
auto ifs = shell->local_variable_or("IFS"sv, "\n"sv);
if (auto offset = stream.offset_of(ifs.bytes()); offset.has_value()) {
if (auto offset = stream.offset_of(ifs.bytes()).release_value_but_fixme_should_propagate_errors(); offset.has_value()) {
auto line_end = offset.value();
if (line_end == 0) {
auto rc = stream.discard_or_error(ifs.length());
VERIFY(rc);
stream.discard(ifs.length()).release_value_but_fixme_should_propagate_errors();
if (shell->options.inline_exec_keep_empty_segments)
if (callback(make_ref_counted<StringValue>("")) == IterationDecision::Break) {
@ -1671,8 +1670,7 @@ void Execute::for_each_entry(RefPtr<Shell> shell, Function<IterationDecision(Non
return Break;
}
auto entry = entry_result.release_value();
auto rc = stream.read_or_error(entry);
VERIFY(rc);
stream.read_entire_buffer(entry).release_value_but_fixme_should_propagate_errors();
auto str = StringView(entry.data(), entry.size() - ifs.length());
if (callback(make_ref_counted<StringValue>(str)) == IterationDecision::Break) {
@ -1723,7 +1721,7 @@ void Execute::for_each_entry(RefPtr<Shell> shell, Function<IterationDecision(Non
break;
should_enable_notifier = true;
stream.write({ buffer, (size_t)read_size });
stream.write_entire_buffer({ buffer, (size_t)read_size }).release_value_but_fixme_should_propagate_errors();
}
loop.quit(NothingLeft);
@ -1747,7 +1745,7 @@ void Execute::for_each_entry(RefPtr<Shell> shell, Function<IterationDecision(Non
dbgln("close() failed: {}", strerror(errno));
}
if (exit_reason != Break && !stream.eof()) {
if (exit_reason != Break && !stream.is_eof()) {
auto action = Continue;
do {
action = check_and_call();
@ -1755,15 +1753,14 @@ void Execute::for_each_entry(RefPtr<Shell> shell, Function<IterationDecision(Non
return;
} while (action == Continue);
if (!stream.eof()) {
auto entry_result = ByteBuffer::create_uninitialized(stream.size());
if (!stream.is_eof()) {
auto entry_result = ByteBuffer::create_uninitialized(stream.used_buffer_size());
if (entry_result.is_error()) {
shell->raise_error(Shell::ShellError::OutOfMemory, {}, position());
return;
}
auto entry = entry_result.release_value();
auto rc = stream.read_or_error(entry);
VERIFY(rc);
stream.read_entire_buffer(entry).release_value_but_fixme_should_propagate_errors();
callback(make_ref_counted<StringValue>(DeprecatedString::copy(entry)));
}
}