From 43cb9c03bcbfbac38bf4feff538c3fac4955cdfe Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 21 Mar 2003 12:38:11 +0000 Subject: [PATCH] Fixed TrimNewLines (thanks pengyou) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2348 212acab6-be3b-0410-9dea-997c60f758d6 --- Docs/src/usefulfunc.but | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/Docs/src/usefulfunc.but b/Docs/src/usefulfunc.but index beff0d53..5f777e49 100644 --- a/Docs/src/usefulfunc.but +++ b/Docs/src/usefulfunc.but @@ -39,23 +39,27 @@ \c ; modifies no other variables. \c \c Function TrimNewlines -\c Exch $R0 -\c Push $R1 -\c Push $R2 +\c Exch $R0 +\c Push $R1 +\c Push $R2 \c StrCpy $R1 0 -\c loop: -\c IntOp $R1 $R1 - 1 -\c StrCpy $R2 $R0 1 $R1 -\c StrCmp $R2 "$\r" loop -\c StrCmp $R2 "$\n" loop -\c IntOp $R1 $R1 + 1 -\c +\c +\c loop: +\c IntOp $R1 $R1 - 1 +\c StrCpy $R2 $R0 1 $R1 +\c StrCmp $R2 "$\r" loop +\c StrCmp $R2 "$\n" loop +\c IntOp $R1 $R1 + 1 +\c IntCmp $R1 0 no_trim_needed \c StrCpy $R0 $R0 $R1 -\c Pop $R2 -\c Pop $R1 -\c Exch $R0 +\c +\c no_trim_needed: +\c Pop $R2 +\c Pop $R1 +\c Exch $R0 \c FunctionEnd + \H{getparameters} Get command line parameters \c ; GetParameters