h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-28 04:51:15 -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
reader.cpp
View File

@@ -1014,7 +1014,7 @@ static void run_pager(const wcstring &prefix, int is_quoted, const std::vector<c
is_quoted?L"-q":L"",
prefix_esc.c_str());
shared_ptr<io_data_t> in(io_buffer_create(true));
io_data_t *in = io_buffer_create(true);
in->fd = 3;
escaped_separator = escape(COMPLETE_SEP_STR, 1);
@@ -1083,7 +1083,7 @@ static void run_pager(const wcstring &prefix, int is_quoted, const std::vector<c
term_donate();
shared_ptr<io_data_t> out(io_buffer_create(false));
io_data_t *out = io_buffer_create(false);
out->fd = 4;
parser_t &parser = parser_t::principal_parser();
@@ -1093,7 +1093,7 @@ static void run_pager(const wcstring &prefix, int is_quoted, const std::vector<c
parser.eval(cmd, io_chain, TOP);
term_steal();
io_buffer_read(out.get());
io_buffer_read(out);
int nil=0;
out->out_buffer_append((char *)&nil, 1);