2016-05-02 03:32:40 +00:00
|
|
|
// Utilities for io redirection.
|
2016-05-18 22:30:21 +00:00
|
|
|
#include "config.h" // IWYU pragma: keep
|
|
|
|
|
2015-07-25 15:14:25 +00:00
|
|
|
#include <assert.h>
|
2016-05-02 03:32:40 +00:00
|
|
|
#include <errno.h>
|
2016-04-21 06:00:54 +00:00
|
|
|
#include <stddef.h>
|
2016-05-02 03:32:40 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <unistd.h>
|
2006-02-28 13:17:16 +00:00
|
|
|
|
2005-10-08 11:20:51 +00:00
|
|
|
#include "common.h"
|
2016-05-02 03:32:40 +00:00
|
|
|
#include "exec.h"
|
|
|
|
#include "fallback.h" // IWYU pragma: keep
|
2005-10-08 11:20:51 +00:00
|
|
|
#include "io.h"
|
2016-05-02 03:32:40 +00:00
|
|
|
#include "wutil.h" // IWYU pragma: keep
|
2006-07-19 22:55:49 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
io_data_t::~io_data_t() {}
|
2013-01-09 07:49:12 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
void io_close_t::print() const { fprintf(stderr, "close %d\n", fd); }
|
2013-01-09 08:02:04 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
void io_fd_t::print() const { fprintf(stderr, "FD map %d -> %d\n", old_fd, fd); }
|
2013-01-15 07:37:33 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
void io_file_t::print() const { fprintf(stderr, "file (%s)\n", filename_cstr); }
|
2013-01-15 08:18:03 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
void io_pipe_t::print() const {
|
|
|
|
fprintf(stderr, "pipe {%d, %d} (input: %s)\n", pipe_fd[0], pipe_fd[1], is_input ? "yes" : "no");
|
2013-01-15 09:31:36 +00:00
|
|
|
}
|
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
void io_buffer_t::print() const {
|
|
|
|
fprintf(stderr, "buffer %p (input: %s, size %lu)\n", out_buffer_ptr(), is_input ? "yes" : "no",
|
|
|
|
(unsigned long)out_buffer_size());
|
2013-01-15 08:44:31 +00:00
|
|
|
}
|
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
void io_buffer_t::read() {
|
2013-01-15 09:31:36 +00:00
|
|
|
exec_close(pipe_fd[1]);
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
if (io_mode == IO_BUFFER) {
|
|
|
|
#if 0
|
|
|
|
if (fcntl( pipe_fd[0], F_SETFL, 0)) {
|
|
|
|
wperror( L"fcntl" );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2013-01-15 09:31:36 +00:00
|
|
|
debug(4, L"io_buffer_t::read: blocking read on fd %d", pipe_fd[0]);
|
2016-05-02 03:32:40 +00:00
|
|
|
while (1) {
|
2012-11-19 00:30:30 +00:00
|
|
|
char b[4096];
|
|
|
|
long l;
|
2016-05-02 03:32:40 +00:00
|
|
|
l = read_blocked(pipe_fd[0], b, 4096);
|
|
|
|
if (l == 0) {
|
2012-11-19 00:30:30 +00:00
|
|
|
break;
|
2016-05-02 03:32:40 +00:00
|
|
|
} else if (l < 0) {
|
|
|
|
// exec_read_io_buffer is only called on jobs that have exited, and will therefore
|
|
|
|
// never block. But a broken pipe seems to cause some flags to reset, causing the
|
|
|
|
// EOF flag to not be set. Therefore, EAGAIN is ignored and we exit anyway.
|
|
|
|
if (errno != EAGAIN) {
|
|
|
|
debug(1, _(L"An error occured while reading output from code block on file "
|
|
|
|
L"descriptor %d"),
|
2013-01-15 09:31:36 +00:00
|
|
|
pipe_fd[0]);
|
2013-01-15 09:10:40 +00:00
|
|
|
wperror(L"io_buffer_t::read");
|
2012-11-19 00:30:30 +00:00
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-11-19 00:30:30 +00:00
|
|
|
break;
|
2016-05-02 03:32:40 +00:00
|
|
|
} else {
|
2013-01-15 09:10:40 +00:00
|
|
|
out_buffer_append(b, l);
|
2012-11-19 00:30:30 +00:00
|
|
|
}
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
}
|
2005-10-08 11:20:51 +00:00
|
|
|
}
|
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
bool io_buffer_t::avoid_conflicts_with_io_chain(const io_chain_t &ios) {
|
2015-01-08 02:07:06 +00:00
|
|
|
bool result = pipe_avoid_conflicts_with_io_chain(this->pipe_fd, ios);
|
2016-05-02 03:32:40 +00:00
|
|
|
if (!result) {
|
2015-01-08 02:07:06 +00:00
|
|
|
wperror(L"dup");
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
2005-10-08 11:20:51 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
io_buffer_t *io_buffer_t::create(int fd, const io_chain_t &conflicts) {
|
2012-08-15 07:57:56 +00:00
|
|
|
bool success = true;
|
2014-03-16 02:49:55 +00:00
|
|
|
assert(fd >= 0);
|
|
|
|
io_buffer_t *buffer_redirect = new io_buffer_t(fd);
|
2012-11-19 00:30:30 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
if (exec_pipe(buffer_redirect->pipe_fd) == -1) {
|
2012-11-19 00:30:30 +00:00
|
|
|
debug(1, PIPE_ERROR);
|
|
|
|
wperror(L"pipe");
|
|
|
|
success = false;
|
2016-05-02 03:32:40 +00:00
|
|
|
} else if (!buffer_redirect->avoid_conflicts_with_io_chain(conflicts)) {
|
|
|
|
// The above call closes the fds on error.
|
2015-01-08 02:07:06 +00:00
|
|
|
success = false;
|
2016-05-02 03:32:40 +00:00
|
|
|
} else if (make_fd_nonblocking(buffer_redirect->pipe_fd[0]) != 0) {
|
2012-11-19 00:30:30 +00:00
|
|
|
debug(1, PIPE_ERROR);
|
|
|
|
wperror(L"fcntl");
|
|
|
|
success = false;
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
if (!success) {
|
2012-08-15 07:57:56 +00:00
|
|
|
delete buffer_redirect;
|
|
|
|
buffer_redirect = NULL;
|
|
|
|
}
|
2012-11-19 00:30:30 +00:00
|
|
|
return buffer_redirect;
|
2005-10-08 11:20:51 +00:00
|
|
|
}
|
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
io_buffer_t::~io_buffer_t() {
|
|
|
|
if (pipe_fd[0] >= 0) {
|
2013-01-30 10:22:38 +00:00
|
|
|
exec_close(pipe_fd[0]);
|
|
|
|
}
|
2016-05-02 03:32:40 +00:00
|
|
|
// Dont free fd for writing. This should already be free'd before calling exec_read_io_buffer on
|
|
|
|
// the buffer.
|
2005-10-08 11:20:51 +00:00
|
|
|
}
|
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
void io_chain_t::remove(const shared_ptr<const io_data_t> &element) {
|
|
|
|
// See if you can guess why std::find doesn't work here.
|
|
|
|
for (io_chain_t::iterator iter = this->begin(); iter != this->end(); ++iter) {
|
|
|
|
if (*iter == element) {
|
2012-08-15 07:57:56 +00:00
|
|
|
this->erase(iter);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2005-10-08 11:20:51 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
void io_chain_t::push_back(const shared_ptr<io_data_t> &element) {
|
|
|
|
// Ensure we never push back NULL.
|
2013-01-30 10:22:38 +00:00
|
|
|
assert(element.get() != NULL);
|
2013-02-22 21:20:27 +00:00
|
|
|
std::vector<shared_ptr<io_data_t> >::push_back(element);
|
2013-01-30 10:22:38 +00:00
|
|
|
}
|
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
void io_chain_t::push_front(const shared_ptr<io_data_t> &element) {
|
2013-08-18 23:55:01 +00:00
|
|
|
assert(element.get() != NULL);
|
|
|
|
this->insert(this->begin(), element);
|
|
|
|
}
|
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
void io_chain_t::append(const io_chain_t &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-19 23:16:41 +00:00
|
|
|
this->insert(this->end(), chain.begin(), chain.end());
|
|
|
|
}
|
|
|
|
|
2016-04-04 02:02:46 +00:00
|
|
|
#if 0
|
|
|
|
// This isn't used so the lint tools were complaining about its presence. I'm keeping it in the
|
|
|
|
// source because it could be useful for debugging.
|
2012-08-15 07:57:56 +00:00
|
|
|
void io_print(const io_chain_t &chain)
|
2005-10-08 11:20:51 +00:00
|
|
|
{
|
2012-08-15 07:57:56 +00:00
|
|
|
if (chain.empty())
|
|
|
|
{
|
|
|
|
fprintf(stderr, "Empty chain %p\n", &chain);
|
|
|
|
return;
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-08-15 07:57:56 +00:00
|
|
|
fprintf(stderr, "Chain %p (%ld items):\n", &chain, (long)chain.size());
|
2012-11-19 00:30:30 +00:00
|
|
|
for (size_t i=0; i < chain.size(); i++)
|
|
|
|
{
|
2016-02-02 23:39:35 +00:00
|
|
|
const shared_ptr<io_data_t> &io = chain.at(i);
|
2013-02-22 21:20:27 +00:00
|
|
|
if (io.get() == NULL)
|
|
|
|
{
|
|
|
|
fprintf(stderr, "\t(null)\n");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fprintf(stderr, "\t%lu: fd:%d, ", (unsigned long)i, io->fd);
|
|
|
|
io->print();
|
|
|
|
}
|
2012-08-15 07:57:56 +00:00
|
|
|
}
|
|
|
|
}
|
2016-04-04 02:02:46 +00:00
|
|
|
#endif
|
2005-10-08 11:20:51 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
/// If the given fd is used by the io chain, duplicates it repeatedly until an fd not used in the io
|
|
|
|
/// chain is found, or we run out. If we return a new fd or an error, closes the old one. Any fd
|
|
|
|
/// created is marked close-on-exec. Returns -1 on failure (in which case the given fd is still
|
|
|
|
/// closed).
|
|
|
|
static int move_fd_to_unused(int fd, const io_chain_t &io_chain) {
|
2015-01-08 02:07:06 +00:00
|
|
|
int new_fd = fd;
|
2016-05-02 03:32:40 +00:00
|
|
|
if (fd >= 0 && io_chain.get_io_for_fd(fd).get() != NULL) {
|
|
|
|
// We have fd >= 0, and it's a conflict. dup it and recurse. Note that we recurse before
|
|
|
|
// anything is closed; this forces the kernel to give us a new one (or report fd
|
|
|
|
// exhaustion).
|
2015-01-08 02:07:06 +00:00
|
|
|
int tmp_fd;
|
2016-05-02 03:32:40 +00:00
|
|
|
do {
|
2015-01-08 02:07:06 +00:00
|
|
|
tmp_fd = dup(fd);
|
|
|
|
} while (tmp_fd < 0 && errno == EINTR);
|
2016-05-02 03:32:40 +00:00
|
|
|
|
2015-01-08 02:07:06 +00:00
|
|
|
assert(tmp_fd != fd);
|
2016-05-02 03:32:40 +00:00
|
|
|
if (tmp_fd < 0) {
|
|
|
|
// Likely fd exhaustion.
|
2015-01-08 02:07:06 +00:00
|
|
|
new_fd = -1;
|
2016-05-02 03:32:40 +00:00
|
|
|
} else {
|
|
|
|
// Ok, we have a new candidate fd. Recurse. If we get a valid fd, either it's the same
|
|
|
|
// as what we gave it, or it's a new fd and what we gave it has been closed. If we get a
|
|
|
|
// negative value, the fd also has been closed.
|
2015-01-08 02:07:06 +00:00
|
|
|
set_cloexec(tmp_fd);
|
|
|
|
new_fd = move_fd_to_unused(tmp_fd, io_chain);
|
|
|
|
}
|
2016-05-02 03:32:40 +00:00
|
|
|
|
|
|
|
// We're either returning a new fd or an error. In both cases, we promise to close the old
|
|
|
|
// one.
|
2015-01-08 02:07:06 +00:00
|
|
|
assert(new_fd != fd);
|
|
|
|
int saved_errno = errno;
|
|
|
|
exec_close(fd);
|
|
|
|
errno = saved_errno;
|
|
|
|
}
|
|
|
|
return new_fd;
|
|
|
|
}
|
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
bool pipe_avoid_conflicts_with_io_chain(int fds[2], const io_chain_t &ios) {
|
2015-01-08 02:07:06 +00:00
|
|
|
bool success = true;
|
2016-05-02 03:32:40 +00:00
|
|
|
for (int i = 0; i < 2; i++) {
|
2015-01-08 02:07:06 +00:00
|
|
|
fds[i] = move_fd_to_unused(fds[i], ios);
|
2016-05-02 03:32:40 +00:00
|
|
|
if (fds[i] < 0) {
|
2015-01-08 02:07:06 +00:00
|
|
|
success = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2016-05-02 03:32:40 +00:00
|
|
|
|
|
|
|
// If any fd failed, close all valid fds.
|
|
|
|
if (!success) {
|
2015-01-08 02:07:06 +00:00
|
|
|
int saved_errno = errno;
|
2016-05-02 03:32:40 +00:00
|
|
|
for (int i = 0; i < 2; i++) {
|
|
|
|
if (fds[i] >= 0) {
|
2015-01-08 02:07:06 +00:00
|
|
|
exec_close(fds[i]);
|
|
|
|
fds[i] = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
errno = saved_errno;
|
|
|
|
}
|
|
|
|
return success;
|
|
|
|
}
|
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
/// Return the last IO for the given fd.
|
|
|
|
shared_ptr<const io_data_t> io_chain_t::get_io_for_fd(int fd) const {
|
2012-08-15 07:57:56 +00:00
|
|
|
size_t idx = this->size();
|
2016-05-02 03:32:40 +00:00
|
|
|
while (idx--) {
|
2016-02-02 23:39:35 +00:00
|
|
|
const shared_ptr<io_data_t> &data = this->at(idx);
|
2016-05-02 03:32:40 +00:00
|
|
|
if (data->fd == fd) {
|
2012-08-15 07:57:56 +00:00
|
|
|
return data;
|
|
|
|
}
|
|
|
|
}
|
2013-01-07 15:04:55 +00:00
|
|
|
return shared_ptr<const io_data_t>();
|
2012-08-15 07:57:56 +00:00
|
|
|
}
|
2005-10-09 11:48:16 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
shared_ptr<io_data_t> io_chain_t::get_io_for_fd(int fd) {
|
2012-08-15 07:57:56 +00:00
|
|
|
size_t idx = this->size();
|
2016-05-02 03:32:40 +00:00
|
|
|
while (idx--) {
|
2013-01-07 15:04:55 +00:00
|
|
|
const shared_ptr<io_data_t> &data = this->at(idx);
|
2016-05-02 03:32:40 +00:00
|
|
|
if (data->fd == fd) {
|
2012-08-15 07:57:56 +00:00
|
|
|
return data;
|
|
|
|
}
|
|
|
|
}
|
2013-01-07 15:04:55 +00:00
|
|
|
return shared_ptr<io_data_t>();
|
2012-08-15 07:57:56 +00:00
|
|
|
}
|
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
/// The old function returned the last match, so we mimic that.
|
|
|
|
shared_ptr<const io_data_t> io_chain_get(const io_chain_t &src, int fd) {
|
2012-08-15 07:57:56 +00:00
|
|
|
return src.get_io_for_fd(fd);
|
|
|
|
}
|
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
shared_ptr<io_data_t> io_chain_get(io_chain_t &src, int fd) { return src.get_io_for_fd(fd); }
|
2012-08-15 07:57:56 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
io_chain_t::io_chain_t(const shared_ptr<io_data_t> &data)
|
|
|
|
: std::vector<shared_ptr<io_data_t> >(1, data) {}
|
2014-04-11 16:50:12 +00:00
|
|
|
|
2016-05-02 03:32:40 +00:00
|
|
|
io_chain_t::io_chain_t() : std::vector<shared_ptr<io_data_t> >() {}
|