summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2008-10-27 08:16:19 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2008-10-27 08:16:19 -0400
commit794a3ad4e4713e74d2118d8f24b09ef4d35bd34f (patch)
tree51c326529042f167d347f257e4fe8f00c5f7d652
parent5badaf182a69fc7d67f9ae2e5a0a8e5bf7edea36 (diff)
Switch exit(1) call to uw_error()
-rw-r--r--CHANGELOG12
-rw-r--r--src/cjr_print.sml10
2 files changed, 15 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 00000000..6b62d606
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,12 @@
+========
+20081027
+========
+
+- On missing inputs, print an error message, but don't exit the web server.
+
+========
+20081026
+========
+
+- Change 'sed' call to work on OSX.
+- Avoid including or linking libpq files on apps that don't use SQL.
diff --git a/src/cjr_print.sml b/src/cjr_print.sml
index e26293ab..7c0fd73c 100644
--- a/src/cjr_print.sml
+++ b/src/cjr_print.sml
@@ -1845,15 +1845,11 @@ fun p_file env (ds, ps) =
string (Int.toString n),
string ");",
newline,
- string "if (request == NULL) {",
+ string "if (request == NULL)",
newline,
- box [string "printf(\"Missing input ",
+ box [string "uw_error(ctx, FATAL, \"Missing input ",
string x,
- string "\\n\");",
- newline,
- string "exit(1);"],
- newline,
- string "}",
+ string "\");"],
newline,
string "uw_input_",
p_ident x,