- das Error-File wird nun komplett durch das Log-Modul verwaltet, der

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 6c544164e7bc2afe9de515cfb13fadee01583284..e386812de91cb52e878c6a23568c87bf12cb5f3b 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: ngircd.c,v 1.33 2002/03/12 15:19:12 alex Exp $
+ * $Id: ngircd.c,v 1.38 2002/03/29 20:59:22 alex Exp $
  *
  * ngircd.c: Hier beginnt alles ;-)
  */
@@ -50,10 +50,11 @@ LOCAL VOID Show_Version( VOID );
 LOCAL VOID Show_Help( VOID );
 
 
-GLOBAL INT main( INT argc, CONST CHAR *argv[] )
+GLOBAL int main( int argc, const char *argv[] )
 {
-       BOOLEAN ok;
-       INT pid, i, n;
+       BOOLEAN ok, configtest = FALSE;
+       INT32 pid, n;
+       INT i;
 
        NGIRCd_Restart = FALSE;
        NGIRCd_Quit = FALSE;
@@ -65,6 +66,7 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 #ifdef SNIFFER
        NGIRCd_Sniffer = FALSE;
 #endif
+       strcpy( NGIRCd_ConfFile, CONFIG_FILE );
 
        /* Kommandozeile parsen */
        for( i = 1; i < argc; i++ )
@@ -74,6 +76,23 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
                {
                        /* Lange Option */
 
+                       if( strcmp( argv[i], "--config" ) == 0 )
+                       {
+                               if( i + 1 < argc )
+                               {
+                                       /* Ok, danach kommt noch ein Parameter */
+                                       strncpy( NGIRCd_ConfFile, argv[i + 1], FNAME_LEN - 1 );
+                                       NGIRCd_ConfFile[FNAME_LEN - 1] = '\0';
+
+                                       /* zum uebernaechsten Parameter */
+                                       i++; ok = TRUE;
+                               }
+                       }
+                       if( strcmp( argv[i], "--configtest" ) == 0 )
+                       {
+                               configtest = TRUE;
+                               ok = TRUE;
+                       }
 #ifdef DEBUG
                        if( strcmp( argv[i], "--debug" ) == 0 )
                        {
@@ -83,8 +102,8 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 #endif
                        if( strcmp( argv[i], "--help" ) == 0 )
                        {
-                               Show_Version( ); puts( "" );
-                               Show_Help( ); puts( "" );
+                               Show_Version( );
+                               puts( "" ); Show_Help( ); puts( "" );
                                exit( 1 );
                        }
                        if( strcmp( argv[i], "--nodaemon" ) == 0 )
@@ -114,7 +133,7 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
                {
                        /* Kurze Option */
                        
-                       for( n = 1; n < strlen( argv[i] ); n++ )
+                       for( n = 1; n < (INT32)strlen( argv[i] ); n++ )
                        {
                                ok = FALSE;
 #ifdef DEBUG
@@ -124,6 +143,19 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
                                        ok = TRUE;
                                }
 #endif
+                               if( argv[i][n] == 'f' )
+                               {
+                                       if(( ! argv[i][n+i] ) && ( i + 1 < argc ))
+                                       {
+                                               /* Ok, danach kommt ein Leerzeichen */
+                                               strncpy( NGIRCd_ConfFile, argv[i + 1], FNAME_LEN - 1 );
+                                               NGIRCd_ConfFile[FNAME_LEN - 1] = '\0';
+
+                                               /* zum uebernaechsten Parameter */
+                                               i++; n = strlen( argv[i] );
+                                               ok = TRUE;
+                                       }
+                               }
                                if( argv[i][n] == 'n' )
                                {
                                        NGIRCd_NoDaemon = TRUE;
@@ -167,6 +199,13 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
 #ifdef SNIFFER
        if( NGIRCd_Sniffer ) strcpy( NGIRCd_DebugLevel, "2" );
 #endif
+
+       /* Soll nur die Konfigurations ueberprueft und ausgegeben werden? */
+       if( configtest )
+       {
+               Show_Version( ); puts( "" );
+               exit( Conf_Test( ));
+       }
        
        while( ! NGIRCd_Quit )
        {
@@ -177,7 +216,7 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
                if( ! NGIRCd_NoDaemon )
                {
                        /* Daemon im Hintergrund erzeugen */
-                       pid = fork( );
+                       pid = (INT32)fork( );
                        if( pid > 0 )
                        {
                                /* "alter" Prozess */
@@ -191,13 +230,13 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
                        }
 
                        /* Child-Prozess initialisieren */
-                       setsid( );
+                       (VOID)setsid( );
                        chdir( "/" );
                }
        
                /* Globale Variablen initialisieren */
                NGIRCd_Start = time( NULL );
-               strftime( NGIRCd_StartStr, 64, "%a %b %d %Y at %H:%M:%S (%Z)", localtime( &NGIRCd_Start ));
+               (VOID)strftime( NGIRCd_StartStr, 64, "%a %b %d %Y at %H:%M:%S (%Z)", localtime( &NGIRCd_Start ));
                NGIRCd_Restart = FALSE;
                NGIRCd_Quit = FALSE;
 
@@ -229,11 +268,6 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] )
                Log_Exit( );
        }
 
-#ifndef DEBUG
-       /* aufraeumen */
-       if( unlink( ERROR_FILE ) != 0 ) Log( LOG_ERR, "Can't delete \""ERROR_FILE"\": %s", strerror( errno ));
-#endif
-
        return 0;
 } /* main */
 
@@ -271,7 +305,7 @@ GLOBAL CHAR *NGIRCd_VersionAddition( VOID )
 #endif
 
        if( txt[0] ) strcat( txt, "-" );
-       strcat( txt, TARGET_OS"/"TARGET_CPU );
+       strcat( txt, TARGET_CPU"/"TARGET_VENDOR"/"TARGET_OS );
 
        return txt;
 } /* NGIRCd_VersionAddition */
@@ -390,21 +424,18 @@ LOCAL VOID Show_Version( VOID )
 
 LOCAL VOID Show_Help( VOID )
 {
-       puts( "Compile-time defaults:\n" );
-       puts( "  - configuration: "CONFIG_FILE );
-       puts( "  - MOTD file: "MOTD_FILE );
-       puts( "  - server error log: "ERROR_FILE"\n" );
-       puts( "Run-time options:\n" );
 #ifdef DEBUG
-       puts( "  -d, --debug       log extra debug messages" );
+       puts( "  -d, --debug        log extra debug messages" );
 #endif
-        puts( "  -n, --nodaemon    don't fork and don't detatch from controlling terminal" );
-        puts( "  -p, --passive     disable automatic connections to other servers" );
+       puts( "  -f, --config <f>   use file <f> as configuration file" );
+        puts( "  -n, --nodaemon     don't fork and don't detatch from controlling terminal" );
+        puts( "  -p, --passive      disable automatic connections to other servers" );
 #ifdef SNIFFER
-       puts( "  -s, --sniffer     enable network sniffer and display all IRC traffic" );
+       puts( "  -s, --sniffer      enable network sniffer and display all IRC traffic" );
 #endif
-       puts( "      --version     output version information and exit" );
-       puts( "      --help        display this help and exit" );
+       puts( "      --configtest   read, validate and display configuration; then exit" );
+       puts( "      --version      output version information and exit" );
+       puts( "      --help         display this help and exit" );
 } /* Show_Help */