New configuration option "OperServerMode".

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

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 6017841fa5af48968c643f0abc8da2dd25a5e6cb..153ffedd9c48fa238e49ca5f34b4bd896b9c1fbd 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -14,12 +14,16 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: log.c,v 1.46 2004/05/10 23:57:46 alex Exp $";
+static char UNUSED id[] = "$Id: log.c,v 1.52 2005/02/10 12:49:04 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
-#include <stdarg.h>
+#ifdef PROTOTYPES
+#      include <stdarg.h>
+#else
+#      include <varargs.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -40,9 +44,12 @@ static char UNUSED id[] = "$Id: log.c,v 1.46 2004/05/10 23:57:46 alex Exp $";
 #include "log.h"
 
 
-LOCAL CHAR Error_File[FNAME_LEN];
 LOCAL CHAR Init_Txt[127];
 
+#ifdef DEBUG
+LOCAL CHAR Error_File[FNAME_LEN];
+#endif
+
 
 LOCAL VOID Wall_ServerNotice PARAMS(( CHAR *Msg ));
 
@@ -56,15 +63,14 @@ Log_Init( VOID )
 #endif
 
        /* Hello World! */
-       Log( LOG_NOTICE, "%s started.", NGIRCd_Version( ));
+       Log( LOG_NOTICE, "%s started.", NGIRCd_Version );
          
        /* Informationen uebern den "Operation Mode" */
-       strcpy( Init_Txt, "" );
+       Init_Txt[0] = '\0';
 #ifdef DEBUG
        if( NGIRCd_Debug )
        {
-               if( Init_Txt[0] ) strcat( Init_Txt, ", " );
-               strcat( Init_Txt, "debug-mode" );
+               strcpy( Init_Txt, "debug-mode" );
        }
 #endif
        if( NGIRCd_NoDaemon )
@@ -86,10 +92,14 @@ Log_Init( VOID )
 #endif
        if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
 
+#ifdef DEBUG
        Error_File[0] = '\0';
+#endif
 } /* Log_Init */
 
 
+#ifdef DEBUG
+
 GLOBAL VOID
 Log_InitErrorfile( VOID )
 {
@@ -109,13 +119,15 @@ Log_InitErrorfile( VOID )
 
        /* Einige Infos in das Error-File schreiben */
        fputs( ctime( &NGIRCd_Start ), stderr );
-       fprintf( stderr, "%s started.\n", NGIRCd_Version( ));
+       fprintf( stderr, "%s started.\n", NGIRCd_Version );
        fprintf( stderr, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" );
        fflush( stderr );
 
        Log( LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File );
 } /* Log_InitErrfile */
 
+#endif
+
 
 GLOBAL VOID
 Log_Exit( VOID )
@@ -124,11 +136,13 @@ Log_Exit( VOID )
        if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE_NAME );
        else Log( LOG_NOTICE, "%s done.", PACKAGE_NAME );
 
+#ifdef DEBUG
        if( Error_File[0] )
        {
                /* Error-File (stderr) loeschen */
                if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno ));
        }
+#endif
 
 #ifdef SYSLOG
        /* syslog abmelden */
@@ -182,7 +196,7 @@ va_dcl
        if( NGIRCd_NoDaemon )
        {
                /* auf Konsole ausgeben */
-               fprintf( stdout, "[%d:%d] %s\n", getpid( ), Level, msg );
+               fprintf( stdout, "[%d:%d] %s\n", (INT)getpid( ), Level, msg );
                fflush( stdout );
        }
 #ifdef SYSLOG
@@ -195,7 +209,7 @@ va_dcl
 
        if( Level <= LOG_CRIT )
        {
-               /* Kritische Meldungen in Error-File (stderr) */
+               /* log critical messages to stderr */
                fprintf( stderr, "%s\n", msg );
                fflush( stderr );
        }
@@ -265,11 +279,11 @@ va_dcl
        if( NGIRCd_NoDaemon )
        {
                /* Output to console */
-               fprintf( stdout, "[%d:%d] %s\n", getpid( ), Level, msg );
+               fprintf( stdout, "[%d:%d] %s\n", (INT)getpid( ), Level, msg );
                fflush( stdout );
        }
 #ifdef SYSLOG
-       else syslog( Level, msg );
+       else syslog( Level, "%s", msg );
 #endif
 } /* Log_Resolver */