libtests: Include the Unicode test files directly.

[disorder] / server / disorderd.c

diff --git a/server/disorderd.c b/server/disorderd.c
index 612ac288cfa96015d5e321ecf1e3c12df7c5ae25..06651a1c54f47dfaa153cf2aca2b125ae9ff29bf 100644 (file)
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -208,8 +208,7 @@ int main(int argc, char **argv) {
   if(!setlocale(LC_CTYPE, ""))
     disorder_fatal(errno, "error calling setlocale");
   /* garbage-collect PCRE's memory */
-  pcre_malloc = xmalloc;
-  pcre_free = xfree;
+  regexp_setup();
   while((n = getopt_long(argc, argv, "hVc:dfP:NsW", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
@@ -239,7 +238,7 @@ int main(int argc, char **argv) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
-  disorder_info("process ID %lu", (unsigned long)getpid());
+  disorder_info("version "VERSION" process ID %lu", (unsigned long)getpid());
   fix_path();
   srand(xtime(0));                     /* don't start the same every time */
   /* gcrypt initialization */