From b1016e6ea5355cb867c5f1a2af22c16916aca15f Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 24 Apr 2008 19:46:52 -0500
Subject: [PATCH] <monitor> and mmaped-file use normalize-path now

---
 extra/io/monitors/monitors.factor | 2 +-
 extra/io/unix/mmap/mmap.factor    | 4 ++--
 extra/io/windows/mmap/mmap.factor | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extra/io/monitors/monitors.factor b/extra/io/monitors/monitors.factor
index 863c8fc95c..fb404f24f5 100755
--- a/extra/io/monitors/monitors.factor
+++ b/extra/io/monitors/monitors.factor
@@ -39,7 +39,7 @@ M: monitor set-timeout (>>timeout) ;
 HOOK: (monitor) io-backend ( path recursive? mailbox -- monitor )
 
 : <monitor> ( path recursive? -- monitor )
-    <mailbox> (monitor) ;
+    >r normalize-path r> <mailbox> (monitor) ;
 
 : next-change ( monitor -- path changed )
     [ queue>> ] [ timeout ] bi mailbox-get-timeout first2 ;
diff --git a/extra/io/unix/mmap/mmap.factor b/extra/io/unix/mmap/mmap.factor
index 2815a49cd3..332c1927c8 100755
--- a/extra/io/unix/mmap/mmap.factor
+++ b/extra/io/unix/mmap/mmap.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien io io.files kernel math system unix io.unix.backend
-io.mmap ;
+io.mmap io.backend ;
 IN: io.unix.mmap
 
 : open-r/w ( path -- fd ) O_RDWR file-mode open dup io-error ;
@@ -11,7 +11,7 @@ IN: io.unix.mmap
     over MAP_FAILED = [ close (io-error) ] when ;
 
 M: unix <mapped-file> ( path length -- obj )
-    swap >r
+    swap normalize-path >r
     dup PROT_READ PROT_WRITE bitor MAP_FILE MAP_SHARED bitor
     r> mmap-open f mapped-file boa ;
 
diff --git a/extra/io/windows/mmap/mmap.factor b/extra/io/windows/mmap/mmap.factor
index 0164ed1697..96b68d5a6d 100755
--- a/extra/io/windows/mmap/mmap.factor
+++ b/extra/io/windows/mmap/mmap.factor
@@ -61,6 +61,7 @@ M: wince with-privileges
     nip call ;
 
 : mmap-open ( path access-mode create-mode flProtect access -- handle handle address )
+    >r >r >r >r normalize-path r> r> r> r>
     { "SeCreateGlobalPrivilege" "SeLockMemoryPrivilege" } [
         >r >r 0 open-file dup f r> 0 0 f
         CreateFileMapping [ win32-error=0/f ] keep