diff -r 2f39aa4bebf3 -r 4a2c872b6513 lib/scripts/run-mlworks
--- a/lib/scripts/run-mlworks	Wed Dec 31 15:17:49 1997 +0100
+++ b/lib/scripts/run-mlworks	Wed Dec 31 15:19:51 1997 +0100
@@ -17,44 +17,39 @@
 }
 
 
-## basic setup
-
-EXIT="fun exit 0 : unit = (OS.Process.exit OS.Process.success): unit | exit _ = OS.Process.exit OS.Process.failure;"
-COMMIT="fun commit () = (Shell.saveImage (\"$OUTFILE\", false); true);"
-COMMIT_RO='fun commit () = (TextIO.output (TextIO.stdErr, "Error - Database is not opened for writing.\\n"); false);'
-
-
 ## prepare databases
 
 if [ -z "$INFILE" ]; then
+  EXIT="fun exit 0 = (OS.Process.exit OS.Process.success): unit | exit _ = OS.Process.exit OS.Process.failure;"
   MLWORKS="mlworks-basis -tty"
 else
+  EXIT=""
   MLWORKS="mlimage -load $INFILE -tty"
-  EXIT=""
 fi
 
-[ -z "$OUTFILE" ] && COMMIT="$COMMIT_RO"
-[ -n "$OUTFILE" -a -f "$OUTFILE" ] && { chmod +w "$OUTFILE" || fail_out; }
-
-MLTEXT="$EXIT $COMMIT $MLTEXT"
-MLEXIT="commit ();"
+if [ -z "$OUTFILE" ]; then
+  COMMIT='fun commit () = (TextIO.output (TextIO.stdErr, "Error - Database is not opened for writing.\n"); false);'
+else
+  COMMIT="fun commit () = (Shell.saveImage (\"$OUTFILE\", false); true);"
+  [ -f "$OUTFILE" ] && { chmod +w "$OUTFILE" || fail_out; }
+fi
 
 
 ## run it!
 
-START_MLWORKS="$ML_HOME/$MLWORKS 2>&1 $ML_OPTIONS"
+MLTEXT="$EXIT $COMMIT $MLTEXT"
+MLEXIT="commit();"
 
-if [ -n "$TERMINATE" ]; then
-  sh -c "echo '$MLTEXT' '$MLEXIT' | $START_MLWORKS"
-  RC=$?
-elif [ -z "$MLTEXT" ]; then
-  sh -c "{ $ISABELLE_HOME/lib/Tools/symbolinput; echo '$MLEXIT'; } | $START_MLWORKS"
-  RC=$?
+if [ -z "$TERMINATE" ]; then
+  FEEDER_OPTS="-s"
 else
-  sh -c "{ echo '$MLTEXT'; $ISABELLE_HOME/lib/Tools/symbolinput; echo '$MLEXIT'; } | $START_MLWORKS"
-  RC=$?
+  FEEDER_OPTS="-q"
 fi
 
-[ -n "$OUTFILE" -a -n "$NOWRITE" ] && chmod -w "$OUTFILE"
+$ISABELLE_HOME/lib/scripts/feeder -p -h "$MLTEXT" -t "$MLEXIT" $FEEDER_OPTS | \
+  { read FPID; $ML_HOME/$MLWORKS $ML_OPTIONS 2>&1; RC=$?; kill -HUP $FPID; exit $RC; }
+RC=$?
+
+[ -n "$OUTFILE" -a -f "$OUTFILE" -a -n "$NOWRITE" ] && chmod -w "$OUTFILE"
 
 exit $RC