dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make sure !system outputs whatever is left in the pipe even if there is no newline

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6940 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2017-10-24 13:19:00 +00:00
parent 6a5876bbc8
commit 39de85be70
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/util.cpp
View file

@ -1069,7 +1069,7 @@ switchcp: cp = orgwinconoutcp, mbtwcf = 0, utf8 = false;
if (--cch) wbuf[cchwb++] = wchbuf[1];
const bool fullbuf = cchwb+cch >= COUNTOF(wbuf)-1; // cch is 1 for surrogate pairs
if (!okr || fullbuf || L'\n' == wchbuf[0]) // Stop on \n so \r\n conversion has enough context (...\r\n vs ...\n)
{
{ finalwrite:
#ifdef MAKENSIS
extern WINSIO_OSDATA g_osdata_stdout;
WinStdIO_OStreamWrite(g_osdata_stdout, wbuf, cchwb); // Faster than _ftprintf
@ -1080,8 +1080,13 @@ switchcp: cp = orgwinconoutcp, mbtwcf = 0, utf8 = false;
cchwb = 0;
}
}
if (!okr) break;
if (!okr)
{
if (cchwb) goto finalwrite;
break;
}
}
fflush(g_output);
WaitForSingleObject(pi.hProcess, INFINITE);
GetExitCodeProcess(pi.hProcess, &childec);
CloseHandle(pi.hThread);