SQL Kerberos principal changes; switching some uses of OS.Path.joinDirFile to OS...

[hcoop/domtool2.git] / src / plugins / hcoop.sml

diff --git a/src/plugins/hcoop.sml b/src/plugins/hcoop.sml
index 288d984..93d98ec 100644 (file)
--- a/src/plugins/hcoop.sml
+++ b/src/plugins/hcoop.sml
@@ -26,12 +26,14 @@ val dl = ErrorMsg.dummyLoc
 
 val _ = Env.type_one "homedir_path"
        Env.string
-       (fn dir => Domain.yourPath (OS.Path.joinDirFile {dir = Domain.homedir (),
-                                                        file = dir}))
+       (fn dir => Domain.yourPath (OS.Path.concat (Domain.homedir (), dir))
+                  handle OS.Path.InvalidArc => false
+                       | OS.Path.Path => false)
 
 val () = Env.registerFunction ("home",
-                              fn [(EString dir, _)] => SOME (EString (OS.Path.joinDirFile {dir = Domain.homedir (),
-                                                                                           file = dir}), dl)
+                              fn [(EString dir, _)] => (SOME (EString (OS.Path.concat (Domain.homedir (), dir)), dl)
+                                                        handle OS.Path.InvalidArc => NONE
+                                                             | OS.Path.Path => NONE)
                                | _ => NONE)
 
 end