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 3f6f5b8..93d98ec 100644 (file)
--- a/src/plugins/hcoop.sml
+++ b/src/plugins/hcoop.sml
@@ -26,14 +26,14 @@ val dl = ErrorMsg.dummyLoc
 
 val _ = Env.type_one "homedir_path"
        Env.string
-       (fn dir => Domain.yourPath (Config.homeBase ^ "/" ^ Domain.getUser () ^ "/home/" ^ 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 (Config.homeBase
-                                                                      ^ "/"
-                                                                      ^ Domain.getUser ()
-                                                                      ^ "/home/"
-                                                                      ^ 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