X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fwebserver.c;h=a72b48a8d5f9e7180f9feb6d28a4c4eec378e201;hp=8f7a9c9081f81ad705507d1c9b50bf4550b25248;hb=c6aec42f213ec284e34648f3d69bcf927dccddb1;hpb=7beff529e758f6f0706e733901824c63bcac6d19

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 8f7a9c908..a72b48a8d 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -12,10 +12,10 @@
 #include "webserver.h"
 #include "modules_init.h"
 
-extern int msock;				/* master listening socket */
-extern char static_icon_dir[PATH_MAX];          /* where should we find our mime icons */
-int is_https = 0;				/* Nonzero if I am an HTTPS service */
-int follow_xff = 0;				/* Follow X-Forwarded-For: header? */
+extern int msock;		/* master listening socket */
+extern char static_icon_dir[PATH_MAX];	/* where should we find our mime icons */
+int is_https = 0;		/* Nonzero if I am an HTTPS service */
+int follow_xff = 0;		/* Follow X-Forwarded-For: header? */
 int DisableGzip = 0;
 char *default_landing_page = NULL;
 extern pthread_mutex_t SessionListMutex;
@@ -30,18 +30,21 @@ 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 */
-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
 extern HashList *HandlerHash;
 const char foobuf[32];
-const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;}
-#endif 
+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;
@@ -57,13 +60,13 @@ void LoadMimeBlacklist(void);
  */
 int main(int argc, char **argv) {
 	uid_t UID = -1;
-	pthread_t SessThread;		/* Thread descriptor */
-	pthread_attr_t attr;		/* Thread attributes */
-	int a;		        	/* General-purpose variable */
-	char ip_addr[256]="*";
-	int relh=0;
-	int home=0;
-	char relhome[PATH_MAX]="";
+	pthread_t SessThread;	/* Thread descriptor */
+	pthread_attr_t attr;	/* Thread attributes */
+	int a;			/* General-purpose variable */
+	char ip_addr[256] = "*";
+	int relh = 0;
+	int home = 0;
+	char relhome[PATH_MAX] = "";
 	char webcitdir[PATH_MAX] = DATADIR;
 	char *pidfile = NULL;
 	char *hdir;
@@ -77,14 +80,15 @@ int main(int argc, char **argv) {
 	start_modules();
 
 #ifdef DBG_PRINNT_HOOKS_AT_START
+
 /*	dbg_PrintHash(HandlerHash, nix, NULL);*/
 #endif
 
 	/* 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\n", libcitadel_version_number() );
-		fprintf(stderr, "WebCit was compiled against version %d\n", LIBCITADEL_VERSION_NUMBER );
-		return(1);
+		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);
 	}
 
 	strcpy(uds_listen_path, "");
@@ -101,14 +105,14 @@ int main(int argc, char **argv) {
 			break;
 		case 'h':
 			hdir = strdup(optarg);
-			relh=hdir[0]!='/';
+			relh = hdir[0] != '/';
 			if (!relh) {
 				safestrncpy(webcitdir, hdir, sizeof webcitdir);
 			}
 			else {
 				safestrncpy(relhome, relhome, sizeof relhome);
 			}
-			home=1;
+			home = 1;
 			break;
 		case 'd':
 			running_as_daemon = 1;
@@ -120,7 +124,7 @@ int main(int argc, char **argv) {
 		case 'g':
 			default_landing_page = strdup(optarg);
 			break;
-		case 'B': /* deprecated */
+		case 'B':	/* deprecated */
 			break;
 		case 'i':
 			safestrncpy(ip_addr, optarg, sizeof ip_addr);
@@ -136,8 +140,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;
@@ -152,7 +156,7 @@ int main(int argc, char **argv) {
 			server_cookie = malloc(256);
 			if (server_cookie != NULL) {
 				safestrncpy(server_cookie, "Set-cookie: wcserver=", 256);
-				if (gethostname (&server_cookie[strlen(server_cookie)], 200) != 0) {
+				if (gethostname(&server_cookie[strlen(server_cookie)], 200) != 0) {
 					syslog(LOG_INFO, "gethostname: %s", strerror(errno));
 					free(server_cookie);
 				}
@@ -173,7 +177,7 @@ int main(int argc, char **argv) {
 			I18nDumpFile = optarg;
 			break;
 		case 'v':
-			verbose=1;
+			verbose = 1;
 			break;
 		default:
 			fprintf(stderr, "usage:\nwebcit "
@@ -181,9 +185,7 @@ int main(int argc, char **argv) {
 				"[-c] [-f] "
 				"[-T Templatedebuglevel] "
 				"[-d] [-Z] [-G i18ndumpfile] "
-				"[-u uid] [-h homedirectory] "
-				"[-D daemonizepid] [-v] "
-				"[-g defaultlandingpage] "
+				"[-u uid] [-h homedirectory] " "[-D daemonizepid] [-v] " "[-g defaultlandingpage] "
 #ifdef HAVE_OPENSSL
 				"[-s] [-S cipher_suites]"
 #endif
@@ -193,10 +195,7 @@ int main(int argc, char **argv) {
 
 	/* Start the logger */
 	setlogmask(LOG_UPTO(max_log_level));
-	openlog("webcit",
-		( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
-		LOG_DAEMON
-	);
+	openlog("webcit", (running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR)), LOG_DAEMON);
 
 	while (optind < argc) {
 		ctdl_dir = strdup(argv[optind]);
@@ -242,14 +241,14 @@ int main(int argc, char **argv) {
 	if (DumpTemplateI18NStrings) {
 		FILE *fd;
 		StrBufAppendBufPlain(I18nDump, HKEY("}\n"), 0);
-	        if (StrLength(I18nDump) < 50) {
+		if (StrLength(I18nDump) < 50) {
 			syslog(LOG_INFO, "*******************************************************************\n");
 			syslog(LOG_INFO, "*   No strings found in templates!  Are you sure they're there?   *\n");
 			syslog(LOG_INFO, "*******************************************************************\n");
 			return -1;
 		}
 		fd = fopen(I18nDumpFile, "w");
-	        if (fd == NULL) {
+		if (fd == NULL) {
 			syslog(LOG_INFO, "***********************************************\n");
 			syslog(LOG_INFO, "*   unable to open I18N dumpfile [%s]         *\n", I18nDumpFile);
 			syslog(LOG_INFO, "***********************************************\n");
@@ -263,9 +262,9 @@ int main(int argc, char **argv) {
 	/* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */
 
 #ifdef LIBICAL_ICAL_EXPORT	// cheap and sleazy way to detect libical >=2.0
-		icalerror_set_errors_are_fatal(0);
+	icalerror_set_errors_are_fatal(0);
 #else
-		icalerror_errors_are_fatal = 0;
+	icalerror_errors_are_fatal = 0;
 #endif
 
 	/* Use our own prefix on tzid's generated from system tzdata */
@@ -307,8 +306,7 @@ int main(int argc, char **argv) {
 		syslog(LOG_DEBUG, "Attempting to bind to port %d...", http_port);
 		msock = webcit_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH);
 	}
-	if (msock < 0)
-	{
+	if (msock < 0) {
 		ShutDownWebcit();
 		return -msock;
 	}
@@ -336,10 +334,3 @@ int main(int argc, char **argv) {
 	ShutDownLibCitadel();
 	return 0;
 }
-
-
-
-
-
-
-