X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Fngircd%2Fsighandlers.c;h=f7ae4f45708084f04a375f9482a2ad3913f36d97;hb=de1de4055123e95fd9dc1b7e40c69a760777079d;hp=effef44d8fb8b391e1b222eb2eaabee296632e48;hpb=139f5961a078dfd23a469d98c3942f42595854aa;p=ngircd.git

diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c
index effef44d..f7ae4f45 100644
--- a/src/ngircd/sighandlers.c
+++ b/src/ngircd/sighandlers.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2015 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,15 +24,15 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <time.h>
 
-#include "imp.h"
 #include "conn.h"
-#include "conf-ssl.h"
 #include "channel.h"
 #include "conf.h"
 #include "io.h"
 #include "log.h"
 #include "ngircd.h"
+
 #include "sighandlers.h"
 
 static int signalpipe[2];
@@ -48,7 +48,11 @@ Dump_State(void)
 {
 	Log(LOG_DEBUG, "--- Internal server state: %s ---",
 	    Client_ID(Client_ThisServer()));
-	Log(LOG_DEBUG, "time()=%ld", time(NULL));
+#ifdef HAVE_LONG_LONG
+	Log(LOG_DEBUG, "time()=%llu", (unsigned long long)time(NULL));
+#else
+	Log(LOG_DEBUG, "time()=%lu", (unsigned long)time(NULL));
+#endif
 	Conf_DebugDump();
 	Conn_DebugDump();
 	Client_DebugDump();
@@ -115,7 +119,7 @@ Rehash(void)
 	if (strcmp(old_name, Conf_ServerName) != 0 ) {
 		strlcpy(Conf_ServerName, old_name, sizeof Conf_ServerName);
 		Log(LOG_ERR,
-		    "Can't change \"ServerName\" on runtime! Ignored new name.");
+		    "Can't change server name (\"Name\") on runtime! Ignored new name.");
 	}
 	if (old_nicklen != Conf_MaxNickLength) {
 		Conf_MaxNickLength = old_nicklen;
@@ -150,6 +154,14 @@ Rehash(void)
 static void
 Signal_Handler(int Signal)
 {
+	if (Signal != SIGCHLD) {
+#ifdef HAVE_STRSIGNAL
+		Log(LOG_INFO, "Got signal \"%s\" ...", strsignal(Signal));
+#else
+		Log(LOG_INFO, "Got signal %d ...", Signal);
+#endif
+	}
+
 	switch (Signal) {
 	case SIGTERM:
 	case SIGINT: