Get rid of Log_SetDaemonized().

[ngircd.git] / src / ngircd / log.c

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 62113f11e77ca6435a4afdb6d1844395380cab67..459ba1d296da77d5addfe58e93d7e0153e52a518 100644 (file)
--- 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.57 2005/06/24 19:55:10 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -45,6 +45,7 @@ static char UNUSED id[] = "$Id: log.c,v 1.53 2005/03/19 18:43:49 fw Exp $";
 
 
 LOCAL char Init_Txt[127];
+LOCAL bool Is_Daemon;
 
 #ifdef DEBUG
 LOCAL char Error_File[FNAME_LEN];
@@ -55,9 +56,17 @@ LOCAL void Wall_ServerNotice PARAMS(( char *Msg ));
 
 
 GLOBAL void
-Log_Init( void )
+Log_Init( bool Daemon_Mode )
 {
+       Is_Daemon = Daemon_Mode;
+       
 #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 +79,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 +116,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 +132,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 +204,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 +239,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 +290,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 );