mirror of
https://github.com/fish-shell/fish-shell
synced 2024-11-14 08:58:01 +00:00
4899086b3c
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.
293 lines
6.4 KiB
C++
293 lines
6.4 KiB
C++
/** \file io.c
|
|
|
|
Utilities for io redirection.
|
|
|
|
*/
|
|
#include "config.h"
|
|
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <wchar.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <sys/types.h>
|
|
#include <set>
|
|
#include <algorithm>
|
|
|
|
#ifdef HAVE_SYS_IOCTL_H
|
|
#include <sys/ioctl.h>
|
|
#endif
|
|
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
|
|
#if HAVE_NCURSES_H
|
|
#include <ncurses.h>
|
|
#else
|
|
#include <curses.h>
|
|
#endif
|
|
|
|
#if HAVE_TERM_H
|
|
#include <term.h>
|
|
#elif HAVE_NCURSES_TERM_H
|
|
#include <ncurses/term.h>
|
|
#endif
|
|
|
|
#include "fallback.h"
|
|
#include "util.h"
|
|
|
|
#include "wutil.h"
|
|
#include "exec.h"
|
|
#include "common.h"
|
|
#include "io.h"
|
|
|
|
|
|
io_data_t::~io_data_t()
|
|
{
|
|
}
|
|
|
|
void io_close_t::print() const
|
|
{
|
|
fprintf(stderr, "close %d\n", fd);
|
|
}
|
|
|
|
void io_fd_t::print() const
|
|
{
|
|
fprintf(stderr, "FD map %d -> %d\n", old_fd, fd);
|
|
}
|
|
|
|
void io_file_t::print() const
|
|
{
|
|
fprintf(stderr, "file (%s)\n", filename_cstr);
|
|
}
|
|
|
|
void io_pipe_t::print() const
|
|
{
|
|
fprintf(stderr, "pipe {%d, %d} (input: %s)\n", pipe_fd[0], pipe_fd[1],
|
|
is_input ? "yes" : "no");
|
|
}
|
|
|
|
void io_buffer_t::print() const
|
|
{
|
|
fprintf(stderr, "buffer %p (input: %s, size %lu)\n", out_buffer_ptr(),
|
|
is_input ? "yes" : "no", out_buffer_size());
|
|
}
|
|
|
|
void io_buffer_t::read()
|
|
{
|
|
exec_close(pipe_fd[1]);
|
|
|
|
if (io_mode == IO_BUFFER)
|
|
{
|
|
/* if( fcntl( pipe_fd[0], F_SETFL, 0 ) )
|
|
{
|
|
wperror( L"fcntl" );
|
|
return;
|
|
} */
|
|
debug(4, L"io_buffer_t::read: blocking read on fd %d", pipe_fd[0]);
|
|
while (1)
|
|
{
|
|
char b[4096];
|
|
long l;
|
|
l=read_blocked(pipe_fd[0], b, 4096);
|
|
if (l==0)
|
|
{
|
|
break;
|
|
}
|
|
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 descriptor %d"),
|
|
pipe_fd[0]);
|
|
wperror(L"io_buffer_t::read");
|
|
}
|
|
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
out_buffer_append(b, l);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
io_buffer_t *io_buffer_t::create(bool is_input, int fd)
|
|
{
|
|
bool success = true;
|
|
if (fd == -1)
|
|
{
|
|
fd = is_input ? STDIN_FILENO : STDOUT_FILENO;
|
|
}
|
|
io_buffer_t *buffer_redirect = new io_buffer_t(fd, is_input);
|
|
|
|
if (exec_pipe(buffer_redirect->pipe_fd) == -1)
|
|
{
|
|
debug(1, PIPE_ERROR);
|
|
wperror(L"pipe");
|
|
success = false;
|
|
}
|
|
else if (make_fd_nonblocking(buffer_redirect->pipe_fd[0]) != 0)
|
|
{
|
|
debug(1, PIPE_ERROR);
|
|
wperror(L"fcntl");
|
|
success = false;
|
|
}
|
|
|
|
if (! success)
|
|
{
|
|
delete buffer_redirect;
|
|
buffer_redirect = NULL;
|
|
}
|
|
else
|
|
{
|
|
//fprintf(stderr, "Created pipes {%d, %d} for %p\n", buffer_redirect->pipe_fd[0], buffer_redirect->pipe_fd[1], buffer_redirect);
|
|
}
|
|
|
|
return buffer_redirect;
|
|
}
|
|
|
|
io_buffer_t::~io_buffer_t()
|
|
{
|
|
|
|
//fprintf(stderr, "Deallocating pipes {%d, %d} for %p\n", this->pipe_fd[0], this->pipe_fd[1], this);
|
|
/**
|
|
If this is an input buffer, then io_read_buffer will not have
|
|
been called, and we need to close the output fd as well.
|
|
*/
|
|
if (is_input && pipe_fd[1] >= 0)
|
|
{
|
|
exec_close(pipe_fd[1]);
|
|
}
|
|
|
|
if (pipe_fd[0] >= 0)
|
|
{
|
|
exec_close(pipe_fd[0]);
|
|
}
|
|
|
|
/*
|
|
Dont free fd for writing. This should already be free'd before
|
|
calling exec_read_io_buffer on the buffer
|
|
*/
|
|
}
|
|
|
|
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)
|
|
{
|
|
this->erase(iter);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
void io_chain_t::push_back(const shared_ptr<io_data_t> &element)
|
|
{
|
|
// Ensure we never push back NULL
|
|
assert(element.get() != NULL);
|
|
std::vector<shared_ptr<io_data_t> >::push_back(element);
|
|
}
|
|
|
|
void io_chain_t::push_front(const shared_ptr<io_data_t> &element)
|
|
{
|
|
assert(element.get() != NULL);
|
|
this->insert(this->begin(), element);
|
|
}
|
|
|
|
void io_chain_t::append(const io_chain_t &chain)
|
|
{
|
|
this->insert(this->end(), chain.begin(), chain.end());
|
|
}
|
|
|
|
void io_remove(io_chain_t &list, const shared_ptr<const io_data_t> &element)
|
|
{
|
|
list.remove(element);
|
|
}
|
|
|
|
void io_print(const io_chain_t &chain)
|
|
{
|
|
if (chain.empty())
|
|
{
|
|
fprintf(stderr, "Empty chain %p\n", &chain);
|
|
return;
|
|
}
|
|
|
|
fprintf(stderr, "Chain %p (%ld items):\n", &chain, (long)chain.size());
|
|
for (size_t i=0; i < chain.size(); i++)
|
|
{
|
|
const shared_ptr<const io_data_t> &io = chain.at(i);
|
|
if (io.get() == NULL)
|
|
{
|
|
fprintf(stderr, "\t(null)\n");
|
|
}
|
|
else
|
|
{
|
|
fprintf(stderr, "\t%lu: fd:%d, ", (unsigned long)i, io->fd);
|
|
io->print();
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Return the last IO for the given fd */
|
|
shared_ptr<const io_data_t> io_chain_t::get_io_for_fd(int fd) const
|
|
{
|
|
size_t idx = this->size();
|
|
while (idx--)
|
|
{
|
|
const shared_ptr<const io_data_t> &data = this->at(idx);
|
|
if (data->fd == fd)
|
|
{
|
|
return data;
|
|
}
|
|
}
|
|
return shared_ptr<const io_data_t>();
|
|
}
|
|
|
|
shared_ptr<io_data_t> io_chain_t::get_io_for_fd(int fd)
|
|
{
|
|
size_t idx = this->size();
|
|
while (idx--)
|
|
{
|
|
const shared_ptr<io_data_t> &data = this->at(idx);
|
|
if (data->fd == fd)
|
|
{
|
|
return data;
|
|
}
|
|
}
|
|
return shared_ptr<io_data_t>();
|
|
}
|
|
|
|
/* 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)
|
|
{
|
|
return src.get_io_for_fd(fd);
|
|
}
|
|
|
|
shared_ptr<io_data_t> io_chain_get(io_chain_t &src, int fd)
|
|
{
|
|
return src.get_io_for_fd(fd);
|
|
}
|
|
|
|
io_chain_t::io_chain_t(const shared_ptr<io_data_t> &data) :
|
|
std::vector<shared_ptr<io_data_t> >(1, data)
|
|
{
|
|
|
|
}
|
|
|
|
io_chain_t::io_chain_t() : std::vector<shared_ptr<io_data_t> >()
|
|
{
|
|
}
|