2016-04-29 10:41:54 +08:00
|
|
|
// Functions for executing a program.
|
|
|
|
//
|
|
|
|
// Some of the code in this file is based on code from the Glibc manual, though the changes
|
|
|
|
// performed have been massive.
|
2016-04-21 14:00:54 +08:00
|
|
|
#include "config.h"
|
2006-08-11 09:18:35 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
#include <errno.h>
|
|
|
|
#include <fcntl.h>
|
2017-02-11 10:47:02 +08:00
|
|
|
#ifdef HAVE_SIGINFO_H
|
|
|
|
#include <siginfo.h>
|
|
|
|
#endif
|
2016-04-29 10:41:54 +08:00
|
|
|
#include <signal.h>
|
2017-02-11 10:47:02 +08:00
|
|
|
#ifdef HAVE_SPAWN_H
|
|
|
|
#include <spawn.h>
|
|
|
|
#endif
|
2005-09-20 21:26:39 +08:00
|
|
|
#include <stdio.h>
|
2016-04-29 10:41:54 +08:00
|
|
|
#include <string.h>
|
Fixed race condition in new job control synchronization
We were having child processes SIGSTOP themselves immediately after
setting their process group and before launching their intended targets,
but they were not necessarily stopped by the time the next command was
being executed (so the opposite of the original race condition where
they might have finished executing by the time the next command came
around), and as a result when we sent them SIGCONT, that could never
reach. Now using waitpid to synchronize the SIGSTOP/SIGCONT between the
two.
If we had a good, unnamed inter-process event/semaphore, we could use
that to have a child process conditionally stop itself if the next
command in the job chain hadn't yet been started / setup, but this is
probably a lot more straightforward and less-confusing, which isn't a
bad thing.
Additionally, there was a bug caused by the fact that the main exec_job
loop actually blocks to read from previous commands in the job if the
current command is a built-in that doesn't need to fork.
With this waitpid code, I was able to finally add the SIGSTOP code to
all the fork'd processes in the main exec_job loop without introducing
deadlocks; it turns out that they should be treated just like the main
EXTERNAL fork, but they tend to execute faster causing the same deadlock
described above to occur more readily.
The only thing I'm not sure about is whether we should execute
unblock_pid undconditionally for all !EXTERNAL commands. It makes more
sense to *only* do that if a blocking read were about to be done in the
main loop, otherwise the original race condition could still appear
(though it is probably mitigated by whatever duration the SIGSTOP lasted
for, even if it is SIGCONT'd before the next command tries to join the
process group).
2017-07-27 03:19:00 +08:00
|
|
|
#include <sys/wait.h>
|
2005-09-20 21:26:39 +08:00
|
|
|
#include <unistd.h>
|
2018-10-09 01:44:47 +08:00
|
|
|
#include <stack>
|
2017-02-11 10:47:02 +08:00
|
|
|
|
2012-02-10 23:55:06 +08:00
|
|
|
#include <algorithm>
|
2017-08-07 06:47:01 +08:00
|
|
|
#include <functional>
|
2015-07-25 23:14:25 +08:00
|
|
|
#include <map>
|
2016-04-21 14:00:54 +08:00
|
|
|
#include <memory>
|
2016-04-29 10:41:54 +08:00
|
|
|
#include <string>
|
2017-02-11 10:47:02 +08:00
|
|
|
#include <type_traits>
|
|
|
|
#include <vector>
|
2006-07-31 04:26:59 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
#include "builtin.h"
|
2005-09-20 21:26:39 +08:00
|
|
|
#include "common.h"
|
2016-04-29 10:41:54 +08:00
|
|
|
#include "env.h"
|
2005-09-20 21:26:39 +08:00
|
|
|
#include "exec.h"
|
2016-04-29 10:41:54 +08:00
|
|
|
#include "fallback.h" // IWYU pragma: keep
|
2005-09-20 21:26:39 +08:00
|
|
|
#include "function.h"
|
2015-07-25 23:14:25 +08:00
|
|
|
#include "io.h"
|
|
|
|
#include "parse_tree.h"
|
2016-04-29 10:41:54 +08:00
|
|
|
#include "parser.h"
|
|
|
|
#include "postfork.h"
|
|
|
|
#include "proc.h"
|
2015-12-15 09:21:43 +08:00
|
|
|
#include "reader.h"
|
2017-08-07 06:47:01 +08:00
|
|
|
#include "signal.h"
|
2016-04-29 10:41:54 +08:00
|
|
|
#include "wutil.h" // IWYU pragma: keep
|
2005-09-20 21:26:39 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// File descriptor redirection error message.
|
|
|
|
#define FD_ERROR _(L"An error occurred while redirecting file descriptor %d")
|
2007-10-27 02:42:32 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// File descriptor redirection error message.
|
|
|
|
#define WRITE_ERROR _(L"An error occurred while writing output")
|
2009-02-23 04:28:52 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// File redirection error message.
|
|
|
|
#define FILE_ERROR _(L"An error occurred while redirecting file '%s'")
|
2007-10-27 02:42:32 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// Base open mode to pass to calls to open.
|
2006-11-15 21:30:46 +08:00
|
|
|
#define OPEN_MASK 0666
|
2005-10-17 21:24:12 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// Called in a forked child.
|
|
|
|
static void exec_write_and_exit(int fd, const char *buff, size_t count, int status) {
|
|
|
|
if (write_loop(fd, buff, count) == -1) {
|
2012-11-19 08:30:30 +08:00
|
|
|
debug(0, WRITE_ERROR);
|
|
|
|
wperror(L"write");
|
|
|
|
exit_without_destructors(status);
|
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
exit_without_destructors(status);
|
2009-02-23 04:28:52 +08:00
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
void exec_close(int fd) {
|
2012-08-05 06:11:43 +08:00
|
|
|
ASSERT_IS_MAIN_THREAD();
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// This may be called in a child of fork(), so don't allocate memory.
|
|
|
|
if (fd < 0) {
|
2012-11-19 08:30:30 +08:00
|
|
|
debug(0, L"Called close on invalid file descriptor ");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
while (close(fd) == -1) {
|
2018-09-06 12:48:32 +08:00
|
|
|
debug(1, FD_ERROR, fd);
|
|
|
|
wperror(L"close");
|
|
|
|
break;
|
2012-11-18 18:23:22 +08:00
|
|
|
}
|
2005-10-03 21:09:37 +08:00
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
int exec_pipe(int fd[2]) {
|
2013-01-30 18:22:38 +08:00
|
|
|
ASSERT_IS_MAIN_THREAD();
|
2013-02-01 07:57:08 +08:00
|
|
|
|
2012-11-19 08:30:30 +08:00
|
|
|
int res;
|
2016-04-29 10:41:54 +08:00
|
|
|
while ((res = pipe(fd))) {
|
|
|
|
if (errno != EINTR) {
|
|
|
|
return res; // caller will call wperror
|
2012-11-19 08:30:30 +08:00
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
}
|
|
|
|
|
2012-11-19 08:30:30 +08:00
|
|
|
debug(4, L"Created pipe using fds %d and %d", fd[0], fd[1]);
|
2016-04-29 10:41:54 +08:00
|
|
|
|
|
|
|
// Pipes ought to be cloexec. Pipes are dup2'd the corresponding fds; the resulting fds are not
|
|
|
|
// cloexec.
|
2015-01-08 10:07:06 +08:00
|
|
|
set_cloexec(fd[0]);
|
|
|
|
set_cloexec(fd[1]);
|
2012-11-19 08:30:30 +08:00
|
|
|
return res;
|
2005-10-03 21:09:37 +08:00
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// Returns true if the redirection is a file redirection to a file other than /dev/null.
|
|
|
|
static bool redirection_is_to_real_file(const io_data_t *io) {
|
2013-06-17 14:26:43 +08:00
|
|
|
bool result = false;
|
2016-04-29 10:41:54 +08:00
|
|
|
if (io != NULL && io->io_mode == IO_FILE) {
|
|
|
|
// It's a file redirection. Compare the path to /dev/null.
|
2016-07-31 03:01:37 +08:00
|
|
|
const io_file_t *io_file = static_cast<const io_file_t *>(io);
|
2013-06-17 14:26:43 +08:00
|
|
|
const char *path = io_file->filename_cstr;
|
2016-04-29 10:41:54 +08:00
|
|
|
if (strcmp(path, "/dev/null") != 0) {
|
|
|
|
// It's not /dev/null.
|
2013-06-17 14:26:43 +08:00
|
|
|
result = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
static bool chain_contains_redirection_to_real_file(const io_chain_t &io_chain) {
|
Big fat refactoring of how redirections work. In fish 1.x and 2.0.0, the redirections for a process were flattened into a big list associated with the job, so there was no way to tell which redirections applied to each process. Each process therefore got all the redirections associated with the job. See https://github.com/fish-shell/fish-shell/issues/877 for how this could manifest.
With this change, jobs only track their block-level redirections. Process level redirections are correctly associated with the process, and at exec time we stitch them together (block, pipe, and process redirects).
This fixes the weird issues where redirects bleed across pipelines (like #877), and also allows us to play with the order in which redirections are applied, since the final list is constructed right before it's needed. This lets us put pipes after block level redirections but before process level redirections, so that a 2>&1-type redirection gets picked up after the pipe, i.e. it should fix https://github.com/fish-shell/fish-shell/issues/110
This is a significant change. The tests all pass. Cross your fingers.
2013-08-20 07:16:41 +08:00
|
|
|
bool result = false;
|
2016-04-29 10:41:54 +08:00
|
|
|
for (size_t idx = 0; idx < io_chain.size(); idx++) {
|
2016-02-03 07:39:35 +08:00
|
|
|
const io_data_t *io = io_chain.at(idx).get();
|
2016-04-29 10:41:54 +08:00
|
|
|
if (redirection_is_to_real_file(io)) {
|
Big fat refactoring of how redirections work. In fish 1.x and 2.0.0, the redirections for a process were flattened into a big list associated with the job, so there was no way to tell which redirections applied to each process. Each process therefore got all the redirections associated with the job. See https://github.com/fish-shell/fish-shell/issues/877 for how this could manifest.
With this change, jobs only track their block-level redirections. Process level redirections are correctly associated with the process, and at exec time we stitch them together (block, pipe, and process redirects).
This fixes the weird issues where redirects bleed across pipelines (like #877), and also allows us to play with the order in which redirections are applied, since the final list is constructed right before it's needed. This lets us put pipes after block level redirections but before process level redirections, so that a 2>&1-type redirection gets picked up after the pipe, i.e. it should fix https://github.com/fish-shell/fish-shell/issues/110
This is a significant change. The tests all pass. Cross your fingers.
2013-08-20 07:16:41 +08:00
|
|
|
result = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// Returns the interpreter for the specified script. Returns NULL if file is not a script with a
|
|
|
|
/// shebang.
|
|
|
|
char *get_interpreter(const char *command, char *interpreter, size_t buff_size) {
|
|
|
|
// OK to not use CLO_EXEC here because this is only called after fork.
|
2012-11-19 08:30:30 +08:00
|
|
|
int fd = open(command, O_RDONLY);
|
2016-04-29 10:41:54 +08:00
|
|
|
if (fd >= 0) {
|
2012-11-19 08:30:30 +08:00
|
|
|
size_t idx = 0;
|
2016-04-29 10:41:54 +08:00
|
|
|
while (idx + 1 < buff_size) {
|
2012-03-01 03:27:14 +08:00
|
|
|
char ch;
|
|
|
|
ssize_t amt = read(fd, &ch, sizeof ch);
|
2016-04-29 10:41:54 +08:00
|
|
|
if (amt <= 0) break;
|
|
|
|
if (ch == '\n') break;
|
2012-03-01 03:27:14 +08:00
|
|
|
interpreter[idx++] = ch;
|
2012-11-19 08:30:30 +08:00
|
|
|
}
|
2012-03-01 03:27:14 +08:00
|
|
|
interpreter[idx++] = '\0';
|
|
|
|
close(fd);
|
2012-11-19 08:30:30 +08:00
|
|
|
}
|
2016-05-05 06:19:47 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
if (strncmp(interpreter, "#! /", 4) == 0) {
|
2012-03-01 03:27:14 +08:00
|
|
|
return interpreter + 3;
|
2016-04-29 10:41:54 +08:00
|
|
|
} else if (strncmp(interpreter, "#!/", 3) == 0) {
|
2012-03-01 03:27:14 +08:00
|
|
|
return interpreter + 2;
|
2012-02-23 04:00:02 +08:00
|
|
|
}
|
2016-05-05 06:19:47 +08:00
|
|
|
|
|
|
|
return NULL;
|
2008-01-16 09:04:54 +08:00
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// This function is executed by the child process created by a call to fork(). It should be called
|
|
|
|
/// after \c setup_child_process. It calls execve to replace the fish process image with the command
|
|
|
|
/// specified in \c p. It never returns. Called in a forked child! Do not allocate memory, etc.
|
|
|
|
static void safe_launch_process(process_t *p, const char *actual_cmd, const char *const *cargv,
|
|
|
|
const char *const *cenvv) {
|
2016-10-10 05:38:26 +08:00
|
|
|
UNUSED(p);
|
2012-11-19 08:30:30 +08:00
|
|
|
int err;
|
2016-04-29 10:41:54 +08:00
|
|
|
// debug( 1, L"exec '%ls'", p->argv[0] );
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// This function never returns, so we take certain liberties with constness.
|
|
|
|
char *const *envv = const_cast<char *const *>(cenvv);
|
|
|
|
char *const *argv = const_cast<char *const *>(cargv);
|
2013-02-23 08:22:56 +08:00
|
|
|
|
2012-11-19 08:30:30 +08:00
|
|
|
execve(actual_cmd, argv, envv);
|
|
|
|
err = errno;
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// Something went wrong with execve, check for a ":", and run /bin/sh if encountered. This is a
|
|
|
|
// weird predecessor to the shebang that is still sometimes used since it is supported on
|
|
|
|
// Windows. OK to not use CLO_EXEC here because this is called after fork and the file is
|
|
|
|
// immediately closed.
|
2012-11-19 08:30:30 +08:00
|
|
|
int fd = open(actual_cmd, O_RDONLY);
|
2016-04-29 10:41:54 +08:00
|
|
|
if (fd >= 0) {
|
2012-11-19 08:30:30 +08:00
|
|
|
char begin[1] = {0};
|
|
|
|
ssize_t amt_read = read(fd, begin, 1);
|
|
|
|
close(fd);
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
if ((amt_read == 1) && (begin[0] == ':')) {
|
|
|
|
// Relaunch it with /bin/sh. Don't allocate memory, so if you have more args than this,
|
|
|
|
// update your silly script! Maybe this should be changed to be based on ARG_MAX
|
|
|
|
// somehow.
|
2012-03-01 03:27:14 +08:00
|
|
|
char sh_command[] = "/bin/sh";
|
|
|
|
char *argv2[128];
|
|
|
|
argv2[0] = sh_command;
|
2016-04-29 10:41:54 +08:00
|
|
|
for (size_t i = 1; i < sizeof argv2 / sizeof *argv2; i++) {
|
|
|
|
argv2[i] = argv[i - 1];
|
|
|
|
if (argv2[i] == NULL) break;
|
2012-03-01 03:27:14 +08:00
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2012-11-19 08:30:30 +08:00
|
|
|
execve(sh_command, argv2, envv);
|
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
}
|
|
|
|
|
2012-11-19 08:30:30 +08:00
|
|
|
errno = err;
|
2012-08-15 15:57:56 +08:00
|
|
|
safe_report_exec_error(errno, actual_cmd, argv, envv);
|
2012-11-19 08:30:30 +08:00
|
|
|
exit_without_destructors(STATUS_EXEC_FAIL);
|
2012-03-01 03:27:14 +08:00
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// This function is similar to launch_process, except it is not called after a fork (i.e. it only
|
|
|
|
/// calls exec) and therefore it can allocate memory.
|
|
|
|
static void launch_process_nofork(process_t *p) {
|
2012-03-01 03:27:14 +08:00
|
|
|
ASSERT_IS_MAIN_THREAD();
|
|
|
|
ASSERT_IS_NOT_FORKED_CHILD();
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2014-10-31 09:10:06 +08:00
|
|
|
null_terminated_array_t<char> argv_array;
|
|
|
|
convert_wide_array_to_narrow(p->get_argv_array(), &argv_array);
|
|
|
|
|
2017-01-27 04:03:14 +08:00
|
|
|
const char *const *envv = env_export_arr();
|
2017-08-06 06:08:39 +08:00
|
|
|
char *actual_cmd = wcs2str(p->actual_cmd);
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// Ensure the terminal modes are what they were before we changed them.
|
2015-12-15 09:21:43 +08:00
|
|
|
restore_term_mode();
|
2016-04-29 10:41:54 +08:00
|
|
|
// Bounce to launch_process. This never returns.
|
2014-10-31 09:10:06 +08:00
|
|
|
safe_launch_process(p, actual_cmd, argv_array.get(), envv);
|
2005-09-20 21:26:39 +08:00
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// Check if the IO redirection chains contains redirections for the specified file descriptor.
|
|
|
|
static int has_fd(const io_chain_t &d, int fd) { return io_chain_get(d, fd).get() != NULL; }
|
2005-09-20 21:26:39 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// Close a list of fds.
|
|
|
|
static void io_cleanup_fds(const std::vector<int> &opened_fds) {
|
2013-01-20 02:59:43 +08:00
|
|
|
std::for_each(opened_fds.begin(), opened_fds.end(), close);
|
2012-08-23 04:41:21 +08:00
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// Make a copy of the specified io redirection chain, but change file redirection into fd
|
|
|
|
/// redirection. This makes the redirection chain suitable for use as block-level io, since the file
|
|
|
|
/// won't be repeatedly reopened for every command in the block, which would reset the cursor
|
|
|
|
/// position.
|
|
|
|
///
|
|
|
|
/// \return true on success, false on failure. Returns the output chain and opened_fds by reference.
|
|
|
|
static bool io_transmogrify(const io_chain_t &in_chain, io_chain_t *out_chain,
|
|
|
|
std::vector<int> *out_opened_fds) {
|
2012-08-23 04:41:21 +08:00
|
|
|
ASSERT_IS_MAIN_THREAD();
|
2013-12-27 17:38:43 +08:00
|
|
|
assert(out_chain != NULL && out_opened_fds != NULL);
|
|
|
|
assert(out_chain->empty());
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// Just to be clear what we do for an empty chain.
|
|
|
|
if (in_chain.empty()) {
|
2012-08-23 04:41:21 +08:00
|
|
|
return true;
|
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2012-08-23 04:41:21 +08:00
|
|
|
bool success = true;
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// Make our chain of redirections.
|
2012-08-23 04:41:21 +08:00
|
|
|
io_chain_t result_chain;
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// In the event we can't finish transmorgrifying, we'll have to close all the files we opened.
|
2012-08-23 04:41:21 +08:00
|
|
|
std::vector<int> opened_fds;
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
for (size_t idx = 0; idx < in_chain.size(); idx++) {
|
2013-01-07 23:04:55 +08:00
|
|
|
const shared_ptr<io_data_t> &in = in_chain.at(idx);
|
2016-04-29 10:41:54 +08:00
|
|
|
shared_ptr<io_data_t> out; // gets allocated via new
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
switch (in->io_mode) {
|
2012-11-19 16:31:03 +08:00
|
|
|
case IO_PIPE:
|
|
|
|
case IO_FD:
|
|
|
|
case IO_BUFFER:
|
2016-04-29 10:41:54 +08:00
|
|
|
case IO_CLOSE: {
|
2016-05-04 07:23:30 +08:00
|
|
|
// These redirections don't need transmogrification. They can be passed through.
|
2013-01-07 23:04:55 +08:00
|
|
|
out = in;
|
2012-11-19 16:31:03 +08:00
|
|
|
break;
|
|
|
|
}
|
2016-04-29 10:41:54 +08:00
|
|
|
case IO_FILE: {
|
2016-05-04 07:23:30 +08:00
|
|
|
// Transmogrify file redirections.
|
2012-11-19 16:31:03 +08:00
|
|
|
int fd;
|
2016-07-31 03:01:37 +08:00
|
|
|
io_file_t *in_file = static_cast<io_file_t *>(in.get());
|
2016-04-29 10:41:54 +08:00
|
|
|
if ((fd = open(in_file->filename_cstr, in_file->flags, OPEN_MASK)) == -1) {
|
|
|
|
debug(1, FILE_ERROR, in_file->filename_cstr);
|
2012-08-23 04:41:21 +08:00
|
|
|
|
2012-11-19 16:31:03 +08:00
|
|
|
wperror(L"open");
|
|
|
|
success = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
opened_fds.push_back(fd);
|
2015-01-09 02:44:05 +08:00
|
|
|
out.reset(new io_fd_t(in->fd, fd, false));
|
2012-08-23 04:41:21 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
if (out.get() != NULL) result_chain.push_back(out);
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// Don't go any further if we failed.
|
|
|
|
if (!success) {
|
2012-08-23 04:41:21 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// Now either return success, or clean up.
|
|
|
|
if (success) {
|
2017-01-27 08:14:50 +08:00
|
|
|
*out_chain = std::move(result_chain);
|
|
|
|
*out_opened_fds = std::move(opened_fds);
|
2016-04-29 10:41:54 +08:00
|
|
|
} else {
|
2013-01-20 02:59:43 +08:00
|
|
|
result_chain.clear();
|
|
|
|
io_cleanup_fds(opened_fds);
|
2012-08-23 04:41:21 +08:00
|
|
|
}
|
|
|
|
return success;
|
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
/// Morph an io redirection chain into redirections suitable for passing to eval, call eval, and
|
|
|
|
/// clean up morphed redirections.
|
|
|
|
///
|
2018-02-12 11:34:12 +08:00
|
|
|
/// \param parsed_source the parsed source code containing the node to evaluate
|
|
|
|
/// \param node the node to evaluate
|
2016-06-06 09:46:04 +08:00
|
|
|
/// \param ios the io redirections to be performed on this block
|
2018-02-12 11:34:12 +08:00
|
|
|
template <typename T>
|
|
|
|
void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, tnode_t<T> node,
|
2018-11-04 15:58:44 +08:00
|
|
|
const io_chain_t &ios, std::shared_ptr<job_t> parent_job) {
|
2018-02-12 11:34:12 +08:00
|
|
|
assert(parsed_source && node && "exec_helper missing source or without node");
|
2013-12-27 17:38:43 +08:00
|
|
|
|
2012-08-23 04:41:21 +08:00
|
|
|
io_chain_t morphed_chain;
|
|
|
|
std::vector<int> opened_fds;
|
2013-12-27 17:38:43 +08:00
|
|
|
bool transmorgrified = io_transmogrify(ios, &morphed_chain, &opened_fds);
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// Did the transmogrification fail - if so, set error status and return.
|
|
|
|
if (!transmorgrified) {
|
2012-11-19 08:30:30 +08:00
|
|
|
proc_set_last_status(STATUS_EXEC_FAIL);
|
|
|
|
return;
|
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2018-11-04 15:58:44 +08:00
|
|
|
parser.eval_node(parsed_source, node, morphed_chain, TOP, parent_job);
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2013-01-20 02:59:43 +08:00
|
|
|
morphed_chain.clear();
|
|
|
|
io_cleanup_fds(opened_fds);
|
2012-11-19 08:30:30 +08:00
|
|
|
job_reap(0);
|
2005-09-20 21:26:39 +08:00
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// 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.
|
|
|
|
//
|
|
|
|
// Furthermore, to avoid the race between the caller calling tcsetpgrp() and the client checking the
|
|
|
|
// foreground process group, we don't use posix_spawn if we're going to foreground the process. (If
|
|
|
|
// we use fork(), we can call tcsetpgrp after the fork, before the exec, and avoid the race).
|
2018-11-04 15:58:44 +08:00
|
|
|
static bool can_use_posix_spawn_for_job(const std::shared_ptr<job_t> &job,
|
|
|
|
const process_t *process) {
|
2018-10-03 01:30:23 +08:00
|
|
|
if (job->get_flag(job_flag_t::JOB_CONTROL)) { //!OCLINT(collapsible if statements)
|
2016-04-29 10:41:54 +08:00
|
|
|
// We are going to use job control; therefore when we launch this job it will get its own
|
|
|
|
// process group ID. But will it be foregrounded?
|
2018-10-03 01:30:23 +08:00
|
|
|
if (job->get_flag(job_flag_t::TERMINAL) && job->is_foreground()) {
|
2016-04-29 10:41:54 +08:00
|
|
|
// It will be foregrounded, so we will call tcsetpgrp(), therefore do not use
|
|
|
|
// posix_spawn.
|
2012-11-05 07:45:52 +08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2013-10-27 06:27:39 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// Now see if we have a redirection involving a file. The only one we allow is /dev/null, which
|
|
|
|
// we assume will not fail.
|
2012-10-29 16:45:51 +08:00
|
|
|
bool result = true;
|
2016-04-29 10:41:54 +08:00
|
|
|
if (chain_contains_redirection_to_real_file(job->block_io_chain()) ||
|
|
|
|
chain_contains_redirection_to_real_file(process->io_chain())) {
|
Big fat refactoring of how redirections work. In fish 1.x and 2.0.0, the redirections for a process were flattened into a big list associated with the job, so there was no way to tell which redirections applied to each process. Each process therefore got all the redirections associated with the job. See https://github.com/fish-shell/fish-shell/issues/877 for how this could manifest.
With this change, jobs only track their block-level redirections. Process level redirections are correctly associated with the process, and at exec time we stitch them together (block, pipe, and process redirects).
This fixes the weird issues where redirects bleed across pipelines (like #877), and also allows us to play with the order in which redirections are applied, since the final list is constructed right before it's needed. This lets us put pipes after block level redirections but before process level redirections, so that a 2>&1-type redirection gets picked up after the pipe, i.e. it should fix https://github.com/fish-shell/fish-shell/issues/110
This is a significant change. The tests all pass. Cross your fingers.
2013-08-20 07:16:41 +08:00
|
|
|
result = false;
|
2012-10-29 16:45:51 +08:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2017-07-31 06:26:41 +08:00
|
|
|
void internal_exec(job_t *j, const io_chain_t &&all_ios) {
|
|
|
|
// Do a regular launch - but without forking first...
|
|
|
|
|
2018-03-25 03:37:15 +08:00
|
|
|
// setup_child_process makes sure signals are properly set up.
|
2017-07-31 06:26:41 +08:00
|
|
|
|
|
|
|
// PCA This is for handling exec. Passing all_ios here matches what fish 2.0.0 and 1.x did.
|
|
|
|
// It's known to be wrong - for example, it means that redirections bound for subsequent
|
|
|
|
// commands in the pipeline will apply to exec. However, using exec in a pipeline doesn't
|
|
|
|
// really make sense, so I'm not trying to fix it here.
|
|
|
|
if (!setup_child_process(0, all_ios)) {
|
2017-10-15 19:37:34 +08:00
|
|
|
// Decrement SHLVL as we're removing ourselves from the shell "stack".
|
|
|
|
auto shlvl_var = env_get(L"SHLVL", ENV_GLOBAL | ENV_EXPORT);
|
2017-08-07 06:25:42 +08:00
|
|
|
wcstring shlvl_str = L"0";
|
2017-08-28 15:25:41 +08:00
|
|
|
if (shlvl_var) {
|
|
|
|
long shlvl = fish_wcstol(shlvl_var->as_string().c_str());
|
2017-08-07 06:25:42 +08:00
|
|
|
if (!errno && shlvl > 0) {
|
|
|
|
shlvl_str = to_string<long>(shlvl - 1);
|
2017-07-31 06:26:41 +08:00
|
|
|
}
|
|
|
|
}
|
2017-10-15 19:37:34 +08:00
|
|
|
env_set_one(L"SHLVL", ENV_GLOBAL | ENV_EXPORT, shlvl_str);
|
2017-07-31 06:26:41 +08:00
|
|
|
|
|
|
|
// launch_process _never_ returns.
|
|
|
|
launch_process_nofork(j->processes.front().get());
|
|
|
|
} else {
|
2018-10-03 01:30:23 +08:00
|
|
|
j->set_flag(job_flag_t::CONSTRUCTED, true);
|
2017-07-31 06:26:41 +08:00
|
|
|
j->processes.front()->completed = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-04 15:58:44 +08:00
|
|
|
static void on_process_created(const std::shared_ptr<job_t> &j, pid_t child_pid) {
|
2018-09-04 06:56:59 +08:00
|
|
|
// We only need to do this the first time a child is forked/spawned
|
2018-10-02 11:55:18 +08:00
|
|
|
if (j->pgid != INVALID_PID) {
|
2018-09-04 06:56:59 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-10-03 01:30:23 +08:00
|
|
|
if (j->get_flag(job_flag_t::JOB_CONTROL)) {
|
2018-09-04 06:56:59 +08:00
|
|
|
j->pgid = child_pid;
|
|
|
|
} else {
|
|
|
|
j->pgid = getpgrp();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Call fork() as part of executing a process \p p in a job \j. Execute \p child_action in the
|
|
|
|
/// context of the child. Returns true if fork succeeded, false if fork failed.
|
2018-11-04 15:58:44 +08:00
|
|
|
static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t *p,
|
|
|
|
const io_chain_t &io_chain, bool drain_threads,
|
|
|
|
const char *fork_type,
|
2018-09-04 06:56:59 +08:00
|
|
|
const std::function<void()> &child_action) {
|
|
|
|
pid_t pid = execute_fork(drain_threads);
|
|
|
|
if (pid == 0) {
|
|
|
|
// This is the child process. Setup redirections, print correct output to
|
|
|
|
// stdout and stderr, and then exit.
|
|
|
|
p->pid = getpid();
|
2018-11-04 15:58:44 +08:00
|
|
|
child_set_group(job.get(), p);
|
2018-09-04 06:56:59 +08:00
|
|
|
setup_child_process(p, io_chain);
|
|
|
|
child_action();
|
|
|
|
DIE("Child process returned control to fork_child lambda!");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pid < 0) {
|
|
|
|
debug(1, L"Failed to fork %s!\n", fork_type);
|
2018-11-04 15:58:44 +08:00
|
|
|
job_mark_process_as_failed(job, p);
|
2018-09-04 06:56:59 +08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This is the parent process. Store away information on the child, and
|
|
|
|
// possibly give it control over the terminal.
|
2018-10-03 00:19:56 +08:00
|
|
|
debug(4, L"Fork #%d, pid %d: %s for '%ls'", g_fork_count, pid, fork_type, p->argv0());
|
2018-09-04 06:56:59 +08:00
|
|
|
|
|
|
|
p->pid = pid;
|
2018-11-04 15:58:44 +08:00
|
|
|
on_process_created(job, p->pid);
|
|
|
|
set_child_group(job.get(), p->pid);
|
|
|
|
maybe_assign_terminal(job.get());
|
2018-09-04 06:56:59 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-12-23 05:41:29 +08:00
|
|
|
/// Execute an internal builtin. Given a parser, a job within that parser, and a process within that
|
|
|
|
/// job corresponding to a builtin, execute the builtin with the given streams. If pipe_read is set,
|
2018-01-21 16:20:01 +08:00
|
|
|
/// assign stdin to it; otherwise infer stdin from the IO chain.
|
2018-09-04 06:56:59 +08:00
|
|
|
/// \return true on success, false if there is an exec error.
|
2018-11-04 15:58:44 +08:00
|
|
|
static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<job_t> &j,
|
|
|
|
process_t *p, const io_pipe_t *pipe_read,
|
|
|
|
const io_chain_t &proc_io_chain, io_streams_t &streams) {
|
2017-12-23 05:41:29 +08:00
|
|
|
assert(p->type == INTERNAL_BUILTIN && "Process must be a builtin");
|
|
|
|
int local_builtin_stdin = STDIN_FILENO;
|
|
|
|
bool close_stdin = false;
|
|
|
|
|
|
|
|
// If this is the first process, check the io redirections and see where we should
|
|
|
|
// be reading from.
|
|
|
|
if (pipe_read) {
|
|
|
|
local_builtin_stdin = pipe_read->pipe_fd[0];
|
|
|
|
} else if (const auto in = proc_io_chain.get_io_for_fd(STDIN_FILENO)) {
|
|
|
|
switch (in->io_mode) {
|
|
|
|
case IO_FD: {
|
|
|
|
const io_fd_t *in_fd = static_cast<const io_fd_t *>(in.get());
|
|
|
|
// Ignore user-supplied fd redirections from an fd other than the
|
|
|
|
// standard ones. e.g. in source <&3 don't actually read from fd 3,
|
|
|
|
// which is internal to fish. We still respect this redirection in
|
|
|
|
// that we pass it on as a block IO to the code that source runs,
|
|
|
|
// and therefore this is not an error. Non-user supplied fd
|
|
|
|
// redirections come about through transmogrification, and we need
|
|
|
|
// to respect those here.
|
|
|
|
if (!in_fd->user_supplied || (in_fd->old_fd >= 0 && in_fd->old_fd < 3)) {
|
|
|
|
local_builtin_stdin = in_fd->old_fd;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case IO_PIPE: {
|
|
|
|
const io_pipe_t *in_pipe = static_cast<const io_pipe_t *>(in.get());
|
|
|
|
local_builtin_stdin = in_pipe->pipe_fd[0];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case IO_FILE: {
|
|
|
|
// Do not set CLO_EXEC because child needs access.
|
|
|
|
const io_file_t *in_file = static_cast<const io_file_t *>(in.get());
|
|
|
|
local_builtin_stdin = open(in_file->filename_cstr, in_file->flags, OPEN_MASK);
|
|
|
|
if (local_builtin_stdin == -1) {
|
|
|
|
debug(1, FILE_ERROR, in_file->filename_cstr);
|
|
|
|
wperror(L"open");
|
|
|
|
} else {
|
|
|
|
close_stdin = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case IO_CLOSE: {
|
|
|
|
// FIXME: When requesting that stdin be closed, we really don't do
|
|
|
|
// anything. How should this be handled?
|
|
|
|
local_builtin_stdin = -1;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default: {
|
|
|
|
local_builtin_stdin = -1;
|
|
|
|
debug(1, _(L"Unknown input redirection type %d"), in->io_mode);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (local_builtin_stdin == -1) return false;
|
|
|
|
|
|
|
|
// Determine if we have a "direct" redirection for stdin.
|
|
|
|
bool stdin_is_directly_redirected;
|
|
|
|
if (!p->is_first_in_job) {
|
|
|
|
// We must have a pipe
|
|
|
|
stdin_is_directly_redirected = true;
|
|
|
|
} else {
|
|
|
|
// We are not a pipe. Check if there is a redirection local to the process
|
|
|
|
// that's not IO_CLOSE.
|
|
|
|
const shared_ptr<const io_data_t> stdin_io = io_chain_get(p->io_chain(), STDIN_FILENO);
|
|
|
|
stdin_is_directly_redirected = stdin_io && stdin_io->io_mode != IO_CLOSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
streams.stdin_fd = local_builtin_stdin;
|
|
|
|
streams.out_is_redirected = has_fd(proc_io_chain, STDOUT_FILENO);
|
|
|
|
streams.err_is_redirected = has_fd(proc_io_chain, STDERR_FILENO);
|
|
|
|
streams.stdin_is_directly_redirected = stdin_is_directly_redirected;
|
|
|
|
streams.io_chain = &proc_io_chain;
|
|
|
|
|
|
|
|
// Since this may be the foreground job, and since a builtin may execute another
|
|
|
|
// foreground job, we need to pretend to suspend this job while running the
|
|
|
|
// builtin, in order to avoid a situation where two jobs are running at once.
|
|
|
|
//
|
|
|
|
// The reason this is done here, and not by the relevant builtins, is that this
|
|
|
|
// way, the builtin does not need to know what job it is part of. It could
|
|
|
|
// probably figure that out by walking the job list, but it seems more robust to
|
|
|
|
// make exec handle things.
|
2018-10-03 01:30:23 +08:00
|
|
|
const int fg = j->is_foreground();
|
|
|
|
j->set_flag(job_flag_t::FOREGROUND, false);
|
2018-02-03 06:31:10 +08:00
|
|
|
|
|
|
|
// Note this call may block for a long time, while the builtin performs I/O.
|
2018-08-19 07:56:01 +08:00
|
|
|
p->status = builtin_run(parser, j->pgid, p->get_argv(), streams);
|
2017-12-23 05:41:29 +08:00
|
|
|
|
|
|
|
// Restore the fg flag, which is temporarily set to false during builtin
|
|
|
|
// execution so as not to confuse some job-handling builtins.
|
2018-10-03 01:30:23 +08:00
|
|
|
j->set_flag(job_flag_t::FOREGROUND, fg);
|
2017-12-23 05:41:29 +08:00
|
|
|
|
|
|
|
// If stdin has been redirected, close the redirection stream.
|
|
|
|
if (close_stdin) {
|
|
|
|
exec_close(local_builtin_stdin);
|
|
|
|
}
|
|
|
|
return true; // "success"
|
|
|
|
}
|
|
|
|
|
2018-09-04 06:56:59 +08:00
|
|
|
/// Handle output from a builtin, by printing the contents of builtin_io_streams to the redirections
|
|
|
|
/// given in io_chain.
|
2018-11-04 15:58:44 +08:00
|
|
|
static bool handle_builtin_output(const std::shared_ptr<job_t> &j, process_t *p,
|
|
|
|
io_chain_t *io_chain, const io_streams_t &builtin_io_streams) {
|
2018-09-04 06:56:59 +08:00
|
|
|
assert(p->type == INTERNAL_BUILTIN && "Process is not a builtin");
|
|
|
|
// Handle output from builtin commands. In the general case, this means forking of a
|
|
|
|
// worker process, that will write out the contents of the stdout and stderr buffers
|
|
|
|
// to the correct file descriptor. Since forking is expensive, fish tries to avoid
|
|
|
|
// it when possible.
|
|
|
|
bool fork_was_skipped = false;
|
|
|
|
|
|
|
|
const shared_ptr<io_data_t> stdout_io = io_chain->get_io_for_fd(STDOUT_FILENO);
|
|
|
|
const shared_ptr<io_data_t> stderr_io = io_chain->get_io_for_fd(STDERR_FILENO);
|
|
|
|
|
|
|
|
const output_stream_t &stdout_stream = builtin_io_streams.out;
|
|
|
|
const output_stream_t &stderr_stream = builtin_io_streams.err;
|
|
|
|
|
|
|
|
// If we are outputting to a file, we have to actually do it, even if we have no
|
|
|
|
// output, so that we can truncate the file. Does not apply to /dev/null.
|
|
|
|
bool must_fork = redirection_is_to_real_file(stdout_io.get()) ||
|
|
|
|
redirection_is_to_real_file(stderr_io.get());
|
|
|
|
if (!must_fork && p->is_last_in_job) {
|
|
|
|
// We are handling reads directly in the main loop. Note that we may still end
|
|
|
|
// up forking.
|
|
|
|
const bool stdout_is_to_buffer = stdout_io && stdout_io->io_mode == IO_BUFFER;
|
|
|
|
const bool no_stdout_output = stdout_stream.empty();
|
|
|
|
const bool no_stderr_output = stderr_stream.empty();
|
|
|
|
const bool stdout_discarded = stdout_stream.buffer().discarded();
|
|
|
|
|
|
|
|
if (!stdout_discarded && no_stdout_output && no_stderr_output) {
|
|
|
|
// The builtin produced no output and is not inside of a pipeline. No
|
|
|
|
// need to fork or even output anything.
|
2018-10-03 00:19:56 +08:00
|
|
|
debug(4, L"Skipping fork: no output for internal builtin '%ls'", p->argv0());
|
2018-09-04 06:56:59 +08:00
|
|
|
fork_was_skipped = true;
|
|
|
|
} else if (no_stderr_output && stdout_is_to_buffer) {
|
|
|
|
// The builtin produced no stderr, and its stdout is going to an
|
|
|
|
// internal buffer. There is no need to fork. This helps out the
|
|
|
|
// performance quite a bit in complex completion code.
|
|
|
|
// TODO: we're sloppy about handling explicitly separated output.
|
|
|
|
// Theoretically we could have explicitly separated output on stdout and
|
|
|
|
// also stderr output; in that case we ought to thread the exp-sep output
|
|
|
|
// through to the io buffer. We're getting away with this because the only
|
|
|
|
// thing that can output exp-sep output is `string split0` which doesn't
|
|
|
|
// also produce stderr.
|
2018-10-03 00:19:56 +08:00
|
|
|
debug(4, L"Skipping fork: buffered output for internal builtin '%ls'", p->argv0());
|
2018-09-04 06:56:59 +08:00
|
|
|
|
|
|
|
io_buffer_t *io_buffer = static_cast<io_buffer_t *>(stdout_io.get());
|
|
|
|
io_buffer->append_from_stream(stdout_stream);
|
|
|
|
fork_was_skipped = true;
|
|
|
|
} else if (stdout_io.get() == NULL && stderr_io.get() == NULL) {
|
|
|
|
// We are writing to normal stdout and stderr. Just do it - no need to fork.
|
2018-10-03 00:19:56 +08:00
|
|
|
debug(4, L"Skipping fork: ordinary output for internal builtin '%ls'", p->argv0());
|
2018-09-04 06:56:59 +08:00
|
|
|
const std::string outbuff = wcs2string(stdout_stream.contents());
|
|
|
|
const std::string errbuff = wcs2string(stderr_stream.contents());
|
|
|
|
bool builtin_io_done =
|
|
|
|
do_builtin_io(outbuff.data(), outbuff.size(), errbuff.data(), errbuff.size());
|
|
|
|
if (!builtin_io_done && errno != EPIPE) {
|
|
|
|
redirect_tty_output(); // workaround glibc bug
|
|
|
|
debug(0, "!builtin_io_done and errno != EPIPE");
|
|
|
|
show_stackframe(L'E');
|
|
|
|
}
|
|
|
|
if (stdout_discarded) p->status = STATUS_READ_TOO_MUCH;
|
|
|
|
fork_was_skipped = true;
|
|
|
|
}
|
2018-02-15 09:08:12 +08:00
|
|
|
}
|
|
|
|
|
2018-09-04 06:56:59 +08:00
|
|
|
if (fork_was_skipped) {
|
|
|
|
p->completed = 1;
|
|
|
|
if (p->is_last_in_job) {
|
2018-10-09 01:44:47 +08:00
|
|
|
debug(4, L"Set status of job %d (%ls) to %d using short circuit", j->job_id,
|
|
|
|
j->preview().c_str(), p->status);
|
2018-09-04 06:56:59 +08:00
|
|
|
|
|
|
|
int status = p->status;
|
2018-10-03 01:30:23 +08:00
|
|
|
proc_set_last_status(j->get_flag(job_flag_t::NEGATE) ? (!status) : status);
|
2018-09-04 06:56:59 +08:00
|
|
|
}
|
2018-02-15 09:08:12 +08:00
|
|
|
} else {
|
2018-09-04 06:56:59 +08:00
|
|
|
// Ok, unfortunately, we have to do a real fork. Bummer. We work hard to make
|
|
|
|
// sure we don't have to wait for all our threads to exit, by arranging things
|
|
|
|
// so that we don't have to allocate memory or do anything except system calls
|
|
|
|
// in the child.
|
|
|
|
//
|
|
|
|
// These strings may contain embedded nulls, so don't treat them as C strings.
|
|
|
|
const std::string outbuff_str = wcs2string(stdout_stream.contents());
|
|
|
|
const char *outbuff = outbuff_str.data();
|
|
|
|
size_t outbuff_len = outbuff_str.size();
|
|
|
|
|
|
|
|
const std::string errbuff_str = wcs2string(stderr_stream.contents());
|
|
|
|
const char *errbuff = errbuff_str.data();
|
|
|
|
size_t errbuff_len = errbuff_str.size();
|
|
|
|
|
|
|
|
fflush(stdout);
|
|
|
|
fflush(stderr);
|
|
|
|
if (!fork_child_for_process(j, p, *io_chain, false, "internal builtin", [&] {
|
|
|
|
do_builtin_io(outbuff, outbuff_len, errbuff, errbuff_len);
|
|
|
|
exit_without_destructors(p->status);
|
|
|
|
})) {
|
|
|
|
return false;
|
|
|
|
}
|
2018-02-15 09:08:12 +08:00
|
|
|
}
|
2018-09-04 06:56:59 +08:00
|
|
|
return true;
|
2018-02-15 09:08:12 +08:00
|
|
|
}
|
|
|
|
|
2018-09-04 06:56:59 +08:00
|
|
|
/// Executes an external command.
|
|
|
|
/// \return true on success, false if there is an exec error.
|
2018-11-04 15:58:44 +08:00
|
|
|
static bool exec_external_command(const std::shared_ptr<job_t> &j, process_t *p,
|
|
|
|
const io_chain_t &proc_io_chain) {
|
2018-09-04 06:56:59 +08:00
|
|
|
assert(p->type == EXTERNAL && "Process is not external");
|
|
|
|
// Get argv and envv before we fork.
|
|
|
|
null_terminated_array_t<char> argv_array;
|
|
|
|
convert_wide_array_to_narrow(p->get_argv_array(), &argv_array);
|
|
|
|
|
|
|
|
// Ensure that stdin is blocking before we hand it off (see issue #176). It's a
|
|
|
|
// little strange that we only do this with stdin and not with stdout or stderr.
|
|
|
|
// However in practice, setting or clearing O_NONBLOCK on stdin also sets it for the
|
|
|
|
// other two fds, presumably because they refer to the same underlying file
|
|
|
|
// (/dev/tty?).
|
|
|
|
make_fd_blocking(STDIN_FILENO);
|
|
|
|
|
|
|
|
const char *const *argv = argv_array.get();
|
|
|
|
const char *const *envv = env_export_arr();
|
|
|
|
|
|
|
|
std::string actual_cmd_str = wcs2string(p->actual_cmd);
|
|
|
|
const char *actual_cmd = actual_cmd_str.c_str();
|
|
|
|
const wchar_t *file = reader_current_filename();
|
|
|
|
|
|
|
|
#if FISH_USE_POSIX_SPAWN
|
|
|
|
// Prefer to use posix_spawn, since it's faster on some systems like OS X.
|
|
|
|
bool use_posix_spawn = g_use_posix_spawn && can_use_posix_spawn_for_job(j, p);
|
|
|
|
if (use_posix_spawn) {
|
|
|
|
g_fork_count++; // spawn counts as a fork+exec
|
|
|
|
// Create posix spawn attributes and actions.
|
|
|
|
pid_t pid = 0;
|
|
|
|
posix_spawnattr_t attr = posix_spawnattr_t();
|
|
|
|
posix_spawn_file_actions_t actions = posix_spawn_file_actions_t();
|
2018-11-04 15:58:44 +08:00
|
|
|
bool made_it =
|
|
|
|
fork_actions_make_spawn_properties(&attr, &actions, j.get(), p, proc_io_chain);
|
2018-09-04 06:56:59 +08:00
|
|
|
if (made_it) {
|
|
|
|
// We successfully made the attributes and actions; actually call
|
|
|
|
// posix_spawn.
|
|
|
|
int spawn_ret =
|
|
|
|
posix_spawn(&pid, actual_cmd, &actions, &attr, const_cast<char *const *>(argv),
|
|
|
|
const_cast<char *const *>(envv));
|
|
|
|
|
|
|
|
// This usleep can be used to test for various race conditions
|
|
|
|
// (https://github.com/fish-shell/fish-shell/issues/360).
|
|
|
|
// usleep(10000);
|
|
|
|
|
|
|
|
if (spawn_ret != 0) {
|
|
|
|
safe_report_exec_error(spawn_ret, actual_cmd, argv, envv);
|
|
|
|
// Make sure our pid isn't set.
|
|
|
|
pid = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Clean up our actions.
|
|
|
|
posix_spawn_file_actions_destroy(&actions);
|
|
|
|
posix_spawnattr_destroy(&attr);
|
|
|
|
}
|
|
|
|
|
|
|
|
// A 0 pid means we failed to posix_spawn. Since we have no pid, we'll never get
|
|
|
|
// told when it's exited, so we have to mark the process as failed.
|
2018-10-03 00:19:56 +08:00
|
|
|
debug(4, L"Fork #%d, pid %d: spawn external command '%s' from '%ls'", g_fork_count, pid,
|
2018-09-04 06:56:59 +08:00
|
|
|
actual_cmd, file ? file : L"<no file>");
|
|
|
|
if (pid == 0) {
|
|
|
|
job_mark_process_as_failed(j, p);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// these are all things do_fork() takes care of normally (for forked processes):
|
|
|
|
p->pid = pid;
|
|
|
|
on_process_created(j, p->pid);
|
|
|
|
|
|
|
|
// We explicitly don't call set_child_group() for spawned processes because that
|
|
|
|
// a) isn't necessary, and b) causes issues like fish-shell/fish-shell#4715
|
|
|
|
|
|
|
|
#if defined(__GLIBC__)
|
|
|
|
// Unfortunately, using posix_spawn() is not the panacea it would appear to be,
|
|
|
|
// glibc has a penchant for using fork() instead of vfork() when posix_spawn() is
|
|
|
|
// called, meaning that atomicity is not guaranteed and we can get here before the
|
|
|
|
// child group has been set. See discussion here:
|
|
|
|
// https://github.com/Microsoft/WSL/issues/2997 And confirmation that this persists
|
|
|
|
// past glibc 2.24+ here: https://github.com/fish-shell/fish-shell/issues/4715
|
2018-10-03 01:30:23 +08:00
|
|
|
if (j->get_flag(job_flag_t::JOB_CONTROL) && getpgid(p->pid) != j->pgid) {
|
2018-11-04 15:58:44 +08:00
|
|
|
set_child_group(j.get(), p->pid);
|
2018-09-04 06:56:59 +08:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
// In do_fork, the pid of the child process is used as the group leader if j->pgid
|
2018-10-02 11:55:18 +08:00
|
|
|
// invalid, posix_spawn assigned the new group a pgid equal to its own id if
|
|
|
|
// j->pgid was invalid, so this is what we do instead of calling set_child_group
|
|
|
|
if (j->pgid == INVALID_PID) {
|
2018-09-04 06:56:59 +08:00
|
|
|
j->pgid = pid;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2018-11-04 15:58:44 +08:00
|
|
|
maybe_assign_terminal(j.get());
|
2018-09-04 06:56:59 +08:00
|
|
|
} else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
if (!fork_child_for_process(j, p, proc_io_chain, false, "external command",
|
|
|
|
[&] { safe_launch_process(p, actual_cmd, argv, envv); })) {
|
|
|
|
return false;
|
|
|
|
}
|
2018-09-04 05:33:53 +08:00
|
|
|
}
|
|
|
|
|
2018-09-04 06:56:59 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Execute a block node or function "process".
|
|
|
|
/// \p user_ios contains the list of user-specified ios, used so we can avoid stomping on them with
|
|
|
|
/// our pipes. \return true on success, false on error.
|
2018-11-04 15:58:44 +08:00
|
|
|
static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t> j, process_t *p,
|
2018-09-04 06:56:59 +08:00
|
|
|
const io_chain_t &user_ios, io_chain_t io_chain) {
|
|
|
|
assert((p->type == INTERNAL_FUNCTION || p->type == INTERNAL_BLOCK_NODE) &&
|
|
|
|
"Unexpected process type");
|
|
|
|
|
|
|
|
// Create an output buffer if we're piping to another process.
|
|
|
|
shared_ptr<io_buffer_t> block_output_io_buffer{};
|
|
|
|
if (!p->is_last_in_job) {
|
|
|
|
// Be careful to handle failure, e.g. too many open fds.
|
|
|
|
block_output_io_buffer = io_buffer_t::create(STDOUT_FILENO, user_ios);
|
|
|
|
if (!block_output_io_buffer) {
|
|
|
|
job_mark_process_as_failed(j, p);
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
// This looks sketchy, because we're adding this io buffer locally - they
|
|
|
|
// aren't in the process or job redirection list. Therefore select_try won't
|
|
|
|
// be able to read them. However we call block_output_io_buffer->read()
|
|
|
|
// below, which reads until EOF. So there's no need to select on this.
|
|
|
|
io_chain.push_back(block_output_io_buffer);
|
|
|
|
}
|
2018-09-04 05:33:53 +08:00
|
|
|
}
|
|
|
|
|
2018-09-04 06:56:59 +08:00
|
|
|
if (p->type == INTERNAL_FUNCTION) {
|
|
|
|
const wcstring func_name = p->argv0();
|
|
|
|
auto props = function_get_properties(func_name);
|
|
|
|
if (!props) {
|
|
|
|
debug(0, _(L"Unknown function '%ls'"), p->argv0());
|
|
|
|
return false;
|
|
|
|
}
|
2018-09-04 05:33:53 +08:00
|
|
|
|
2018-09-04 06:56:59 +08:00
|
|
|
const std::map<wcstring, env_var_t> inherit_vars = function_get_inherit_vars(func_name);
|
|
|
|
|
|
|
|
function_block_t *fb =
|
|
|
|
parser.push_block<function_block_t>(p, func_name, props->shadow_scope);
|
|
|
|
function_prepare_environment(func_name, p->get_argv() + 1, inherit_vars);
|
|
|
|
parser.forbid_function(func_name);
|
|
|
|
|
2018-11-04 15:58:44 +08:00
|
|
|
internal_exec_helper(parser, props->parsed_source, props->body_node, io_chain, j);
|
2018-09-04 06:56:59 +08:00
|
|
|
|
|
|
|
parser.allow_function();
|
|
|
|
parser.pop_block(fb);
|
|
|
|
} else {
|
|
|
|
assert(p->type == INTERNAL_BLOCK_NODE);
|
|
|
|
assert(p->block_node_source && p->internal_block_node && "Process is missing node info");
|
2018-11-04 15:58:44 +08:00
|
|
|
internal_exec_helper(parser, p->block_node_source, p->internal_block_node, io_chain, j);
|
2018-09-04 06:56:59 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int status = proc_get_last_status();
|
|
|
|
|
|
|
|
// Handle output from a block or function. This usually means do nothing, but in the
|
|
|
|
// case of pipes, we have to buffer such io, since otherwise the internal pipe
|
|
|
|
// buffer might overflow.
|
|
|
|
if (!block_output_io_buffer.get()) {
|
|
|
|
// No buffer, so we exit directly. This means we have to manually set the exit
|
|
|
|
// status.
|
|
|
|
if (p->is_last_in_job) {
|
2018-10-03 01:30:23 +08:00
|
|
|
proc_set_last_status(j->get_flag(job_flag_t::NEGATE) ? (!status) : status);
|
2018-09-04 06:56:59 +08:00
|
|
|
}
|
|
|
|
p->completed = 1;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Here we must have a non-NULL block_output_io_buffer.
|
|
|
|
assert(block_output_io_buffer.get() != NULL);
|
|
|
|
io_chain.remove(block_output_io_buffer);
|
|
|
|
block_output_io_buffer->read();
|
|
|
|
|
|
|
|
const std::string buffer_contents = block_output_io_buffer->buffer().newline_serialized();
|
|
|
|
const char *buffer = buffer_contents.data();
|
|
|
|
size_t count = buffer_contents.size();
|
|
|
|
if (count > 0) {
|
|
|
|
// We don't have to drain threads here because our child process is simple.
|
|
|
|
const char *fork_reason =
|
|
|
|
p->type == INTERNAL_BLOCK_NODE ? "internal block io" : "internal function io";
|
|
|
|
if (!fork_child_for_process(j, p, io_chain, false, fork_reason, [&] {
|
|
|
|
exec_write_and_exit(block_output_io_buffer->fd, buffer, count, status);
|
|
|
|
})) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (p->is_last_in_job) {
|
2018-10-03 01:30:23 +08:00
|
|
|
proc_set_last_status(j->get_flag(job_flag_t::NEGATE) ? (!status) : status);
|
2018-09-04 06:56:59 +08:00
|
|
|
}
|
|
|
|
p->completed = 1;
|
|
|
|
}
|
2018-09-04 05:33:53 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2018-09-04 02:18:39 +08:00
|
|
|
/// Executes a process \p in job \j, using the read pipe \p pipe_current_read.
|
|
|
|
/// If the process pipes to a command, the read end of the created pipe is returned in
|
|
|
|
/// out_pipe_next_read. \returns true on success, false on exec error.
|
2018-11-04 15:58:44 +08:00
|
|
|
static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<job_t> j,
|
2018-09-04 02:18:39 +08:00
|
|
|
autoclose_fd_t pipe_current_read,
|
|
|
|
autoclose_fd_t *out_pipe_next_read, const io_chain_t &all_ios,
|
|
|
|
size_t stdout_read_limit) {
|
2018-09-02 05:48:22 +08:00
|
|
|
// The IO chain for this process. It starts with the block IO, then pipes, and then gets any
|
|
|
|
// from the process.
|
|
|
|
io_chain_t process_net_io_chain = j->block_io_chain();
|
|
|
|
|
|
|
|
// See if we need a pipe.
|
|
|
|
const bool pipes_to_next_command = !p->is_last_in_job;
|
|
|
|
|
|
|
|
// The write end of any pipe we create.
|
|
|
|
autoclose_fd_t pipe_current_write{};
|
|
|
|
|
|
|
|
// The pipes the current process write to and read from. Unfortunately these can't be just
|
|
|
|
// allocated on the stack, since j->io wants shared_ptr.
|
|
|
|
//
|
|
|
|
// The write pipe (destined for stdout) needs to occur before redirections. For example,
|
|
|
|
// with a redirection like this:
|
|
|
|
//
|
|
|
|
// `foo 2>&1 | bar`
|
|
|
|
//
|
|
|
|
// what we want to happen is this:
|
|
|
|
//
|
|
|
|
// dup2(pipe, stdout)
|
|
|
|
// dup2(stdout, stderr)
|
|
|
|
//
|
|
|
|
// so that stdout and stderr both wind up referencing the pipe.
|
|
|
|
//
|
|
|
|
// The read pipe (destined for stdin) is more ambiguous. Imagine a pipeline like this:
|
|
|
|
//
|
|
|
|
// echo alpha | cat < beta.txt
|
|
|
|
//
|
|
|
|
// Should cat output alpha or beta? bash and ksh output 'beta', tcsh gets it right and
|
|
|
|
// complains about ambiguity, and zsh outputs both (!). No shells appear to output 'alpha',
|
|
|
|
// so we match bash here. That would mean putting the pipe first, so that it gets trumped by
|
|
|
|
// the file redirection.
|
|
|
|
//
|
|
|
|
// However, eval does this:
|
|
|
|
//
|
|
|
|
// echo "begin; $argv "\n" ;end <&3 3<&-" | source 3<&0
|
|
|
|
//
|
|
|
|
// which depends on the redirection being evaluated before the pipe. So the write end of the
|
|
|
|
// pipe comes first, the read pipe of the pipe comes last. See issue #966.
|
|
|
|
shared_ptr<io_pipe_t> pipe_write;
|
|
|
|
shared_ptr<io_pipe_t> pipe_read;
|
|
|
|
|
|
|
|
// Write pipe goes first.
|
|
|
|
if (pipes_to_next_command) {
|
|
|
|
pipe_write.reset(new io_pipe_t(p->pipe_write_fd, false));
|
|
|
|
process_net_io_chain.push_back(pipe_write);
|
|
|
|
}
|
|
|
|
|
|
|
|
// The explicit IO redirections associated with the process.
|
|
|
|
process_net_io_chain.append(p->io_chain());
|
|
|
|
|
|
|
|
// Read pipe goes last.
|
|
|
|
if (!p->is_first_in_job) {
|
|
|
|
pipe_read.reset(new io_pipe_t(p->pipe_read_fd, true));
|
|
|
|
// Record the current read in pipe_read.
|
|
|
|
pipe_read->pipe_fd[0] = pipe_current_read.fd();
|
|
|
|
process_net_io_chain.push_back(pipe_read);
|
|
|
|
}
|
|
|
|
|
|
|
|
// This call is used so the global environment variable array is regenerated, if needed,
|
|
|
|
// before the fork. That way, we avoid a lot of duplicate work where EVERY child would need
|
|
|
|
// to generate it, since that result would not get written back to the parent. This call
|
|
|
|
// could be safely removed, but it would result in slightly lower performance - at least on
|
|
|
|
// uniprocessor systems.
|
|
|
|
if (p->type == EXTERNAL) {
|
|
|
|
// Apply universal barrier so we have the most recent uvar changes
|
|
|
|
if (!get_proc_had_barrier()) {
|
|
|
|
set_proc_had_barrier(true);
|
|
|
|
env_universal_barrier();
|
|
|
|
}
|
|
|
|
env_export_arr();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set up fds that will be used in the pipe.
|
|
|
|
if (pipes_to_next_command) {
|
|
|
|
// debug( 1, L"%ls|%ls" , p->argv[0], p->next->argv[0]);
|
|
|
|
int local_pipe[2] = {-1, -1};
|
|
|
|
if (exec_pipe(local_pipe) == -1) {
|
|
|
|
debug(1, PIPE_ERROR);
|
|
|
|
wperror(L"pipe");
|
|
|
|
job_mark_process_as_failed(j, p);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Ensure our pipe fds not conflict with any fd redirections. E.g. if the process is
|
|
|
|
// like 'cat <&5' then fd 5 must not be used by the pipe.
|
|
|
|
if (!pipe_avoid_conflicts_with_io_chain(local_pipe, all_ios)) {
|
|
|
|
// We failed. The pipes were closed for us.
|
|
|
|
wperror(L"dup");
|
|
|
|
job_mark_process_as_failed(j, p);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// This tells the redirection about the fds, but the redirection does not close them.
|
|
|
|
assert(local_pipe[0] >= 0);
|
|
|
|
assert(local_pipe[1] >= 0);
|
|
|
|
memcpy(pipe_write->pipe_fd, local_pipe, sizeof(int) * 2);
|
|
|
|
|
|
|
|
// Record our pipes.
|
|
|
|
pipe_current_write.reset(local_pipe[1]);
|
|
|
|
out_pipe_next_read->reset(local_pipe[0]);
|
|
|
|
}
|
|
|
|
|
2018-09-04 06:56:59 +08:00
|
|
|
// Execute the process.
|
2018-09-02 05:48:22 +08:00
|
|
|
switch (p->type) {
|
2018-09-04 06:56:59 +08:00
|
|
|
case INTERNAL_FUNCTION:
|
2018-09-02 05:48:22 +08:00
|
|
|
case INTERNAL_BLOCK_NODE: {
|
2018-09-04 06:56:59 +08:00
|
|
|
if (!exec_block_or_func_process(parser, j, p, all_ios, process_net_io_chain)) {
|
|
|
|
return false;
|
2018-09-02 05:48:22 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case INTERNAL_BUILTIN: {
|
2018-09-04 06:56:59 +08:00
|
|
|
io_streams_t builtin_io_streams{stdout_read_limit};
|
2018-09-02 05:48:22 +08:00
|
|
|
if (!exec_internal_builtin_proc(parser, j, p, pipe_read.get(), process_net_io_chain,
|
2018-09-04 06:56:59 +08:00
|
|
|
builtin_io_streams)) {
|
|
|
|
return false;
|
2018-09-02 05:48:22 +08:00
|
|
|
}
|
2018-09-04 06:56:59 +08:00
|
|
|
if (!handle_builtin_output(j, p, &process_net_io_chain, builtin_io_streams)) {
|
|
|
|
return false;
|
2018-09-02 05:48:22 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case EXTERNAL: {
|
2018-09-04 06:56:59 +08:00
|
|
|
if (!exec_external_command(j, p, process_net_io_chain)) {
|
|
|
|
return false;
|
2018-09-02 05:48:22 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case INTERNAL_EXEC: {
|
|
|
|
// We should have handled exec up above.
|
|
|
|
DIE("INTERNAL_EXEC process found in pipeline, where it should never be. Aborting.");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2018-09-04 06:56:59 +08:00
|
|
|
return true;
|
2018-09-02 05:48:22 +08:00
|
|
|
}
|
|
|
|
|
2018-11-19 07:14:08 +08:00
|
|
|
bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
|
2018-10-18 09:07:45 +08:00
|
|
|
assert(j && "null job_t passed to exec_job!");
|
2018-09-29 12:13:13 +08:00
|
|
|
|
2018-11-19 07:14:08 +08:00
|
|
|
// Set to true if something goes wrong while executing the job, in which case the cleanup
|
|
|
|
// code will kick in.
|
2012-11-19 08:30:30 +08:00
|
|
|
bool exec_error = false;
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// If fish was invoked with -n or --no-execute, then no_exec will be set and we do nothing.
|
|
|
|
if (no_exec) {
|
2018-11-19 07:14:08 +08:00
|
|
|
return true;
|
2013-03-26 07:06:12 +08:00
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2018-11-04 17:23:35 +08:00
|
|
|
const std::shared_ptr<job_t> parent_job = j->get_parent();
|
2018-10-09 01:44:47 +08:00
|
|
|
|
2018-11-04 17:23:35 +08:00
|
|
|
// Perhaps inherit our parent's pgid and job control flag.
|
2018-10-09 01:44:47 +08:00
|
|
|
if (parent_job && j->processes.front()->type == EXTERNAL) {
|
|
|
|
if (parent_job->pgid != INVALID_PID) {
|
|
|
|
j->pgid = parent_job->pgid;
|
|
|
|
j->set_flag(job_flag_t::JOB_CONTROL, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// Verify that all IO_BUFFERs are output. We used to support a (single, hacked-in) magical input
|
|
|
|
// IO_BUFFER used by fish_pager, but now the claim is that there are no more clients and it is
|
|
|
|
// removed. This assertion double-checks that.
|
2017-07-27 11:17:04 +08:00
|
|
|
size_t stdout_read_limit = 0;
|
Big fat refactoring of how redirections work. In fish 1.x and 2.0.0, the redirections for a process were flattened into a big list associated with the job, so there was no way to tell which redirections applied to each process. Each process therefore got all the redirections associated with the job. See https://github.com/fish-shell/fish-shell/issues/877 for how this could manifest.
With this change, jobs only track their block-level redirections. Process level redirections are correctly associated with the process, and at exec time we stitch them together (block, pipe, and process redirects).
This fixes the weird issues where redirects bleed across pipelines (like #877), and also allows us to play with the order in which redirections are applied, since the final list is constructed right before it's needed. This lets us put pipes after block level redirections but before process level redirections, so that a 2>&1-type redirection gets picked up after the pipe, i.e. it should fix https://github.com/fish-shell/fish-shell/issues/110
This is a significant change. The tests all pass. Cross your fingers.
2013-08-20 07:16:41 +08:00
|
|
|
const io_chain_t all_ios = j->all_io_redirections();
|
2016-04-29 10:41:54 +08:00
|
|
|
for (size_t idx = 0; idx < all_ios.size(); idx++) {
|
Big fat refactoring of how redirections work. In fish 1.x and 2.0.0, the redirections for a process were flattened into a big list associated with the job, so there was no way to tell which redirections applied to each process. Each process therefore got all the redirections associated with the job. See https://github.com/fish-shell/fish-shell/issues/877 for how this could manifest.
With this change, jobs only track their block-level redirections. Process level redirections are correctly associated with the process, and at exec time we stitch them together (block, pipe, and process redirects).
This fixes the weird issues where redirects bleed across pipelines (like #877), and also allows us to play with the order in which redirections are applied, since the final list is constructed right before it's needed. This lets us put pipes after block level redirections but before process level redirections, so that a 2>&1-type redirection gets picked up after the pipe, i.e. it should fix https://github.com/fish-shell/fish-shell/issues/110
This is a significant change. The tests all pass. Cross your fingers.
2013-08-20 07:16:41 +08:00
|
|
|
const shared_ptr<io_data_t> &io = all_ios.at(idx);
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
if ((io->io_mode == IO_BUFFER)) {
|
2016-07-31 03:01:37 +08:00
|
|
|
io_buffer_t *io_buffer = static_cast<io_buffer_t *>(io.get());
|
2017-07-27 11:17:04 +08:00
|
|
|
assert(!io_buffer->is_input);
|
2018-05-28 16:27:26 +08:00
|
|
|
stdout_read_limit = io_buffer->buffer().limit();
|
2012-11-19 08:30:30 +08:00
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
}
|
|
|
|
|
2017-01-24 01:28:34 +08:00
|
|
|
if (j->processes.front()->type == INTERNAL_EXEC) {
|
2018-10-18 09:07:45 +08:00
|
|
|
internal_exec(j.get(), std::move(all_ios));
|
2016-11-02 12:19:34 +08:00
|
|
|
DIE("this should be unreachable");
|
2012-11-19 08:30:30 +08:00
|
|
|
}
|
2016-04-29 10:41:54 +08:00
|
|
|
|
|
|
|
// We may have block IOs that conflict with fd redirections. For example, we may have a command
|
|
|
|
// with a redireciton like <&3; we may also have chosen 3 as the fd for our pipe. Ensure we have
|
|
|
|
// no conflicts.
|
2018-09-29 12:13:13 +08:00
|
|
|
for (const auto io : all_ios) {
|
2016-04-29 10:41:54 +08:00
|
|
|
if (io->io_mode == IO_BUFFER) {
|
2018-09-29 12:13:13 +08:00
|
|
|
auto *io_buffer = static_cast<io_buffer_t *>(io.get());
|
2016-04-29 10:41:54 +08:00
|
|
|
if (!io_buffer->avoid_conflicts_with_io_chain(all_ios)) {
|
|
|
|
// We could not avoid conflicts, probably due to fd exhaustion. Mark an error.
|
2015-01-08 10:07:06 +08:00
|
|
|
exec_error = true;
|
2018-11-04 15:58:44 +08:00
|
|
|
job_mark_process_as_failed(j, j->processes.front().get());
|
2015-01-08 10:07:06 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-02-01 07:57:08 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// This loop loops over every process_t in the job, starting it as appropriate. This turns out
|
|
|
|
// to be rather complex, since a process_t can be one of many rather different things.
|
|
|
|
//
|
|
|
|
// The loop also has to handle pipelining between the jobs.
|
|
|
|
//
|
|
|
|
// We can have up to three pipes "in flight" at a time:
|
|
|
|
//
|
|
|
|
// 1. The pipe the current process should read from (courtesy of the previous process)
|
|
|
|
// 2. The pipe that the current process should write to
|
|
|
|
// 3. The pipe that the next process should read from (courtesy of us)
|
|
|
|
//
|
2018-09-02 05:48:22 +08:00
|
|
|
autoclose_fd_t pipe_next_read;
|
2018-11-19 07:14:08 +08:00
|
|
|
for (const auto &unique_p : j->processes) {
|
2018-09-02 05:48:22 +08:00
|
|
|
autoclose_fd_t current_read = std::move(pipe_next_read);
|
2018-11-04 15:58:44 +08:00
|
|
|
if (!exec_process_in_job(parser, unique_p.get(), j, std::move(current_read),
|
2018-09-04 02:18:39 +08:00
|
|
|
&pipe_next_read, all_ios, stdout_read_limit)) {
|
2018-09-02 05:48:22 +08:00
|
|
|
exec_error = true;
|
2017-01-24 01:28:34 +08:00
|
|
|
break;
|
|
|
|
}
|
2012-11-19 08:30:30 +08:00
|
|
|
}
|
2018-09-02 05:25:44 +08:00
|
|
|
pipe_next_read.close();
|
2016-04-29 10:41:54 +08:00
|
|
|
|
2018-10-09 01:44:47 +08:00
|
|
|
debug(3, L"Created job %d from command '%ls' with pgrp %d", j->job_id, j->command_wcstr(),
|
|
|
|
j->pgid);
|
2018-10-03 00:19:56 +08:00
|
|
|
|
2018-10-03 01:30:23 +08:00
|
|
|
j->set_flag(job_flag_t::CONSTRUCTED, true);
|
|
|
|
if (!j->is_foreground()) {
|
2018-11-04 10:28:16 +08:00
|
|
|
env_set_one(L"last_pid", ENV_GLOBAL, to_string(j->pgid));
|
2012-11-19 08:30:30 +08:00
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2018-11-19 07:14:08 +08:00
|
|
|
if (exec_error) {
|
|
|
|
return false;
|
2012-11-19 08:30:30 +08:00
|
|
|
}
|
2018-11-19 07:14:08 +08:00
|
|
|
|
|
|
|
j->continue_job(false);
|
|
|
|
return true;
|
2011-12-27 11:18:46 +08:00
|
|
|
}
|
2010-09-18 09:51:16 +08:00
|
|
|
|
2017-07-27 11:17:04 +08:00
|
|
|
static int exec_subshell_internal(const wcstring &cmd, wcstring_list_t *lst, bool apply_exit_status,
|
|
|
|
bool is_subcmd) {
|
2012-02-27 05:27:31 +08:00
|
|
|
ASSERT_IS_MAIN_THREAD();
|
2017-06-20 12:05:34 +08:00
|
|
|
bool prev_subshell = is_subshell;
|
2013-02-01 07:57:08 +08:00
|
|
|
const int prev_status = proc_get_last_status();
|
2016-04-29 10:41:54 +08:00
|
|
|
bool split_output = false;
|
2014-01-15 17:40:40 +08:00
|
|
|
|
2017-08-28 15:25:41 +08:00
|
|
|
const auto ifs = env_get(L"IFS");
|
2016-04-29 10:41:54 +08:00
|
|
|
if (!ifs.missing_or_empty()) {
|
|
|
|
split_output = true;
|
2012-11-19 08:30:30 +08:00
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2017-06-20 12:05:34 +08:00
|
|
|
is_subshell = true;
|
2016-04-29 10:41:54 +08:00
|
|
|
int subcommand_status = -1; // assume the worst
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// IO buffer creation may fail (e.g. if we have too many open files to make a pipe), so this may
|
|
|
|
// be null.
|
2017-07-27 11:17:04 +08:00
|
|
|
const shared_ptr<io_buffer_t> io_buffer(
|
|
|
|
io_buffer_t::create(STDOUT_FILENO, io_chain_t(), is_subcmd ? read_byte_limit : 0));
|
2016-04-29 10:41:54 +08:00
|
|
|
if (io_buffer.get() != NULL) {
|
2013-01-30 18:22:38 +08:00
|
|
|
parser_t &parser = parser_t::principal_parser();
|
2016-04-29 10:41:54 +08:00
|
|
|
if (parser.eval(cmd, io_chain_t(io_buffer), SUBST) == 0) {
|
2013-02-01 07:57:08 +08:00
|
|
|
subcommand_status = proc_get_last_status();
|
2013-01-30 18:22:38 +08:00
|
|
|
}
|
2013-02-01 07:57:08 +08:00
|
|
|
|
2013-01-30 18:22:38 +08:00
|
|
|
io_buffer->read();
|
2012-11-19 08:30:30 +08:00
|
|
|
}
|
2012-11-18 18:23:22 +08:00
|
|
|
|
2018-05-28 16:27:26 +08:00
|
|
|
if (io_buffer->buffer().discarded()) subcommand_status = STATUS_READ_TOO_MUCH;
|
2017-07-27 11:17:04 +08:00
|
|
|
|
2016-04-29 10:41:54 +08:00
|
|
|
// If the caller asked us to preserve the exit status, restore the old status. Otherwise set the
|
|
|
|
// status of the subcommand.
|
2013-02-01 07:57:08 +08:00
|
|
|
proc_set_last_status(apply_exit_status ? subcommand_status : prev_status);
|
2012-11-19 08:30:30 +08:00
|
|
|
is_subshell = prev_subshell;
|
2012-12-21 04:25:35 +08:00
|
|
|
|
2016-10-31 07:04:13 +08:00
|
|
|
if (lst == NULL || io_buffer.get() == NULL) {
|
|
|
|
return subcommand_status;
|
|
|
|
}
|
2018-05-30 12:11:50 +08:00
|
|
|
// Walk over all the elements.
|
|
|
|
for (const auto &elem : io_buffer->buffer().elements()) {
|
|
|
|
if (elem.is_explicitly_separated()) {
|
|
|
|
// Just append this one.
|
|
|
|
lst->push_back(str2wcstring(elem.contents));
|
|
|
|
continue;
|
|
|
|
}
|
2014-08-29 09:27:23 +08:00
|
|
|
|
2018-05-30 12:11:50 +08:00
|
|
|
// Not explicitly separated. We have to split it explicitly.
|
|
|
|
assert(!elem.is_explicitly_separated() && "should not be explicitly separated");
|
|
|
|
const char *begin = elem.contents.data();
|
|
|
|
const char *end = begin + elem.contents.size();
|
|
|
|
if (split_output) {
|
|
|
|
const char *cursor = begin;
|
|
|
|
while (cursor < end) {
|
|
|
|
// Look for the next separator.
|
|
|
|
const char *stop = (const char *)memchr(cursor, '\n', end - cursor);
|
|
|
|
const bool hit_separator = (stop != NULL);
|
|
|
|
if (!hit_separator) {
|
|
|
|
// If it's not found, just use the end.
|
|
|
|
stop = end;
|
|
|
|
}
|
|
|
|
// Stop now points at the first character we do not want to copy.
|
|
|
|
lst->push_back(str2wcstring(cursor, stop - cursor));
|
2016-10-31 07:04:13 +08:00
|
|
|
|
2018-05-30 12:11:50 +08:00
|
|
|
// If we hit a separator, skip over it; otherwise we're at the end.
|
|
|
|
cursor = stop + (hit_separator ? 1 : 0);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// We're not splitting output, but we still want to trim off a trailing newline.
|
|
|
|
if (end != begin && end[-1] == '\n') {
|
|
|
|
--end;
|
|
|
|
}
|
|
|
|
lst->push_back(str2wcstring(begin, end - begin));
|
2012-11-18 18:23:22 +08:00
|
|
|
}
|
|
|
|
}
|
2012-12-21 04:25:35 +08:00
|
|
|
|
2013-02-01 07:57:08 +08:00
|
|
|
return subcommand_status;
|
2005-09-20 21:26:39 +08:00
|
|
|
}
|
2012-02-08 15:35:41 +08:00
|
|
|
|
2017-07-27 11:17:04 +08:00
|
|
|
int exec_subshell(const wcstring &cmd, std::vector<wcstring> &outputs, bool apply_exit_status,
|
|
|
|
bool is_subcmd) {
|
2012-02-27 05:27:31 +08:00
|
|
|
ASSERT_IS_MAIN_THREAD();
|
2017-07-27 11:17:04 +08:00
|
|
|
return exec_subshell_internal(cmd, &outputs, apply_exit_status, is_subcmd);
|
2012-02-08 15:35:41 +08:00
|
|
|
}
|
|
|
|
|
2017-07-27 11:17:04 +08:00
|
|
|
int exec_subshell(const wcstring &cmd, bool apply_exit_status, bool is_subcmd) {
|
2012-02-27 05:27:31 +08:00
|
|
|
ASSERT_IS_MAIN_THREAD();
|
2017-07-27 11:17:04 +08:00
|
|
|
return exec_subshell_internal(cmd, NULL, apply_exit_status, is_subcmd);
|
2012-02-08 15:35:41 +08:00
|
|
|
}
|