Shamlessly slapped a 2020 copyright date on all startup banners.

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 2ef9d6764eb29030cd86405ea58adff13f2c60c1..24fd560211f6d2c7ee87c74ee568cf073a7d7e38 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996-2012 by the citadel.org team
+ * Copyright (c) 1996-2020 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.
@@ -49,6 +49,7 @@ extern HashList *HandlerHash;
 const char foobuf[32];
 const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;}
 #endif 
+extern int verbose;
 extern int dbg_analyze_msg;
 extern int dbg_backtrace_template_errors;
 extern int DumpTemplateI18NStrings;
@@ -56,6 +57,7 @@ extern StrBuf *I18nDump;
 void InitTemplateCache(void);
 extern int LoadTemplates;
 
+void LoadMimeBlacklist(void);
 
 /*
  * Here's where it all begins.
@@ -88,10 +90,8 @@ int main(int argc, char **argv)
 
        /* Ensure that we are linked to the correct version of libcitadel */
        if (libcitadel_version_number() < LIBCITADEL_VERSION_NUMBER) {
-               fprintf(stderr, " You are running libcitadel version %d.%02d\n",
-                       (libcitadel_version_number() / 100), (libcitadel_version_number() % 100));
-               fprintf(stderr, "WebCit was compiled against version %d.%02d\n",
-                       (LIBCITADEL_VERSION_NUMBER / 100), (LIBCITADEL_VERSION_NUMBER % 100));
+               fprintf(stderr, " You are running libcitadel version %d\n", libcitadel_version_number() );
+               fprintf(stderr, "WebCit was compiled against version %d\n", LIBCITADEL_VERSION_NUMBER );
                return(1);
        }
 
@@ -99,9 +99,9 @@ int main(int argc, char **argv)
 
        /* Parse command line */
 #ifdef HAVE_OPENSSL
-       while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfsS:Z")) != EOF)
+       while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfsS:Z:v:")) != EOF)
 #else
-       while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfZ")) != EOF)
+       while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfZ:v:")) != EOF)
 #endif
                switch (a) {
                case 'u':
@@ -148,8 +148,8 @@ int main(int argc, char **argv)
                        break;
                case 'T':
                        LoadTemplates = atoi(optarg);
-                       dbg_analyze_msg = (LoadTemplates && (1<<1)) != 0;
-                       dbg_backtrace_template_errors = (LoadTemplates && (1<<2)) != 0;
+                       dbg_analyze_msg = (LoadTemplates & (1<<1)) != 0;
+                       dbg_backtrace_template_errors = (LoadTemplates & (1<<2)) != 0;
                        break;
                case 'Z':
                        DisableGzip = 1;
@@ -188,12 +188,18 @@ int main(int argc, char **argv)
                        I18nDump = NewStrBufPlain(HKEY("int templatestrings(void)\n{\n"));
                        I18nDumpFile = optarg;
                        break;
+               case 'v':
+                       verbose=1;
+                       break;
                default:
-                       fprintf(stderr, "usage: webcit "
+                       fprintf(stderr, "usage:\nwebcit "
                                "[-i ip_addr] [-p http_port] "
                                "[-c] [-f] "
                                "[-T Templatedebuglevel] "
                                "[-d] [-Z] [-G i18ndumpfile] "
+                               "[-u uid] [-h homedirectory] "
+                               "[-D daemonizepid] [-v] "
+                               "[-g defaultlandingpage] [-B basesize] "
 #ifdef HAVE_OPENSSL
                                "[-s] [-S cipher_suites]"
 #endif
@@ -223,11 +229,12 @@ int main(int argc, char **argv)
        }
 
        webcit_calc_dirs_n_files(relh, basedir, home, webcitdir, relhome);
+       LoadMimeBlacklist();
        LoadIconDir(static_icon_dir);
 
        /* Tell 'em who's in da house */
        syslog(LOG_NOTICE, "%s", PACKAGE_STRING);
-       syslog(LOG_NOTICE, "Copyright (C) 1996-2012 by the citadel.org team");
+       syslog(LOG_NOTICE, "Copyright (C) 1996-2020 by the citadel.org team");
        syslog(LOG_NOTICE, " ");
        syslog(LOG_NOTICE, "This program is open source software: you can redistribute it and/or");
        syslog(LOG_NOTICE, "modify it under the terms of the GNU General Public License, version 3.");
@@ -265,7 +272,12 @@ int main(int argc, char **argv)
        }
 
        /* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */
-       icalerror_errors_are_fatal = 0;
+
+#ifdef LIBICAL_ICAL_EXPORT     // cheap and sleazy way to detect libical >=2.0
+               icalerror_set_errors_are_fatal(0);
+#else
+               icalerror_errors_are_fatal = 0;
+#endif
 
        /* Use our own prefix on tzid's generated from system tzdata */
        icaltimezone_set_tzid_prefix("/citadel.org/");
@@ -276,7 +288,7 @@ int main(int argc, char **argv)
         * wcsession struct to which the thread is currently bound.
         */
        if (pthread_key_create(&MyConKey, NULL) != 0) {
-               syslog(LOG_EMERG, "Can't create TSD key: %s", strerror(errno));
+               syslog(LOG_ERR, "Can't create TSD key: %s", strerror(errno));
        }
        InitialiseSemaphores();
 
@@ -288,7 +300,7 @@ int main(int argc, char **argv)
         */
 #ifdef HAVE_OPENSSL
        if (pthread_key_create(&ThreadSSL, NULL) != 0) {
-               syslog(LOG_EMERG, "Can't create TSD key: %s", strerror(errno));
+               syslog(LOG_ERR, "Can't create TSD key: %s", strerror(errno));
        }
 #endif