X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=8e295df6596f90717e0a305994b5646d5adc32e2;hb=dbea1873731f7a0bd718b6f84b75faa10b83fe66;hp=62113f11e77ca6435a4afdb6d1844395380cab67;hpb=8adff5922376676c2eeb49de1cbab86cc345b887;p=ngircd-alex.git

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 62113f11..8e295df6 100644
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: log.c,v 1.53 2005/03/19 18:43:49 fw Exp $";
+static char UNUSED id[] = "$Id: log.c,v 1.56 2005/06/24 19:20:56 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -50,14 +50,21 @@ LOCAL char Init_Txt[127];
 LOCAL char Error_File[FNAME_LEN];
 #endif
 
-
+LOCAL Is_Daemon;
 LOCAL void Wall_ServerNotice PARAMS(( char *Msg ));
 
+GLOBAL void Log_SetDaemonized(void) { Is_Daemon = true; }
 
 GLOBAL void
 Log_Init( void )
 {
 #ifdef SYSLOG
+#ifndef LOG_CONS	/* Kludge: mips-dec-ultrix4.5 has no LOG_CONS/LOG_LOCAL5 */
+#define LOG_CONS 0
+#endif
+#ifndef LOG_LOCAL5
+#define LOG_LOCAL5 0
+#endif
 	/* Syslog initialisieren */
 	openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
@@ -70,24 +77,24 @@ Log_Init( void )
 #ifdef DEBUG
 	if( NGIRCd_Debug )
 	{
-		strcpy( Init_Txt, "debug-mode" );
+		strlcpy( Init_Txt, "debug-mode", sizeof Init_Txt );
 	}
 #endif
-	if( NGIRCd_NoDaemon )
+	if( ! Is_Daemon )
 	{
-		if( Init_Txt[0] ) strcat( Init_Txt, ", " );
-		strcat( Init_Txt, "no-daemon-mode" );
+		if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
+		strlcat( Init_Txt, "no-daemon-mode", sizeof Init_Txt );
 	}
 	if( NGIRCd_Passive )
 	{
-		if( Init_Txt[0] ) strcat( Init_Txt, ", " );
-		strcat( Init_Txt, "passive-mode" );
+		if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
+		strlcat( Init_Txt, "passive-mode", sizeof Init_Txt );
 	}
 #ifdef SNIFFER
 	if( NGIRCd_Sniffer )
 	{
-		if( Init_Txt[0] ) strcat( Init_Txt, ", " );
-		strcat( Init_Txt, "network sniffer" );
+		if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
+		strlcat( Init_Txt, "network sniffer", sizeof Init_Txt );
 	}
 #endif
 	if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
@@ -107,7 +114,7 @@ Log_InitErrorfile( void )
 	 * landen z.B. alle Ausgaben von assert()-Aufrufen. */
 
 	/* Dateiname zusammen bauen */
-	sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( ));
+	snprintf( Error_File, sizeof Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( ));
 
 	/* stderr umlenken */
 	fflush( stderr );
@@ -123,7 +130,9 @@ Log_InitErrorfile( void )
 	fprintf( stderr, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" );
 	fflush( stderr );
 
+#ifdef DEBUG
 	Log( LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File );
+#endif
 } /* Log_InitErrfile */
 
 #endif
@@ -193,7 +202,7 @@ va_dcl
 	vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
 	va_end( ap );
 
-	if( NGIRCd_NoDaemon )
+	if( ! Is_Daemon )
 	{
 		/* auf Konsole ausgeben */
 		fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );
@@ -228,14 +237,18 @@ Log_Init_Resolver( void )
 #ifdef SYSLOG
 	openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
+#ifdef DEBUG
 	Log_Resolver( LOG_DEBUG, "Resolver sub-process starting, PID %d.", getpid( ));
+#endif
 } /* Log_Init_Resolver */
 
 
 GLOBAL void
 Log_Exit_Resolver( void )
 {
+#ifdef DEBUG
 	Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( ));
+#endif
 #ifdef SYSLOG
 	closelog( );
 #endif
@@ -275,8 +288,7 @@ va_dcl
 	vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
 	va_end( ap );
 
-	/* Output */
-	if( NGIRCd_NoDaemon )
+	if( ! Is_Daemon )
 	{
 		/* Output to console */
 		fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );