--- gforth/fixpath.fs	2006/04/08 13:50:42	1.7
+++ gforth/fixpath.fs	2006/04/09 13:52:46	1.8
@@ -18,33 +18,35 @@
 \ along with this program; if not, write to the Free Software
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
-." Fixing " 3 arg type ."  with " 2 arg type cr
+." Fixing " 2 arg type ."  with " 1 arg type cr
 
-$1601C Constant gforth.exe
-$18E94 Constant gforth-fast.exe
-$D6C8 Constant gforth-ditc.exe
-$C8B8 Constant gforth-itc.exe
-$FD78 Constant gforth-prof.exe
+: "search s" .:/usr/local" ;
 
 include string.fs
 
-Variable path$  2 arg path$ $!
-Variable pathes$  2 arg pathes$ $!
+Variable path$  1 arg path$ $!
+Variable pathes$  1 arg pathes$ $!
 Variable exe$
 
-\ pathes$ 1 1 $del s" /cygdrive/" pathes$ 0 $ins
-\ : fixpathes ( addr u -- )
-\   bounds ?DO  I c@ '\ = IF  '/ I c!  THEN  LOOP ;
-\ pathes$ $@ fixpathes
-s" .;" pathes$ 0 $ins
-
-: fix-exe ( offset addr u -- )
-  path$ $@ exe$ $! s" \" exe$ $+! exe$ $+!
+pathes$ 1 1 $del s" /cygdrive/" pathes$ 0 $ins
+: fixpathes ( addr u -- )
+  bounds ?DO  I c@ '\ = IF  '/ I c!  THEN  LOOP ;
+pathes$ $@ fixpathes
+s" .:" pathes$ 0 $ins
+
+0 Value #size
+0 Value #file
+: fix-exe ( addr u -- )
+  path$ $@ exe$ $! s" /" exe$ $+! exe$ $+!
   exe$ $@ r/w bin open-file throw >r
+  r@ file-size throw drop to #size
+  #size allocate throw to #file
+  #file #size r@ read-file throw drop
+  #file #size "search search 2drop #file -
   0 r@ reposition-file throw
   pathes$ $@ 2dup + 0 swap c! 1+ r@ write-file throw
   r> close-file throw ;
 
-3 arg evaluate 3 arg fix-exe
+2 arg fix-exe
 
 bye