- verwendete Datentypen aufgeraumt: beispielsweise INT32 ist nun oft ein LONG.

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index a96646cfb4744d3925b692d9484302125f9cb343..b19f702868de5558284adb9fe7c90f564f3a9693 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.54 2002/09/07 17:57:17 alex Exp $
+ * $Id: ngircd.c,v 1.57 2002/10/09 16:53:02 alex Exp $
  *
  * ngircd.c: Hier beginnt alles ;-)
  */
@@ -35,6 +35,7 @@
 #include "client.h"
 #include "channel.h"
 #include "conf.h"
+#include "cvs-version.h"
 #include "defines.h"
 #include "lists.h"
 #include "log.h"
@@ -58,7 +59,7 @@ GLOBAL int
 main( int argc, const char *argv[] )
 {
        BOOLEAN ok, configtest = FALSE;
-       INT32 pid, n;
+       LONG pid, n;
        INT i;
 
        umask( 0077 );
@@ -140,7 +141,7 @@ main( int argc, const char *argv[] )
                {
                        /* Kurze Option */
                        
-                       for( n = 1; n < (INT32)strlen( argv[i] ); n++ )
+                       for( n = 1; n < (LONG)strlen( argv[i] ); n++ )
                        {
                                ok = FALSE;
 #ifdef DEBUG
@@ -159,7 +160,7 @@ main( int argc, const char *argv[] )
                                                NGIRCd_ConfFile[FNAME_LEN - 1] = '\0';
 
                                                /* zum uebernaechsten Parameter */
-                                               i++; n = strlen( argv[i] );
+                                               i++; n = (LONG)strlen( argv[i] );
                                                ok = TRUE;
                                        }
                                }
@@ -227,7 +228,7 @@ main( int argc, const char *argv[] )
                if( ! NGIRCd_NoDaemon )
                {
                        /* Daemon im Hintergrund erzeugen */
-                       pid = (INT32)fork( );
+                       pid = (LONG)fork( );
                        if( pid > 0 )
                        {
                                /* "alter" Prozess */
@@ -275,7 +276,7 @@ main( int argc, const char *argv[] )
                                if( setuid( Conf_UID ) != 0 ) Log( LOG_ERR, "Can't change User-ID to %u: %s", Conf_UID, strerror( errno ));
                        }
                }
-               Log( LOG_INFO, "Running as user %ld, group %ld, with PID %ld.", (INT32)getuid( ), (INT32)getgid( ), (INT32)getpid( ));
+               Log( LOG_INFO, "Running as user %ld, group %ld, with PID %ld.", (LONG)getuid( ), (LONG)getgid( ), (LONG)getpid( ));
 
                Log_InitErrorfile( );
 
@@ -319,8 +320,12 @@ GLOBAL CHAR *
 NGIRCd_Version( VOID )
 {
        STATIC CHAR version[126];
-
+       
+#ifdef CVSDATE
+       sprintf( version, "%s %s(%s)-%s", PACKAGE, VERSION, CVSDATE, NGIRCd_VersionAddition( ));
+#else
        sprintf( version, "%s %s-%s", PACKAGE, VERSION, NGIRCd_VersionAddition( ));
+#endif
        return version;
 } /* NGIRCd_Version */
 
@@ -451,7 +456,7 @@ Initialize_Listen_Ports( VOID )
        /* Ports, auf denen der Server Verbindungen entgegennehmen
         * soll, initialisieren */
        
-       UINT created, i;
+       INT created, i;
 
        created = 0;
        for( i = 0; i < Conf_ListenPorts_Count; i++ )