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

Revert shared_ptr<io_data_t> changes until kinks are ironed out

Browse Source 
https://github.com/fish-shell/fish-shell/pull/487

Revert "Merge branch 'oo-io' of git://github.com/xiaq/fish-shell into xiaq-oo-io"

This reverts commit f3c8f535a4, reversing
changes made to b02f6cf3bc.

Also reverts ac023f7588 and a79d3c680c
This commit is contained in:
ridiculousfish
2013-01-04 02:03:41 -08:00
parent a79d3c680c
commit 77f1b1f0fe
7 changed files with 119 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
postfork.cpp
View File

@@ -117,7 +117,7 @@ static void free_redirected_fds_from_pipes(io_chain_t &io_chain)
for (size_t j = 0; j < max; j++)
{
/* We're only interested in pipes */
io_data_t *possible_conflict = io_chain.at(j).get();
io_data_t *possible_conflict = io_chain.at(j);
if (possible_conflict->io_mode != IO_PIPE && possible_conflict->io_mode != IO_BUFFER)
continue;
@@ -166,7 +166,7 @@ static int handle_child_io(io_chain_t &io_chain)
free_redirected_fds_from_pipes(io_chain);
for (size_t idx = 0; idx < io_chain.size(); idx++)
{
io_data_t *io = io_chain.at(idx).get();
io_data_t *io = io_chain.at(idx);
int tmp;
if (io->io_mode == IO_FD && io->fd == io->param1.old_fd)
@@ -441,7 +441,7 @@ bool fork_actions_make_spawn_properties(posix_spawnattr_t *attr, posix_spawn_fil
for (size_t idx = 0; idx < j->io.size(); idx++)
{
shared_ptr<const io_data_t> io = j->io.at(idx);
const io_data_t *io = j->io.at(idx);
if (io->io_mode == IO_FD && io->fd == io->param1.old_fd)
{