# HG changeset patch
# User Adam Chlipala <adam@chlipala.net>
# Date 1425826505 14400
# Node ID 8beeb4f761b591910cf9f7667b7b4d6eee023ef6
# Parent  ec1614fb97bb0603ba7c058372dc481d92b83791
Fix interpretation of 'file' argument paths

diff -r ec1614fb97bb -r 8beeb4f761b5 src/settings.sml
--- a/src/settings.sml	Fri Mar 06 09:46:21 2015 -0500
+++ b/src/settings.sml	Sun Mar 08 10:55:05 2015 -0400
@@ -867,7 +867,7 @@
 
 fun addFile {Uri, LoadFromFilename} =
     let
-        val path = OS.Path.joinDirFile {dir = !filePath, file = LoadFromFilename}
+        val path = OS.Path.mkAbsolute {relativeTo = !filePath, path = LoadFromFilename}
     in
         case SM.find (!files, Uri) of
             SOME (path', _) =>
diff -r ec1614fb97bb -r 8beeb4f761b5 tests/files.urp
--- a/tests/files.urp	Fri Mar 06 09:46:21 2015 -0500
+++ b/tests/files.urp	Sun Mar 08 10:55:05 2015 -0400
@@ -1,6 +1,6 @@
 rewrite all Files/*
 file /hello_world.txt hello.txt
 file /img/web.png web.png
-file /files.urp files.urp
+file /files.urp ./files.urp
 
 files