gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stdout being reopened without line buffering if redirection occurs before output has been written.

Browse Source
This commit is contained in:
Frederich Munch 2017-02-07 20:00:54 -05:00 committed by sftnight
parent d00a335350
commit 6054022ca3
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/MetaProcessor/MetaProcessor.cpp
View File

@ -135,22 +135,18 @@ namespace cling {
}
// Restore stdstream from backup and close the backup
void close(int oldfd, int newfd) {
void close(int &oldfd, int newfd) {
assert((newfd == STDOUT_FILENO || newfd == STDERR_FILENO) && "Not std FD");
assert(oldfd == m_Bak[newfd == STDERR_FILENO] && "Not backup FD");
if (oldfd != kInvalidFD) {
dup2(oldfd, newfd, "RedirectOutput::close");
::close(oldfd);
oldfd = kInvalidFD;
}
}
void reset(int oldfd, int newfd, FILE *F) {
fflush(F);
dup2(oldfd, newfd, "RedirectOutput::reset");
}
int restore(int FD, FILE *F, MetaProcessor::RedirectionScope Flag,
int bakFD) {
int &bakFD) {
// If no backup, we have never redirected the file, so nothing to restore
if (bakFD != kInvalidFD) {
// Find the last redirect for the scope, and restore redirection to it
@ -165,9 +161,10 @@ namespace cling {
}
// No redirection for this scope, restore to backup
reset(bakFD, FD, F);
fflush(F);
close(bakFD, FD);
}
return bakFD;
return kInvalidFD;
}
public:
@ -187,6 +184,12 @@ namespace cling {
// State 2, was tty to begin with, then redirected to stderr and back.
if (m_TTY == 2)
::freopen("CON", "w", stdout);
#else
// If redirection took place without writing anything to the terminal
// beforehand (--nologo) then the dup2 relinking stdout will have caused
// it to be re-opened without line buffering.
if (m_TTY)
::setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
#endif
}
@ -254,10 +257,12 @@ namespace cling {
return;
if (toBackup) {
if (m_Bak[0] != kInvalidFD)
reset(m_Bak[0], STDOUT_FILENO, stdout);
if (m_Bak[0] != kInvalidFD) {
fflush(stdout);
dup2(m_Bak[0], STDOUT_FILENO, "RedirectOutput::resetStdOut");
}
} else if (m_CurStdOut != kInvalidFD)
dup2(m_CurStdOut, STDOUT_FILENO, "RedirectOutput::reset");
dup2(m_CurStdOut, STDOUT_FILENO, "RedirectOutput::resetStdOut");
}
bool empty() const {