[popfile-commit] windows CBP.nsh,1.4,1.5

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

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

Modified Files:
	CBP.nsh 
Log Message:
Add (limited) support for UNC format 'corpus' paths.

Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CBP.nsh	8 May 2003 13:58:53 -0000	1.4
--- CBP.nsh	8 May 2003 18:44:30 -0000	1.5
***************
*** 231,234 ****
--- 231,235 ----
    StrCpy ${CBP_L_TEMP} ${CBP_L_CORPUS} 2
    StrCmp ${CBP_L_TEMP} ".\" sub_folder
+   StrCmp ${CBP_L_TEMP} "\\" look_for_corpus_files
  
    StrCpy ${CBP_L_TEMP} ${CBP_L_CORPUS} 3
***************
*** 273,277 ****
    
  look_for_corpus_files:
- 
    ; Save path in INI file for later use by 'CBP_MakePOPFileBucket'
    
--- 274,277 ----
***************
*** 383,386 ****
--- 383,387 ----
    !define CBP_L_NAME          $R3    ; used when checking the corpus directory
    !define CBP_L_PTR           $R2    ; used to access the names in the bucket list
+   !define CBP_L_UNC           $R1    ; used to detect UNC-format 'corpus' paths
  
    Exch ${CBP_L_COUNT}         ; get number of buckets to be created
***************
*** 394,397 ****
--- 395,399 ----
    Push ${CBP_L_NAME}
    Push ${CBP_L_PTR}
+   Push ${CBP_L_UNC}
  
    ; Retrieve the corpus path (as determined by CBP_CheckCorpusStatus)
***************
*** 399,402 ****
--- 401,406 ----
    !insertmacro MUI_INSTALLOPTIONS_READ ${CBP_L_CORPUS} "${CBP_C_INIFILE}" \
        "CBP Data" "CorpusPath"
+       
+   StrCpy ${CBP_L_UNC} ${CBP_L_CORPUS} 2   ; will be "\\" for UNC-format paths
  
    ; Now we create the buckets selected by the user. At present this code is only executed
***************
*** 429,433 ****
--- 433,440 ----
    FileWrite ${CBP_L_FILE_HANDLE} "$\r$\n"
    FileClose ${CBP_L_FILE_HANDLE}
+   StrCmp ${CBP_L_UNC} "\\" ignore_errors
    IfErrors  incrm_ptr
+ 
+ ignore_errors:
    IntOp ${CBP_L_COUNT} ${CBP_L_COUNT} - 1
  
***************
*** 437,440 ****
--- 444,448 ----
  
  finished_now:
+   Pop ${CBP_L_UNC}
    Pop ${CBP_L_PTR}
    Pop ${CBP_L_NAME}
***************
*** 455,458 ****
--- 463,467 ----
    !undef CBP_L_NAME
    !undef CBP_L_PTR
+   !undef CBP_L_UNC
  
  FunctionEnd