From caa554dff9f589f865cfb36c479eafd468fb82b6 Mon Sep 17 00:00:00 2001 From: rainwater Date: Thu, 5 Sep 2002 19:39:48 +0000 Subject: [PATCH] Check for newline git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@932 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/nsExec/nsexec.c | 14 +++++++++++++- Plugins/nsExec.dll | Bin 20480 -> 20480 bytes 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Contrib/nsExec/nsexec.c b/Contrib/nsExec/nsexec.c index a4dcf469..f6565c22 100644 --- a/Contrib/nsExec/nsexec.c +++ b/Contrib/nsExec/nsexec.c @@ -149,6 +149,18 @@ int LogMessages(const char *pStr) { else pStr = i+1; } } + else if (my_strstr(pStr,"\n")) { + while (*pStr) { + char *i = my_strstr(pStr,"\n"); + if (i==0) { + LogMessage(pStr); + break; + } + *i=0; + LogMessage(pStr); + pStr = i+1; + } + } return 1; } @@ -174,7 +186,7 @@ char *my_strstr(const char *string, const char *strCharSet) { char *s1, *s2; size_t chklen; size_t i; - if (lstrlen(string) < lstrlen(strCharSet)) return 0; + if (lstrlen(string) < lstrlen(strCharSet)) return 0; if (!*strCharSet) return (char*)string; chklen=lstrlen(string)-lstrlen(strCharSet); for (i = 0; i < chklen; i++) { diff --git a/Plugins/nsExec.dll b/Plugins/nsExec.dll index 4f0ea9c98848276ed443cb7a94d83af00e287db6..a3c108b84c6b01e7c96a606b68200cf54628e75b 100644 GIT binary patch delta 905 zcmZWoO=uHA6rS0nHr6gpV>VW?G}@JDsS;t5C|xC$P%RYQG-0(?njS>f2!gP&hg#aw z7MhNM$n>C|8up^cHU~YZ1XFs@i$7RI58`b>g=(RwAo0ycQ^Y;Y&V1i{-}h$b&BOwp zSit$W!s61ccX#nUc1g=0&IfabnhHj zVV!O5gR!!j(7i$APN*iam((tbhC2Po-EAs>#naKsDwTMxW)y}K{Txuu7|gB5bqGx@ zJD+glnNlWJ;Hd5bMb(NsIp>-w83%26s$A7{(g^7MrxOClB*~Db6Lw|$^>K|Fa^qP& z2&86R1^enI&rBRgP1ASaApTGZpy+o_R*V~SCvh%?m4=milyR&$kY-IorW)MA0UDgyFxq*8 z=6alJydv#~#6pry`uwdt2x621Zx?N<!M+1+b%~@X|S^VI8>00t% z6yV(yFYR3s>l&a+v3NN6x(OapU38?wL3+tBc}6~xZ{!Er7E(f&LyO_(;TPfe;jiJJ S;rfUeX^ZTO9Ew2J`KI3^dl}sT delta 834 zcmZWnO=uHA6rNeP?Y1;FjoH)|E71m{wc@IqCDIhCgrX31n+?&Dk|2mK5f8#vL8(ot z1=BImGChc=uG>q6f|!GXRDvnJc#sG!;z6$q_7D)fu5UKdAnxJq%=f*YZ{B-_60} z7+XUKO;i_w=1C$XkW|QP?fK*X{Rf)Tc z#_je-5lA$sBS>vW8$d3bncZZssuGdaHDh$Tdl^gA=gSS8Y?NsFlv1HY(h(2A!=S-_ zBF5;lFN4=<-IoeWkT&UTGh+DH)937Jgmw1QB^lZzh9FFr=$!-iXUJqoNMF;3fYj{6 zP`>fVRACqySO3Co0Fyc+ej8^O#&GE|j&*FcqN#mbZAi1D(5{6xXxx)ZDa#og`2oRG z)m+w{V5X|s0q_8R4{1)6zV`RwDE;IQ_p$M$Nkj#0d6Y*w??p&u!-~>QQNq#kh-ly- z+pjbdi1(ipFfJK}K&G*wy)1pAp2_{2;$=k#1fP+`g<+XC1Ky1%EVgL#nd zV!%|(r+aDwEpY0a;7tyezI^NGmZvO9wXP+JXBt*%%jkn+&bf#3lKfI$li$m`a&P2@ b@<=HtL@||D%3Eba`K)X!-<9$iDcki2a908f