Made ngIRCd compile on HP/UX 10.20 with native HP pre-ANSI C compiler and

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

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 79f3c6fef7b9234506210fdb499b27e2b2dfd6a7..6fa7a4a7fbd05abaa8c026a051f7a5000e5cd489 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -14,18 +14,22 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: log.c,v 1.41 2002/12/12 12:24:18 alex Exp $";
+static char UNUSED id[] = "$Id: log.c,v 1.48 2004/10/20 13:47:32 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>
 #include <unistd.h>
 
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
 #include <syslog.h>
 #endif
 
@@ -50,9 +54,9 @@ LOCAL VOID Wall_ServerNotice PARAMS(( CHAR *Msg ));
 GLOBAL VOID
 Log_Init( VOID )
 {
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
        /* Syslog initialisieren */
-       openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+       openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
 
        /* Hello World! */
@@ -85,6 +89,8 @@ Log_Init( VOID )
        }
 #endif
        if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
+
+       Error_File[0] = '\0';
 } /* Log_Init */
 
 
@@ -95,7 +101,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, (LONG)getpid( ));
+       sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (LONG)getpid( ));
 
        /* stderr umlenken */
        fflush( stderr );
@@ -119,13 +125,16 @@ GLOBAL VOID
 Log_Exit( VOID )
 {
        /* Good Bye! */
-       if( NGIRCd_Restart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE );
-       else Log( LOG_NOTICE, "%s done.", PACKAGE );
+       if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE_NAME );
+       else Log( LOG_NOTICE, "%s done.", PACKAGE_NAME );
 
-       /* Error-File (stderr) loeschen */
-       if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno ));
+       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 ));
+       }
 
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
        /* syslog abmelden */
        closelog( );
 #endif
@@ -177,10 +186,10 @@ va_dcl
        if( NGIRCd_NoDaemon )
        {
                /* auf Konsole ausgeben */
-               fprintf( stdout, "[%d] %s\n", Level, msg );
+               fprintf( stdout, "[%d:%d] %s\n", (INT)getpid( ), Level, msg );
                fflush( stdout );
        }
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
        else
        {
                /* Syslog */
@@ -206,16 +215,18 @@ va_dcl
 GLOBAL VOID
 Log_Init_Resolver( VOID )
 {
-#ifdef USE_SYSLOG
-       openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+#ifdef SYSLOG
+       openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
+       Log_Resolver( LOG_DEBUG, "Resolver sub-process starting, PID %d.", getpid( ));
 } /* Log_Init_Resolver */
 
 
 GLOBAL VOID
 Log_Exit_Resolver( VOID )
 {
-#ifdef USE_SYSLOG
+       Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( ));
+#ifdef SYSLOG
        closelog( );
 #endif
 } /* Log_Exit_Resolver */
@@ -234,17 +245,11 @@ va_dcl
 {
        /* Eintrag des Resolver in Logfile(s) schreiben */
 
-#ifndef USE_SYSLOG
-       return;
-#else
-
        CHAR msg[MAX_LOG_MSG_LEN];
        va_list ap;
 
        assert( Format != NULL );
 
-       if( NGIRCd_NoDaemon ) return;
-
 #ifdef DEBUG
        if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
 #else
@@ -260,9 +265,15 @@ va_dcl
        vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
        va_end( ap );
 
-       /* ... und ausgeben */
-       syslog( Level, msg );
-
+       /* Output */
+       if( NGIRCd_NoDaemon )
+       {
+               /* Output to console */
+               fprintf( stdout, "[%d:%d] %s\n", (INT)getpid( ), Level, msg );
+               fflush( stdout );
+       }
+#ifdef SYSLOG
+       else syslog( Level, msg );
 #endif
 } /* Log_Resolver */