boost/nowide
2
0
Fork 0
mirror of https://github.com/boostorg/nowide.git synced 2026-02-22 03:22:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #56 from Flamefire/tie_streams

Browse Source 
Fix potentially untied streams
This commit is contained in:
Alexander Grund
2020-01-05 16:45:17 +01:00
committed by GitHub
parent be200b2b09 4955f32899
commit fc700c30bb
2 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/nowide/iostream.hpp
View File

@@ -44,7 +44,7 @@ namespace nowide {
void operator=(winconsole_ostream const &);
public:
winconsole_ostream(int fd);
winconsole_ostream(int fd, winconsole_ostream *tieStream);
~winconsole_ostream();
private:
@@ -57,7 +57,7 @@ namespace nowide {
void operator=(winconsole_istream const &);
public:
winconsole_istream();
explicit winconsole_istream(winconsole_ostream *tieStream);
~winconsole_istream();
private:

31
src/iostream.cpp
View File

@@ -103,7 +103,7 @@ namespace nowide {
static const int buffer_size = 1024;
char buffer_[buffer_size];
wchar_t wbuffer_[buffer_size]; // for null
wchar_t wbuffer_[buffer_size];
HANDLE handle_;
};
@@ -205,7 +205,7 @@ namespace nowide {
std::vector<char> pback_buffer_;
};
winconsole_ostream::winconsole_ostream(int fd) : std::ostream(0)
winconsole_ostream::winconsole_ostream(int fd, winconsole_ostream *tieStream) : std::ostream(0)
{
HANDLE h = 0;
switch(fd)
@@ -221,6 +221,8 @@ namespace nowide {
{
std::ostream::rdbuf(fd == 1 ? std::cout.rdbuf() : std::cerr.rdbuf());
}
if(tieStream)
tie(tieStream);
}
winconsole_ostream::~winconsole_ostream()
{
@@ -231,7 +233,7 @@ namespace nowide {
{}
}
winconsole_istream::winconsole_istream() : std::istream(0)
winconsole_istream::winconsole_istream(winconsole_ostream *tieStream) : std::istream(0)
{
HANDLE h = GetStdHandle(STD_INPUT_HANDLE);
if(is_atty_handle(h))
@@ -242,6 +244,8 @@ namespace nowide {
{
std::istream::rdbuf(std::cin.rdbuf());
}
if(tieStream)
tie(tieStream);
}
winconsole_istream::~winconsole_istream()
@@ -249,23 +253,10 @@ namespace nowide {
} // namespace details
details::winconsole_istream cin;
details::winconsole_ostream cout(1);
details::winconsole_ostream cerr(2);
details::winconsole_ostream clog(2);
namespace {
struct initialize
{
initialize()
{
boost::nowide::cin.tie(&boost::nowide::cout);
boost::nowide::cerr.tie(&boost::nowide::cout);
boost::nowide::clog.tie(&boost::nowide::cout);
}
} inst;
} // namespace
details::winconsole_ostream cout(1, NULL);
details::winconsole_istream cin(&cout);
details::winconsole_ostream cerr(2, &cout);
details::winconsole_ostream clog(2, &cout);
} // namespace nowide
} // namespace boost