[popfile-commit] windows pfi-library.nsh,1.1,1.2

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv13613

Modified Files:
	pfi-library.nsh 
Log Message:
Use simpler code in GetSeparator function (only one character involved so TrimNewlines is inappropriate)

Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pfi-library.nsh	12 Jul 2003 11:54:15 -0000	1.1
--- pfi-library.nsh	12 Jul 2003 22:00:46 -0000	1.2
***************
*** 165,175 ****
  separator_done:
    FileClose ${L_CFG}
!   Push ${L_SEPARATOR}
!   Call TrimNewlines
!   Pop ${L_SEPARATOR}
! 
!   ; Use separator character from popfile.cfg (if present) otherwise use a semicolon
  
!   StrCmp ${L_SEPARATOR} "" 0 exit
    StrCpy ${L_SEPARATOR} ":"
  
--- 165,173 ----
  separator_done:
    FileClose ${L_CFG}
!   StrCmp ${L_SEPARATOR} "" default
!   StrCmp ${L_SEPARATOR} "$\r" default
!   StrCmp ${L_SEPARATOR} "$\n" 0 exit
  
! default:
    StrCpy ${L_SEPARATOR} ":"
  
***************
*** 360,364 ****
  #         Pop $R0
  #
! #         ($R0 at this point is ""C:\Program Files\Directory"\Whatever)
  #
  #--------------------------------------------------------------------------
--- 358,362 ----
  #         Pop $R0
  #
! #         ($R0 at this point is ""C:\Program Files\Directory\Whatever")
  #
  #--------------------------------------------------------------------------