--- gforth/fixpath.fs	2003/08/24 22:58:54	1.5
+++ gforth/fixpath.fs	2008/12/31 15:29:14	1.13
@@ -1,12 +1,12 @@
 \ fix path in gforth*.exe
 
-\ Copyright (C) 2000,2003 Free Software Foundation, Inc.
+\ Copyright (C) 2000,2003,2006,2007,2008 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,37 +15,37 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
-." Fixing " 3 arg type ."  with " 2 arg type cr
+." Fixing " 1 arg type ."  with " pad $1000 get-dir type cr
 
-$CCE0 Constant gforth.exe
-$C4F0 Constant gforth-fast.exe
-$89F0 Constant gforth-ditc.exe
-$6BF0 Constant gforth-itc.exe
-$6880 Constant gforth-prof.exe
+: "search s" .:/usr/local" ;
 
 include string.fs
 
-Variable path$  2 arg path$ $!
-Variable pathes$  2 arg pathes$ $!
+Variable path$  pad $1000 get-dir path$ $!
+Variable pathes$  pad $1000 get-dir 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
+1 arg fix-exe
 
 bye