X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/d76ed9a966ee3d955c8ef00ecc02e643c2005e2e..921592dd1adaed54948c030be0daceb7e0c9d5b7:/src/main.c

diff --git a/src/main.c b/src/main.c
index c16aafa..ece9c1b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /* main.c - srvx
  * Copyright 2000-2004 srvx Development Team
  *
- * This file is part of srvx.
+ * This file is part of x3.
  *
  * srvx is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
 
-#define PID_FILE "srvx.pid"
+#define PID_FILE "x3.pid"
 
 #include "conf.h"
 #include "gline.h"
@@ -63,7 +63,7 @@ struct log_type *MAIN_LOG;
 
 int quit_services, max_cycles;
 
-char *services_config = "srvx.conf";
+char *services_config = "x3.conf";
 
 char **services_argv;
 int services_argc;
@@ -644,7 +644,7 @@ void usage(char *self) {
     printf("Usage: %s [-c config] [-r log] [-d] [-f] [-v|-h]\n"
            "-c, --config                    selects a different configuration file.\n"
            "-d, --debug                     enables debug mode.\n"
-           "-f, --foreground                run srvx in the foreground.\n"
+           "-f, --foreground                run X3 in the foreground.\n"
            "-h, --help                      prints this usage message.\n"
            "-k, --check                     checks the configuration file's syntax.\n"
            "-r, --replay                    replay a log file (for debugging)\n"
@@ -654,8 +654,9 @@ void usage(char *self) {
 
 void version() {
     printf("    --------------------------------------------------\n"
-           "    - "PACKAGE_STRING" ("CODENAME"), Built: " __DATE__ ", " __TIME__".\n"
-           "    - Copyright (C) 2000 - 2003, srvx Development Team\n"
+           "    - "PACKAGE_STRING", Built: " __DATE__ ", " __TIME__".\n"
+           "    - Copyright (C) 2000 - 2005, srvx Development Team\n"
+           "    - Copyright (C) 2004 - 2005, X3 Development Team\n"
            "    --------------------------------------------------\n");
 }
 
@@ -691,6 +692,12 @@ int main(int argc, char *argv[])
     FILE *file_out;
     struct sigaction sv;
 
+#if WITH_MALLOC_BOEHM_GC
+    GC_find_leak = 1;
+    GC_set_warn_proc(gc_warn_proc);
+    GC_enable_incremental();
+#endif
+
     daemon = 1;
     debug = 0;
     tools_init();
@@ -813,13 +820,9 @@ int main(int argc, char *argv[])
     reg_exit_func(main_shutdown);
 
     log_init();
-    MAIN_LOG = log_register_type("srvx", "file:main.log");
+    MAIN_LOG = log_register_type("x3", "file:main.log");
     if (debug)
         log_debug();
-#if WITH_MALLOC_BOEHM_GC
-    GC_set_warn_proc(gc_warn_proc);
-    GC_enable_incremental();
-#endif
     timeq_init();
     init_structs();
     init_parse();