h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-24 14:01:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Make do_builtin_io multi-fork safe, moved it to postfork.cpp

Browse Source 
Addresses https://github.com/fish-shell/fish-shell/issues/495
This commit is contained in:
ridiculousfish
2013-01-11 15:09:33 -08:00
parent b66233de78
commit 9d6c4fa678
6 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
exec.cpp
View File

@@ -497,32 +497,6 @@ static void internal_exec_helper(parser_t &parser,
is_block=is_block_old;
}
/** Perform output from builtins. Called from a forked child, so don't do anything that may allocate memory, etc.. */
static void do_builtin_io(const char *out, size_t outlen, const char *err, size_t errlen)
{
if (out && outlen)
{
if (write_loop(STDOUT_FILENO, out, outlen) == -1)
{
debug(0, L"Error while writing to stdout");
wperror(L"write_loop");
show_stackframe();
}
}
if (err && errlen)
{
if (write_loop(STDERR_FILENO, err, errlen) == -1)
{
/*
Can't really show any error message here, since stderr is
dead.
*/
}
}
}
/* Returns whether we can use posix spawn for a given process in a given job.
Per https://github.com/fish-shell/fish-shell/issues/364 , error handling for file redirections is too difficult with posix_spawn
So in that case we use fork/exec
@@ -1177,7 +1151,11 @@ void exec(parser_t &parser, job_t *j)
const wcstring &out = get_stdout_buffer(), &err = get_stderr_buffer();
const std::string outbuff = wcs2string(out);
const std::string errbuff = wcs2string(err);
do_builtin_io(outbuff.data(), outbuff.size(), errbuff.data(), errbuff.size());
bool builtin_io_done = do_builtin_io(outbuff.data(), outbuff.size(), errbuff.data(), errbuff.size());
if (! builtin_io_done)
{
show_stackframe();
}
skip_fork = true;
}
@@ -1239,7 +1217,6 @@ void exec(parser_t &parser, job_t *j)
setup_child_process(j, p);
do_builtin_io(outbuff, outbuff_len, errbuff, errbuff_len);
exit_without_destructors(p->status);
}
else
{