diff options
| author |  Ziv Scully <ziv@mit.edu> | 2015-05-06 14:51:09 -0400 |
|---|---|---|
| committer | Ziv Scully <ziv@mit.edu> | 2015-05-06 14:51:09 -0400 |
| commit | 9c155aa780bef9e6edae2c07516693c12b37962b (patch) | |
| tree | 83112df872c19daae3e2285917119bc7c1eda2ff /src | |
| parent | d3f147f2de07ca854f3eb8679e05460ea0c2c841 (diff) | |
| parent | d30f4a5a9244eb6b2ae3d6d8a126e240a2555f70 (diff) | |
Merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/c/static.c | 5 | ||||
| -rw-r--r-- | src/monoize.sml | 4 | ||||
| -rw-r--r-- | src/settings.sml | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/c/static.c b/src/c/static.c index 8f35a2d4..c8fd5bc7 100644 --- a/src/c/static.c +++ b/src/c/static.c @@ -16,6 +16,10 @@ static void log_(void *data, const char *fmt, ...) { static uw_loggers loggers = {NULL, log_, log_}; +static char *get_header(void *data, const char *h) { + return NULL; +} + int main(int argc, char *argv[]) { uw_context ctx; failure_kind fk; @@ -27,6 +31,7 @@ int main(int argc, char *argv[]) { ctx = uw_init(0, &loggers); uw_set_app(ctx, &uw_application); + uw_set_headers(ctx, get_header, NULL); uw_initialize(ctx); while (1) { diff --git a/src/monoize.sml b/src/monoize.sml index d1513ea6..8c1a4e3c 100644 --- a/src/monoize.sml +++ b/src/monoize.sml @@ -4693,8 +4693,8 @@ fun monoize env file = (L'.EDml (str (foldl (fn ((x, _), s) => s ^ ", " ^ Settings.mangleSql x ^ " = NULL") - ("UPDATE uw_" - ^ tab + ("UPDATE " + ^ Settings.mangleSql tab ^ " SET " ^ Settings.mangleSql x ^ " = NULL") diff --git a/src/settings.sml b/src/settings.sml index e15988cd..fc55511d 100644 --- a/src/settings.sml +++ b/src/settings.sml @@ -880,7 +880,7 @@ fun setFilePath path = filePath := path fun addFile {Uri, LoadFromFilename} = let - val path = OS.Path.mkAbsolute {relativeTo = !filePath, path = LoadFromFilename} + val path = OS.Path.concat (!filePath, LoadFromFilename) in case SM.find (!files, Uri) of SOME (path', _) => |