[Cmake-commits] [cmake-commits] hoffman committed NSIS.template.in 1.41 1.42

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv14610

Modified Files:
	NSIS.template.in 
Log Message:
Fix for bug #10257, NSIS could remove a PATH if it was too long


Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -C 2 -d -r1.41 -r1.42
*** NSIS.template.in	15 Dec 2009 18:12:05 -0000	1.41
--- NSIS.template.in	9 Feb 2010 18:57:46 -0000	1.42
***************
*** 214,217 ****
--- 214,226 ----
   
    ReadEnvStr $1 PATH
+   ; if the path is too long for a NSIS variable NSIS will return a 0 
+   ; length string.  If we find that, then warn and skip any path
+   ; modification as it will trash the existing path.
+   StrLen $2 $1
+   IntCmp $2 0 CheckPathLength_ShowPathWarning CheckPathLength_Done CheckPathLength_Done
+     CheckPathLength_ShowPathWarning:
+     Messagebox MB_OK|MB_ICONEXCLAMATION "Warning! PATH too long installer unable to modify PATH!"
+     Goto AddToPath_done
+   CheckPathLength_Done:
    Push "$1;"
    Push "$0;"