removed global variable NGIRCd_NoDaemon

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 6bc9250a8edf8e7af197b1a62ed520253387cea6..8e295df6596f90717e0a305994b5646d5adc32e2 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.55 2005/06/17 19:16:53 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,9 +50,10 @@ 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 )
@@ -79,7 +80,7 @@ Log_Init( void )
                strlcpy( Init_Txt, "debug-mode", sizeof Init_Txt );
        }
 #endif
-       if( NGIRCd_NoDaemon )
+       if( ! Is_Daemon )
        {
                if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
                strlcat( Init_Txt, "no-daemon-mode", sizeof Init_Txt );
@@ -129,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
@@ -199,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 );
@@ -234,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
@@ -281,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 );

diff --git a/src/ngircd/log.h b/src/ngircd/log.h
index 05fa9f5752450a8261e9067eea219b7817666c88..2dfc4c484764807bdaf293e53d7dde57b8e4b456 100644 (file)
--- a/src/ngircd/log.h
+++ b/src/ngircd/log.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: log.h,v 1.16 2005/03/19 18:43:49 fw Exp $
+ * $Id: log.h,v 1.17 2005/06/24 19:20:56 fw Exp $
  *
  * Logging functions (header)
  */
@@ -49,6 +49,7 @@ GLOBAL void Log_Resolver PARAMS((const int Level, const char *Format, ... ));
 GLOBAL void Log_InitErrorfile PARAMS((void ));
 #endif
 
+GLOBAL void Log_SetDaemonized PARAMS((void));
 
 #endif
 

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index baa933612a3207d5bba7319243e62b696eaf92cf..ab289fd5cf685ca2c04666ca2fdc1cca97cc13a7 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -12,7 +12,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: ngircd.c,v 1.100 2005/06/17 23:17:09 fw Exp $";
+static char UNUSED id[] = "$Id: ngircd.c,v 1.101 2005/06/24 19:20:56 fw Exp $";
 
 /**
  * @file
@@ -83,13 +83,14 @@ GLOBAL int
 main( int argc, const char *argv[] )
 {
        bool ok, configtest = false;
+       bool NGIRCd_NoDaemon = false;
        int i;
        size_t n;
 
        umask( 0077 );
 
        NGIRCd_SignalQuit = NGIRCd_SignalRestart = NGIRCd_SignalRehash = false;
-       NGIRCd_NoDaemon = NGIRCd_Passive = false;
+       NGIRCd_Passive = false;
 #ifdef DEBUG
        NGIRCd_Debug = false;
 #endif
@@ -742,6 +743,7 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
         * to disable this "daemon mode" (useful for debugging). */
        if ( ! NGIRCd_NoDaemon ) {
                initialized = true;
+               Log_SetDaemonized();
                pid = (long)fork( );
                if( pid > 0 ) {
                        /* "Old" process: exit. */

diff --git a/src/ngircd/ngircd.h b/src/ngircd/ngircd.h
index d7ae879cb888ee2c0f3a48b64af40a05d8241c8c..b615f2631e649ba85ae796c0fe2f681f291c72fc 100644 (file)
--- a/src/ngircd/ngircd.h
+++ b/src/ngircd/ngircd.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: ngircd.h,v 1.21 2005/03/19 18:43:49 fw Exp $
+ * $Id: ngircd.h,v 1.22 2005/06/24 19:20:56 fw Exp $
  *
  * Prototypes of the "main module".
  */
@@ -35,8 +35,6 @@ GLOBAL bool NGIRCd_Debug;             /* Debug-Modus aktivieren */
 GLOBAL bool NGIRCd_Sniffer;            /* Sniffer aktivieren */
 #endif
 
-GLOBAL bool NGIRCd_NoDaemon;           /* nicht im Hintergrund laufen */
-
 GLOBAL bool NGIRCd_Passive;            /* nicht zu anderen Servern connecten */
 
 GLOBAL bool NGIRCd_SignalQuit; /* true: quit server*/