xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename stdin/stdout/stderr in Shell a they conflicts with macros

Browse Source 
Fixes #5023
This commit is contained in:
Maxime Coste 2023-11-13 20:19:55 +11:00
parent fc7be678ed
commit c7d887d9d1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/shell_manager.cc
View File

@ -100,9 +100,9 @@ struct UniqueFd
struct Shell struct Shell
{ {
pid_t pid; pid_t pid;
UniqueFd stdin; UniqueFd in;
UniqueFd stdout; UniqueFd out;
UniqueFd stderr; UniqueFd err;
}; };
Shell spawn_shell(const char* shell, StringView cmdline, Shell spawn_shell(const char* shell, StringView cmdline,
@ -309,9 +309,9 @@ std::pair<String, int> ShellManager::eval(
auto wait_time = Clock::now(); auto wait_time = Clock::now();
String stdout_contents, stderr_contents; String stdout_contents, stderr_contents;
auto stdout_reader = make_reader(shell.stdout.fd, stdout_contents, [&](bool){ shell.stdout.close(); }); auto stdout_reader = make_reader(shell.out.fd, stdout_contents, [&](bool){ shell.out.close(); });
auto stderr_reader = make_reader(shell.stderr.fd, stderr_contents, [&](bool){ shell.stderr.close(); }); auto stderr_reader = make_reader(shell.err.fd, stderr_contents, [&](bool){ shell.err.close(); });
auto stdin_writer = make_pipe_writer(shell.stdin, input); auto stdin_writer = make_pipe_writer(shell.in, input);
// block SIGCHLD to make sure we wont receive it before // block SIGCHLD to make sure we wont receive it before
// our call to pselect, that will end up blocking indefinitly. // our call to pselect, that will end up blocking indefinitly.
@ -347,8 +347,8 @@ std::pair<String, int> ShellManager::eval(
}, EventMode::Urgent}; }, EventMode::Urgent};
bool cancelling = false; bool cancelling = false;
while (not terminated or shell.stdin or while (not terminated or shell.in or
((flags & Flags::WaitForStdout) and (shell.stdout or shell.stderr))) ((flags & Flags::WaitForStdout) and (shell.out or shell.err)))
{ {
try try
{ {