Happy New Year. Startup banners now show 2014 copyright date.

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index b0cd8f167b00be70be9f76b5822e4191afd2583d..9da255b50f1a8a54cb706122820b4b94e498aa56 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,7 +1,7 @@
 /*
  * citserver's main() function lives here.
  * 
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2014 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -11,72 +11,21 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <signal.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <syslog.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
 #include <grp.h>
-#include <pwd.h>
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
-#include "sysdep_decls.h"
-#include "threads.h"
+
 #include "citserver.h"
-#include "support.h"
+#include "svn_revision.h"
+#include "modules_init.h"
 #include "config.h"
 #include "control.h"
-#include "database.h"
-#include "user_ops.h"
-#include "housekeeping.h"
-#include "svn_revision.h"
+#include "serv_extensions.h"
 #include "citadel_dirs.h"
-
-#include "context.h"
-
-#include "modules_init.h"
+#include "user_ops.h"
 #include "ecrash.h"
 
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
 const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
 
@@ -89,6 +38,7 @@ void go_threading(void);
  */
 int main(int argc, char **argv)
 {
+       size_t basesize = 64;
        char facility[32];
        int a;                  /* General-purpose variables */
        struct passwd pw, *pwp = NULL;
@@ -114,7 +64,7 @@ int main(int argc, char **argv)
        InitializeMasterTSD();
 
        /* parse command-line arguments */
-       while ((a=getopt(argc, argv, "l:dh:x:t:Dr")) != EOF) switch(a) {
+       while ((a=getopt(argc, argv, "l:dh:x:t:B:Dr")) != EOF) switch(a) {
 
                case 'l':
                        safestrncpy(facility, optarg, sizeof(facility));
@@ -143,6 +93,9 @@ int main(int argc, char **argv)
 
                case 't':       /* deprecated */
                        break;
+                case 'B': /* Basesize */
+                        basesize = atoi(optarg);
+                        break;
 
                case 'D':
                        dbg = 1;
@@ -165,7 +118,7 @@ int main(int argc, char **argv)
                        );
                        exit(1);
        }
-
+       StartLibCitadel(basesize);
        openlog("citserver",
                ( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
                syslog_facility
@@ -200,7 +153,7 @@ int main(int argc, char **argv)
        syslog(LOG_NOTICE,
                "*** Citadel server engine v%d.%02d (build %s) ***",
                (REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
-       syslog(LOG_NOTICE, "Copyright (C) 1987-2012 by the Citadel development team.");
+       syslog(LOG_NOTICE, "Copyright (C) 1987-2014 by the Citadel development team.");
        syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
                                        "General Public License.");
        syslog(LOG_NOTICE, " ");