[Win32forth-cvs] win32forth/src paths.f,1.18,1.19

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26664/src

Modified Files:
	paths.f 
Log Message:
Jos Solved the upstart error when Wined is compiled with the setup. Also solved the network drive problem that was reported by Dirk.

Index: paths.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/paths.f,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** paths.f	30 Jul 2006 12:49:06 -0000	1.18
--- paths.f	30 Jul 2006 20:52:38 -0000	1.19
***************
*** 95,99 ****
  
                  2dup s" %FORTHDIR%"   ISTR= if 2drop &forthdir    dup ?+\ count "path-only" exit then
!                 2dup s" %CURRENTDIR%" ISTR= if 2drop current-dir$ dup ?+\ count "path-only" exit then
                  2dup s" %APPDIR%"     ISTR= if 2drop &prognam             count "path-only" exit then
                  ;
--- 95,99 ----
  
                  2dup s" %FORTHDIR%"   ISTR= if 2drop &forthdir    dup ?+\ count "path-only" exit then
!                 2dup s" %CURRENTDIR%" ISTR= if 2drop  s" ."                                 exit then
                  2dup s" %APPDIR%"     ISTR= if 2drop &prognam             count "path-only" exit then
                  ;
***************
*** 149,152 ****
--- 149,160 ----
  INTERNAL
  
+ : volume-indication? ( adr - flag )
+ \ *G True when the counted string at adr starts with x: or \\name
+     dup 2 + c@ ascii : <>
+         if      count drop 2 s" \\" compare 0=
+         else    drop true
+         then
+  ;
+ 
  6 PROC SearchPath
  : full-path  { a1 n1 path-ptr \ searchpath$ filename$ current$ -- a2 n2 f1 }
***************
*** 159,163 ****
                  path-ptr first-path"
                  begin   dup>r searchpath$ place searchpath$ +null
!                         searchpath$ 2 + c@ ascii : =     \ Test for another volume
                                  if   searchpath$ char+ $current-dir!  \ 0 fails, then try next
                                  else true
--- 167,171 ----
                  path-ptr first-path"
                  begin   dup>r searchpath$ place searchpath$ +null
!                         searchpath$  volume-indication?   \ Test for another volume
                                  if   searchpath$ char+ $current-dir!  \ 0 fails, then try next
                                  else true
***************
*** 187,192 ****
  \ *G Initialize the Forth directory search path list.
                  path-ptr off \ clear path list
- \                s" ."       "fpath+ \ current dir is first
- \                &forthdir count "fpath+
                  s" %CURRENTDIR%" "fpath+
                  s" %FORTHDIR%"   "fpath+
--- 195,198 ----