X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=e814364d17a3e468bc9f1868ce0916baa91da0fa;hb=HEAD;hp=96adf01c552edb7371283b1ab76b51a37ec98522;hpb=b826c3117bb7ddf1386a4811cb2eb47ea4e1097c;p=citadel.git

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 96adf01c5..b10d5e9c3 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,17 +1,9 @@
-/*
- * Copyright (c) 1996-2021 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// Copyright (c) 1996-2024 by the citadel.org team
+//
+// This program is open source software.  Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License version 3.
 
 #include "webcit.h"
-#include "webserver.h"
 
 #include "modules_init.h"
 
@@ -33,14 +25,11 @@ extern void webcit_calc_dirs_n_files(int relh, const char *basedir, int home, ch
 extern void worker_entry(void);
 extern void drop_root(uid_t UID);
 
-char socket_dir[PATH_MAX];	/* where to talk to our citadel server */
-char *server_cookie = NULL;	/* our Cookie connection to the client */
-int http_port = PORT_NUM;	/* Port to listen on */
-char *ctdlhost = DEFAULT_HOST;	/* Host name or IP address of Citadel server */
-char *ctdlport = DEFAULT_PORT;	/* Port number of Citadel server */
-int setup_wizard = 0;		/* should we run the setup wizard? */
-char wizard_filename[PATH_MAX];	/* location of file containing the last webcit version against which we ran setup wizard */
-int running_as_daemon = 0;	/* should we deamonize on startup? */
+char socket_dir[PATH_MAX];		/* where to talk to our citadel server */
+char *server_cookie = NULL;		/* our Cookie connection to the client */
+int http_port = PORT_NUM;		/* Port to listen on */
+int running_as_daemon = 0;		/* should we deamonize on startup? */
+char *ctdl_dir = DEFAULT_CTDLDIR;	/* Directory where Citadel Server is running */
 
 /* #define DBG_PRINNT_HOOKS_AT_START */
 #ifdef DBG_PRINNT_HOOKS_AT_START
@@ -61,8 +50,7 @@ void LoadMimeBlacklist(void);
 /*
  * Here's where it all begins.
  */
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
 	uid_t UID = -1;
 	pthread_t SessThread;		/* Thread descriptor */
 	pthread_attr_t attr;		/* Thread attributes */
@@ -115,7 +103,6 @@ int main(int argc, char **argv)
 			else {
 				safestrncpy(relhome, relhome, sizeof relhome);
 			}
-			/* free(hdir); TODO: SHOULD WE DO THIS? */
 			home=1;
 			break;
 		case 'd':
@@ -159,12 +146,8 @@ int main(int argc, char **argv)
 		case 'c':
 			server_cookie = malloc(256);
 			if (server_cookie != NULL) {
-				safestrncpy(server_cookie,
-				       "Set-cookie: wcserver=",
-					256);
-				if (gethostname
-				    (&server_cookie[strlen(server_cookie)],
-				     200) != 0) {
+				safestrncpy(server_cookie, "Set-cookie: wcserver=", 256);
+				if (gethostname (&server_cookie[strlen(server_cookie)], 200) != 0) {
 					syslog(LOG_INFO, "gethostname: %s", strerror(errno));
 					free(server_cookie);
 				}
@@ -199,7 +182,7 @@ int main(int argc, char **argv)
 #ifdef HAVE_OPENSSL
 				"[-s] [-S cipher_suites]"
 #endif
-				"[remotehost [remoteport]]\n");
+				"[citadel_server_directory]\n");
 			return 1;
 		}
 
@@ -210,10 +193,9 @@ int main(int argc, char **argv)
 		LOG_DAEMON
 	);
 
-	if (optind < argc) {
-		ctdlhost = argv[optind];
-		if (++optind < argc)
-			ctdlport = argv[optind];
+	while (optind < argc) {
+		ctdl_dir = strdup(argv[optind]);
+		++optind;
 	}
 
 	/* daemonize, if we were asked to */
@@ -231,15 +213,10 @@ int main(int argc, char **argv)
 
 	/* Tell 'em who's in da house */
 	syslog(LOG_NOTICE, "%s", PACKAGE_STRING);
-	syslog(LOG_NOTICE, "Copyright (C) 1996-2020 by the citadel.org team");
+	syslog(LOG_NOTICE, "Copyright (C) 1996-2024 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.");
-	syslog(LOG_NOTICE, " ");
-	syslog(LOG_NOTICE, "This program is distributed in the hope that it will be useful,");
-	syslog(LOG_NOTICE, "but WITHOUT ANY WARRANTY; without even the implied warranty of");
-	syslog(LOG_NOTICE, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the");
-	syslog(LOG_NOTICE, "GNU General Public License for more details.");
+	syslog(LOG_NOTICE, "This program is open source software.  Use, duplication, or disclosure");
+	syslog(LOG_NOTICE, "is subject to the terms of the GNU General Public License, version 3.");
 	syslog(LOG_NOTICE, " ");
 
 	/* run from the webcit home directory */
@@ -331,16 +308,12 @@ int main(int argc, char **argv)
 
 	pthread_mutex_init(&SessionListMutex, NULL);
 
-	/*
-	 * Start up the housekeeping thread
-	 */
+	// Start up the housekeeping thread
 	pthread_attr_init(&attr);
 	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 	pthread_create(&SessThread, &attr, (void *(*)(void *)) housekeeping_loop, NULL);
 
-	/*
-	 * If this is an HTTPS server, fire up SSL
-	 */
+	// If this is an HTTPS server, fire up SSL
 #ifdef HAVE_OPENSSL
 	if (is_https) {
 		init_ssl();
@@ -348,7 +321,7 @@ int main(int argc, char **argv)
 #endif
 	drop_root(UID);
 
-	/* Become a worker thread.  More worker threads will be spawned as they are needed. */
+	// Become a worker thread.  More worker threads will be spawned as they are needed.
 	worker_entry();
 	ShutDownLibCitadel();
 	return 0;