X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/e0b0abd209a1ecbd9266cfcf8735af171f96869b..7045a49957813a49569a9260753d8e60520e48c2:/src/slave.sml

diff --git a/src/slave.sml b/src/slave.sml
index 4e44a8b..719b417 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 () => ())
@@ -56,7 +56,12 @@ fun registerPostHandler handler =
     end
 
 fun handleChanges fs = (!preHandler ();
-			app (!fileHandler) fs;
+			app (fn recd as {action, file, ...} =>
+				(!fileHandler recd;
+				 if action = Delete andalso Posix.FileSys.access (file, []) then
+				     OS.FileSys.remove file
+				 else
+				     ())) fs;
 			!postHandler ())
 
 fun shell ss = OS.Process.isSuccess (OS.Process.system (String.concat ss))
@@ -71,6 +76,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 +112,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 =
@@ -141,7 +155,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