X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=d6ef555adfa222fedc3cc6e44518e4d3e548fe19;hb=b10d05f2d21ff3be02e844a539fcaf67e41655d1;hp=4ebe4e0319c2804f5e31a4861ad766ea8f5ca82e;hpb=1547f76cfdfabe2226af2e35196316b21a32937c;p=ngircd-alex.git

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 4ebe4e03..d6ef555a 100644
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -9,11 +9,17 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: log.c,v 1.15 2002/01/02 02:42:58 alex Exp $
+ * $Id: log.c,v 1.17 2002/01/11 14:45:37 alex Exp $
  *
  * log.c: Logging-Funktionen
  *
  * $Log: log.c,v $
+ * Revision 1.17  2002/01/11 14:45:37  alex
+ * - Anpassungen an neue Kommandozeilen-Optionen "--debug" und "--nodaemon".
+ *
+ * Revision 1.16  2002/01/05 15:54:40  alex
+ * - syslog() etc. wurde verwendet, auch wenn USE_SYSLOG nicht definiert war.
+ *
  * Revision 1.15  2002/01/02 02:42:58  alex
  * - Copyright-Texte aktualisiert.
  *
@@ -79,41 +85,19 @@
 #include <syslog.h>
 #endif
 
+#include "global.h"
+#include "ngircd.h"
+
 #include <exp.h>
 #include "log.h"
 
 
 GLOBAL VOID Log_Init( VOID )
 {
-	CHAR txt[64];
-
-	strcpy( txt, "" );
-
-#ifdef USE_SYSLOG
-	if( txt[0] ) strcat( txt, "+" );
-	else strcat( txt, "-" );
-	strcat( txt, "SYSLOG" );
-#endif
-#ifdef STRICT_RFC
-	if( txt[0] ) strcat( txt, "+" );
-	else strcat( txt, "-" );
-	strcat( txt, "RFC" );
-#endif
-#ifdef DEBUG
-	if( txt[0] ) strcat( txt, "+" );
-	else strcat( txt, "-" );
-	strcat( txt, "DEBUG" );
-#endif
-#ifdef SNIFFER
-	if( txt[0] ) strcat( txt, "+" );
-	else strcat( txt, "-" );
-	strcat( txt, "SNIFFER" );
-#endif
-
 #ifdef USE_SYSLOG
 	openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
-	Log( LOG_NOTICE, PACKAGE" version "VERSION"%s-"P_OSNAME"/"P_ARCHNAME" started.", txt );
+	Log( LOG_NOTICE, "%s started.", NGIRCd_Version( ));
 } /* Log_Init */
 
 
@@ -135,7 +119,9 @@ GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... )
 
 	assert( Format != NULL );
 
-#ifndef DEBUG
+#ifdef DEBUG
+	if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
+#else
 	if( Level == LOG_DEBUG ) return;
 #endif
 
@@ -145,7 +131,7 @@ GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... )
 	msg[MAX_LOG_MSG_LEN - 1] = '\0';
 
 	/* ... und ausgeben */
-	printf( "[%d] %s\n", Level, msg );
+	if( NGIRCd_NoDaemon ) printf( "[%d] %s\n", Level, msg );
 #ifdef USE_SYSLOG
 	syslog( Level, msg );
 #endif
@@ -174,16 +160,18 @@ GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
 {
 	/* Eintrag des Resolver in Logfile(s) schreiben */
 
+#ifndef USE_SYSLOG
+	return;
+#else
+
 	CHAR msg[MAX_LOG_MSG_LEN];
 	va_list ap;
 
 	assert( Format != NULL );
 
-#ifndef USE_SYSLOG
-	return;
-#endif
-
-#ifndef DEBUG
+#ifdef DEBUG
+	if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
+#else
 	if( Level == LOG_DEBUG ) return;
 #endif
 
@@ -196,6 +184,7 @@ GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
 	syslog( Level, msg );
 
 	va_end( ap );
+#endif
 } /* Log_Resolver */