h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-02 09:11:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

io_data_t to store the source_fd directly

Browse Source 
Now that all io_data_ts know their source fd, just store it directly in
the base class. This will simplify some uses of io_data_t.
This commit is contained in:
ridiculousfish
2019-12-29 15:14:08 -08:00
parent 5d55004841
commit 0af5608ce8
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/io.cpp
View File

@@ -30,13 +30,13 @@
io_data_t::~io_data_t() = default;
io_file_t::io_file_t(int f, autoclose_fd_t file)
: io_data_t(io_mode_t::file, f), file_fd_(std::move(file)) {
: io_data_t(io_mode_t::file, f, file_fd_.fd()), file_fd_(std::move(file)) {
assert(file_fd_.valid() && "File is not valid");
}
void io_close_t::print() const { std::fwprintf(stderr, L"close %d\n", fd); }
void io_fd_t::print() const { std::fwprintf(stderr, L"FD map %d -> %d\n", old_fd, fd); }
void io_fd_t::print() const { std::fwprintf(stderr, L"FD map %d -> %d\n", source_fd, fd); }
void io_file_t::print() const { std::fwprintf(stderr, L"file (%d)\n", file_fd_.fd()); }