removed Resolve_SUCCESS() Macro and Res_Stat->sucess boolean (no longer used/needed)

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

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 3cb394bdc47ec1484fa73f35b987109a43e6f575..a29c40154d524113d46f4555090609e7248abdb2 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 Alexander Barton (alex@barton.de)
  *
  * 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
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: log.c,v 1.54 2005/04/16 09:31:30 fw Exp $";
+static char UNUSED id[] = "$Id: log.c,v 1.59 2005/08/29 10:58:00 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -44,19 +44,22 @@ static char UNUSED id[] = "$Id: log.c,v 1.54 2005/04/16 09:31:30 fw Exp $";
 #include "log.h"
 
 
-LOCAL char Init_Txt[127];
+static char Init_Txt[127];
+static bool Is_Daemon;
 
 #ifdef DEBUG
-LOCAL char Error_File[FNAME_LEN];
+static char Error_File[FNAME_LEN];
 #endif
 
 
-LOCAL void Wall_ServerNotice PARAMS(( char *Msg ));
+static 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
@@ -76,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 );
@@ -113,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 );
@@ -129,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
@@ -199,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 );
@@ -234,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
@@ -281,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 );
@@ -294,19 +302,23 @@ va_dcl
 } /* Log_Resolver */
 
 
-LOCAL void
+/**
+ * Send log messages to users flagged with the "s" mode.
+ * @param Msg The message to send.
+ */
+static void
 Wall_ServerNotice( char *Msg )
 {
-       /* Server-Notice an entsprechende User verschicken */
-
        CLIENT *c;
 
        assert( Msg != NULL );
 
        c = Client_First( );
-       while( c )
-       {
-               if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s%s", Client_ThisServer( ), NOTICE_TXTPREFIX, Msg );
+       while(c) {
+               if (Client_Conn(c) > NONE && Client_HasMode(c, 's'))
+                       IRC_WriteStrClient(c, "NOTICE %s :%s%s", Client_ID(c),
+                                                       NOTICE_TXTPREFIX, Msg);
+
                c = Client_Next( c );
        }
 } /* Wall_ServerNotice */