lib/scripts/run-smlnj

   echo "Unable to create output heap file: \"$OUTFILE\"" >&2
   exit 2
 }
 
 
+## version specific stuff
+
+EXIT=""
+COMMIT=""
+FIXNAME=""
+
+case "$ML_SYSTEM" in
+  smlnj-1.0[678]*)
+    EXIT="val exit = System.Unix.exit;"
+    COMMIT="fun commit () = not (exportML\"$OUTFILE\");"
+    COMMIT_RO='fun commit () = (output (std_err, "Error - Database is not opened for writing.\\n"); false);'
+    ;;
+  smlnj-1.09*)
+    EXIT="fun exit 0 : unit = OS.Process.exit OS.Process.success | exit _ = OS.Process.exit OS.Process.failure;"
+    COMMIT="fun commit () = not (SMLofNJ.exportML\"$OUTFILE\");"
+    COMMIT_RO='fun commit () = (TextIO.output (TextIO.stdErr, "Error - Database is not opened for writing.\\n"); false);'
+    FIXNAME=true
+    ;;
+esac
+
+
 ## prepare databases
 
-EXIT=""
-if [ -z "$INFILE" ]; then
-  case "$ML_SYSTEM" in
-    smlnj-1.0[678])
-      EXIT="val exit = System.Unix.exit;"
-      ;;
-    smlnj-1.09*)
-      EXIT="fun exit 0 = OS.Process.exit OS.Process.success | exit _ = OS.Process.exit OS.Process.failure;"
-    ;;
-  esac
+DB="$INFILE"
+
+if [ -n "$DB" ]; then
+  DB="@SMLload=$INFILE"
+  EXIT=""
 fi
 
-DB="$INFILE"
-[ -n "$DB" ] && DB="@SMLload=$INFILE"
-
-COMMIT="fun commit () = not (exportML\"$OUTFILE\");"
-
 if [ -z "$OUTFILE" ]; then
-  COMMIT='fun commit () = (output (std_err, "Error - Database is not opened for writing.\n"); false);'
+  COMMIT="$COMMIT_RO"
 elif [ -n "$INFILE" -a ! "$INFILE" -ef "$OUTFILE" ]; then
   [ -f "$OUTFILE" ] && { rm -f "$OUTFILE" || fail_out; }
   cp "$INFILE" "$OUTFILE" || fail_out
 fi
 
 [ -n "$OUTFILE" -a -f "$OUTFILE" ] && { chmod +w "$OUTFILE" || fail_out; }
 
 MLTEXT="$EXIT $COMMIT $MLTEXT"
-MLEXIT="commit();"
+MLEXIT="commit ();"
 
 
 ## run it!
 
 START_SML="$ML_HOME/sml $ML_OPTIONS $DB"

 else
   sh -c "{ echo '$MLTEXT'; $ISABELLE_HOME/lib/scripts/ucat; echo '$MLEXIT'; } | $START_SML"
   RC=$?
 fi
 
+#fix heap file name
+if [ -n "$OUTFILE" -a -n "$FIXNAME" ]; then
+  eval $($ML_HOME/.arch-n-opsys)
+  SUFFIX=$ARCH-$OPSYS
+  [ -f $OUTFILE.$SUFFIX ] && mv $OUTFILE.$SUFFIX $OUTFILE
+fi
+
 exit $RC