From a3d6b9dc6b7de8c7d4d94bbeaa63b45988756a52 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 15 Nov 2002 16:05:18 +0000
Subject: [PATCH] \t works again, and stil 11kb

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1729 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/InstallOptions/InstallerOptions.cpp |  30 ++++++++++----------
 Plugins/InstallOptions.dll                  | Bin 11264 -> 11264 bytes
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index b7407ea5..a5dc69f0 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -527,32 +527,32 @@ bool ReadSettings(void) {
 
     pFields[nIdx].pszText = myGetProfileStringDup(szField, "TEXT");
     if (pFields[nIdx].nType == FIELD_LABEL) {
-      int j = 0;
-      for (int i = 0; pFields[nIdx].pszText[i]; i++, j++) {
-        if (pFields[nIdx].pszText[i] == '\\') {
-          switch (pFields[nIdx].pszText[i+1]) {
+      char *p1, *p2;
+      for (p1=p2=pFields[nIdx].pszText; *p1; p1++, p2++) {
+        if (*p1 == '\\') {
+          switch (p1[1]) {
             case 'n':
-              pFields[nIdx].pszText[j] = '\n';
+              *p2 = '\n';
               break;
             case 'r':
-              pFields[nIdx].pszText[j] = '\r';
+              *p2 = '\r';
+              break;
+            case 't':
+              *p2 = '\t';
               break;
-            //case 't':
-            //  pFields[nIdx].pszText[j] = '\t';
-            //  break;
             case '\\':
-              pFields[nIdx].pszText[j] = '\\';
+              *p2 = '\\';
               break;
             default:
-              i--;
-              j--;
+              p1--;
+              p2--;
               break;
           }
-          i++;
+          p1++;
         }
-        else pFields[nIdx].pszText[j] = pFields[nIdx].pszText[i];
+        else *p2 = *p1;
       }
-      pFields[nIdx].pszText[j] = 0;
+      *p2 = 0;
     }
 
     // pszState cannot be NULL (?)
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index 05a0fd11337f46551e7d040bd7b41c1caf5dda4c..6544f58b304feef006126ba5705995b1992f1c58 100644
GIT binary patch
delta 1478
zcmZuweQXnD7=N$rwvP3Sv9Yo-H)dfdklelR9e3AzZ#Q7dM}}-l*^0#oqBaDLNUMA-
zX>rrAbs)_dAuyG>iGXB5Mlc4^!Jw0m#K{O56CweHbDa?kPMMDLZ7KZ4A9wlX_dLJn
z_uTV57p@K0ZtFKV3Zes#QSU_WZZy1TRHFu@?xRW#*K^hL)W_7t&NT+3nGG5N*kbBB
ze$`Z^)!o(gww6V}(b`U4?{<0ZTbGcq2MzaBxEu#f0DL$78Q?gk?j18V<nf!!fkW%H
z0pRsUtO;3Tg)OHw0qX10bAY|!l7Wc*Z;-StzI0amjHG57y<Y#k*}zew1@7s3N@ubq
zWyV<jx*RH483B>+!vYADH;oOC_=2?k+iI$Q&=;6gKbRfJs~<E4tP4U50;c)%;@L5f
z8MnrOHExc9F>zxI_-4fon;o;t!y*WFg^Pi|Ht9Ans_PzY`#%pndrYoh5&_b)NgE`=
z`>pu<Q>0njOUQS-0@Lcd3{{%)Q0VbrASsRNjjW0GLKh7jtAPJpLZtVpV=WWL^`#0O
zP8FJ}EmvjB+)|IfoiP5EWNI!;grs;`vUu=sT~CeBqkdt*T&f1?&8c&BWT3?3gIP(B
zhm$UT7}=I`pJ<)1^nrUg<?hm+_%HDp_J+-XEJM$=5M%i!+3H%0e<evGl#@_l8B_oV
zh@6UCX{>PN#A_1suMJCe!TI6Gfz<!jOf_mPVDj~VD<`qc<W{wGOJbuDpR3sGokNlX
zBaJ>+PNbV)K#()ore3v9&gdd7EYnV@7F%uRz_6~z)2p>x>T9;As55G(?FKcybEmzX
zqP(5T*d7zLR?QgSLcOZCkJn0e4(YniHINBt?<e8r1Z+sc<^)`?cH~W2_ADV<tH^2I
zpANZaJ#gHlNspo}n(I-tL$f}LHfzHw<8)C!b}n)5r_@bUp;}eY-`Sr(WFo(p8Y?Qv
z{L%%0PM*1)w~NM^DYKe3wJ(&#=kZ1SI=+dI@~!+HzMDVIpXV?0zw&YZPySy%O|S^L
zLcZ{%fP|NX*M+sh24SnPL-<tqTsR?|7S0Qoh3mqQFf5D;>7ql-6N|;kVwt!=tQKp;
z^<qeTPizrSir2&px5M4;?r<M=ce{JtgYG+Smoy_JA!)W$Dfy))DJpH3K9bs{1JWVs
zsB}iUC|!|mNJG*cX;d;|3(m&*xCEDC8qdUKcs^c)7vtygD|j`26R*P|+=RE`4{-}_
z!yWiA{u-agz4#}56A$5g*d%Alc6ow4NiLO<EXw6_wOk`FlS6(vDDRYa%N_C&`Gnjf
z_sPaGTUnaoRAwl=A}e#0MT$pRrEE~b%6{dbLXNW-01E{`7M)Kw(>v%-=#%tWx|hC8
zU!(t^|Ds1}Ba_M487EW3$V?@(g4xJyVw#y<OdE5MIl{!4v&;qNI`bQIn;8i)0H#9=
z%!UPU5-f!rEQi%_1zZE)h9MY%JK%1(2OfZj;8EBO&%q0D0A7VR;qUMc9Dy0gj&e~U
znv4(<k%FE^m1r?~0j)%<P!NSt1nok*(E;=gI)VDoB{Ya`A&SjloooqP$|AOcl^3!e
zb}74@jj&O+jort7#U5j0><?@|`!k!yWpO!NAvcAa!MVAG+;g0ddzo9!t>>D#U0f@7
MQq7$fkJ6_90gM?P2><{9

delta 1499
zcmZuwe^3-v9DjSP{OaHiJ%mv4qE*kt;r6}VcK7xzn{-S?T31&J29u@M;gBgFW{KSu
zkm98QTUIk@nNC78I!>ph7J8^bj+rUhpf#h6j&7bzIvGl7+q)CVKm6y-XTP8C=kvbr
z`~7aPG+5fyYnpFqK9x&-(mc4_G%rDGHX*H@nq&f_wd2$V>bLM>Q$jM=k^sOOI?{QD
z_UN^PhOw#jNnqW$nH&v~GRxW}gnkwcbh{brb{c?v`A-1rH(Fb&BjEKVKLo6Le>wnV
zWudf~tkIor+ZY3NwTU)hsUI)_;PovcX=|zyIekA#O(`bXzDJ9Ib(X&5U&9y@(&=$s
zLRZ}~8&xwm1kiERFIxRG;^7dTxY}$D4wlzEuzI?cBEX*$2o5gvTY`hte!65v)Y?Tm
z(xR#4OpVgyEH8>CtTH>|>Y`$z4`LIj3Ey@LG7jJ?jTf>1reS#X!1ddubkoea7(w1b
z>&FRst3qGzP%v3<BEg2pNdJ_&h{>Z*8diF>@9)Wzr!r1pT>yMP#PW?3!;Q%|_*&8#
z!W_Jl@$DG$b?A?26U>iLUhNfgj=AERVGK3Zt7&FTozQ+V-y8Vf&OU6{bf+Dudh9T>
z>Q2TN9J+|nGj7BlV5wgN$asuQGbvcPK<2!}?3+iDNGO|xf(md0D+nD3MH}6WEm|HF
z=Kz02a0RHXnI4=EfUGYSJU%~B7@2k=Xo$qyTa(n~P86x=7{kxlVsno#fSzKG4?k4J
z*vra_V=n%|#wx}Z`Y!eX2+Xe8pdCn?khF=ESE09Qf25VBbPO0qH1R3DNAsi?Q(Lul
z>E|g+c!gy%MJ)~IWpvY2lXfw)l`7Fzj@I*5Trv!UuP1HRtK)E0489zP@5W%c)|@pl
zn<s&d9<s={hC{aB@ORRBu68tQbV1VHNUMH1dKXQyep0h#Gt`c-l>G(uWzNA7<d@UB
z#^<H{$N(^Q0s!;ESH_P@rp($1M^C^kWD9md5d1>D&?I~&v<th1y~3|TpKwvQD%=zj
z#8h#VI8J25sUj4M#K*<u;yYqUY!N>fw~Kqkec~yxPrN8z75@=wDP78xawUgUAc>M9
z&6Hl0Dy3H?P5M~+RQgKllMIP*O?7p;4!e%I&bazrNdY-So+g*b9{G8>Qf`p9$lK%{
z@*cTUJ|rKNd*uuApYq>w0#3mhI0xJDWL$s+tYSBwfxY-S{1UFhi}5mCha2&G_ygRE
zx8SWfjCbP*K8%myU+{U{kFR4|Nm0fq_bC&VeC0u<P;o0BWu{W01QsfO<qf4lX;Hpb
zI+Vjok8)Z$r(9O-g;NUiR9-DnpHXM4bJQxeT3xArsIFJL)gvmf17M~Aa5x2LyK|@W
zTW6nBclJ96orcrQj%0IKJ3EohXL%O0v)M{Ez<$JTVB6VUY=k|+_ONGJoxQ>Wm>7WR
zFbj@@_ruAs0E(~>y5ZBX0xpCBxE8(-TVWgA2|M5ccnBVaz3>eD9bSRg;7v%QRFr|T
z5QFj&L@rc>JZL5=M{`jnT8x&Xx6n$|g4Uxpv<r2hL+B(rjV_}Bl*FZRxg5jsoXWYm
zX&&wcZUI-#y~e%CwQ<|H2-n5^%$?%Sa+kQjxEov^@8DV9#XroK@U!>@{38B!{%yXI
RU&pueyZF6)pO!Ht`X2@)AGiPj