From fabf2f79eae9e25807809732643ba4a193b6d509 Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 8 Aug 2003 13:56:41 +0000 Subject: [PATCH] Empty lines were not printed (this time it's really fixed) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2794 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/nsExec/nsexec.c | 3 +-- Plugins/nsExec.dll | Bin 6144 -> 6144 bytes 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Contrib/nsExec/nsexec.c b/Contrib/nsExec/nsexec.c index 48b472ce..b64937d3 100644 --- a/Contrib/nsExec/nsexec.c +++ b/Contrib/nsExec/nsexec.c @@ -230,14 +230,13 @@ void ExecScript(int log) { p = szUnusedBuf; // get the old left overs for (p2 = p; *p2; p2++) { - if (*p == '\r' || *p == '\n') - p++; if (*p2 == '\r') { *p2 = 0; continue; } if (*p2 == '\n') { *p2 = 0; + while (!*p && p != p2) p++; LogMessage(p); p = p2 + 1; } diff --git a/Plugins/nsExec.dll b/Plugins/nsExec.dll index 93225b7f3d13ba11ffd44693877c779891cb1ff4..e5336c803dfe057fbb9939bc88f2573c49e16f12 100644 GIT binary patch delta 384 zcmZoLXfT*?gX!6>iMPHnT5Z0_xQLlCZE^`~wMGXE1H*9^6%_*pfv^`ztPBj1tp_4Y z#CqL016~{ia>Ewqm@o*uNZc&WmcVG{#>BwzU(`f_L7>z1Nn`CBW<~~v5>Ct5FZ?aq zK&f8WFTnx9!NLDaU;Gy}0ICAZY@586-H0)G@&ooT#-hpQ9Kn1`85kHcB!E`_Fa7i4 z_~aQJF2PMe?cF~jt$#^MG z36X@O~(X_x6#(>bQgOgEeEGW}xu+f>j@!c5o9+bqy5 z+$`2C*Q~~Ds@ZI_WoBE=_L`kCyI}Uf?5Wv1Gd^=kb7%8#^Gx%Z7RxP;S$wcyvE;Fo Lv)o+B#KH&w1BZ*n delta 383 zcmZoLXfT*?gK65fiMPHnT5P_^xQLlCWpW8?wMH8Y1H*9^6%_*pfv^_|tPBj1tp_4Y z#CqL0177S0a>Ewqm@o*uh~F&EmcVG{!oz1Nn`CBW<~~v5>Ct5FZ?Z< zK&f8WFTnx9!NLDaU;Gy}0ICAZY?-{4-H0)8@&ooT#)8S_9Kn2x85kHcB!E`_Fa7i4 z=;Rq3E`bd|?cF~jt$#rHX6ayZa_nNXIy_mQQ&!yL-~ay@j(VxEIhk`V z%jSQ)Vl2QQ*(@g1#}Z*{8f}_pnrB*K+F?4`be8E7(~YJ(Oh1|aH03uFGt)NnH1jtL zHH$XOHmfq5Y&O$uiP>he-DW4u&Y9gadu;Z`jK^Hu+|fMLJl%Y{#ZrqS7Vj*WEV(RY LEH@W2u`mJv3$=#+