X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/6ae327f88a6be8efd02cfe4b713444f9f3ac2672..7db53a0b3693ddd01e6a36fc5bfb4ba56b4656eb:/src/slave.sml

diff --git a/src/slave.sml b/src/slave.sml
index 144a167..b0148f1 100644
--- a/src/slave.sml
+++ b/src/slave.sml
@@ -29,7 +29,7 @@ type file_status = {action : file_action,
 		    domain : string,
 		    dir : string,
 		    file : string}
-		   
+
 val fileHandler = ref (fn _ : file_status => ())
 val preHandler = ref (fn () => ())
 val postHandler = ref (fn () => ())
@@ -71,6 +71,15 @@ fun shellF (ss, msg) =
 	    ErrorMsg.error NONE (msg s)
     end
 
+fun hostname () =
+    let
+	val inf = TextIO.openIn "/etc/hostname"
+    in
+	case TextIO.inputLine inf of
+	    NONE => (TextIO.closeIn inf; raise Fail "No line in /etc/hostname")
+	  | SOME line => (TextIO.closeIn inf; String.substring (line, 0, size line - 1))
+    end
+
 fun concatTo p fname =
     let
 	fun visitDir dname =
@@ -98,7 +107,7 @@ fun concatTo p fname =
 	    end
     in
 	TextIO.closeOut (TextIO.openOut fname);
-	visitDir Config.resultRoot
+	visitDir (OS.Path.joinDirFile {dir = Config.resultRoot, file = hostname ()})
     end
 
 fun enumerateTo p sep fname =
@@ -106,7 +115,7 @@ fun enumerateTo p sep fname =
 	val outf = TextIO.openOut fname
 
 	val first = ref true
-	val baseLen = length (String.fields (fn ch => ch = #"/") Config.resultRoot)
+	val baseLen = length (String.fields (fn ch => ch = #"/") Config.resultRoot) + 1
 
 	fun visitDir dname =
 	    let
@@ -141,7 +150,29 @@ fun enumerateTo p sep fname =
 		loop ()
 	    end
     in
-	visitDir Config.resultRoot;
+	visitDir (OS.Path.joinDirFile {dir = Config.resultRoot, file = hostname ()});
+	TextIO.closeOut outf
+    end
+
+fun readList fname =
+    let
+	val inf = TextIO.openIn fname
+
+	fun loop acc =
+	    case TextIO.inputLine inf of
+		NONE => rev acc
+	      | SOME line => loop (String.substring (line, 0, size line - 1) :: acc)
+    in
+	loop []
+	before TextIO.closeIn inf
+    end
+
+fun writeList (fname, ls) =
+    let
+	val outf = TextIO.openOut fname
+    in
+	app (fn s => (TextIO.output (outf, s);
+		      TextIO.output1 (outf, #"\n"))) ls;
 	TextIO.closeOut outf
     end