Changed all PACKAGE's to PACKAGE_NAME and all VERSION's to PACKAGE_VERSION.

diff --git a/src/ngircd/Makefile.am b/src/ngircd/Makefile.am
index b36b99ad24e077efe42b8ed3030ebc221ff189b3..3188f237610eeb3c483aa73e738d53363393bcbc 100644 (file)
--- a/src/ngircd/Makefile.am
+++ b/src/ngircd/Makefile.am
@@ -8,7 +8,7 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: Makefile.am,v 1.37 2003/02/23 12:02:26 alex Exp $
+# $Id: Makefile.am,v 1.38 2003/03/31 15:54:21 alex Exp $
 #
 
 AUTOMAKE_OPTIONS = ../portab/ansi2knr
@@ -64,7 +64,7 @@ lint:
 ngircd.c: cvs-date cvs-version.h
 
 cvs-date:
-       grep VERSION ../config.h | grep "CVS" \
+       grep PACKAGE_VERSION ../config.h | grep "CVS" \
         && echo "#define CVSDATE \"$$( grep "\$$Id" $(srcdir)/*.c \
            | $(AWK) "{ print \$$9 }" | sort | tail -1 \
            | sed -e "s/\//-/g" )\"" > cvs-version.new \

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index bfc3a4f8af43aec4fe0390a9503ba34aecc0846e..5260f146116899eb55842e8c92946904c0ca9dc4 100644 (file)
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -17,7 +17,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: client.c,v 1.73 2003/01/15 14:28:25 alex Exp $";
+static char UNUSED id[] = "$Id: client.c,v 1.74 2003/03/31 15:54:21 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -76,7 +76,7 @@ Client_Init( VOID )
        if( ! This_Server )
        {
                Log( LOG_EMERG, "Can't allocate client structure for server! Going down." );
-               Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+               Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
                exit( 1 );
        }
 

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 4cc78fe20bb99a1d373cde763cddc685db015891..eae841b4343787ebf9805f6c1cb52d4696106099 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conf.c,v 1.54 2003/03/27 01:21:38 alex Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.55 2003/03/31 15:54:21 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -329,7 +329,7 @@ Set_Defaults( BOOLEAN InitServers )
        INT i;
 
        strcpy( Conf_ServerName, "" );
-       sprintf( Conf_ServerInfo, "%s %s", PACKAGE, VERSION );
+       sprintf( Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION );
        strcpy( Conf_ServerPwd, "" );
 
        strcpy( Conf_ServerAdmin1, "" );
@@ -376,7 +376,7 @@ Read_Config( VOID )
        {
                /* No configuration file found! */
                Config_Error( LOG_ALERT, "Can't read configuration \"%s\": %s", NGIRCd_ConfFile, strerror( errno ));
-               Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+               Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
                exit( 1 );
        }
 
@@ -833,7 +833,7 @@ Validate_Config( BOOLEAN Configtest )
                Config_Error( LOG_ALERT, "No server name configured in \"%s\" ('ServerName')!", NGIRCd_ConfFile );
                if( ! Configtest )
                {
-                       Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+                       Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
                        exit( 1 );
                }
        }
@@ -845,7 +845,7 @@ Validate_Config( BOOLEAN Configtest )
                Config_Error( LOG_ALERT, "No administrator email address configured in \"%s\" ('AdminEMail')!", NGIRCd_ConfFile );
                if( ! Configtest )
                {
-                       Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+                       Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
                        exit( 1 );
                }
        }

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index fa8b30535622f499d3f218b5f22605dbc6cffd97..ba37676a358f306cdfce30489635d2ed3664209b 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -16,7 +16,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.120 2003/03/27 01:20:22 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.121 2003/03/31 15:54:21 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -429,7 +429,7 @@ Conn_Handler( VOID )
                        if( errno != EINTR )
                        {
                                Log( LOG_EMERG, "Conn_Handler(): select(): %s!", strerror( errno ));
-                               Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+                               Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
                                exit( 1 );
                        }
                        continue;
@@ -626,7 +626,7 @@ Conn_Close( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )
        {
                /* Oops, we can't close the socket!? This is fatal! */
                Log( LOG_EMERG, "Error closing connection %d (socket %d) with %s:%d - %s!", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
-               Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+               Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
                exit( 1 );
        }
 
@@ -901,7 +901,7 @@ New_Connection( INT Sock )
        
 #ifdef USE_TCPWRAP
        /* Validate socket using TCP Wrappers */
-       request_init( &req, RQ_DAEMON, PACKAGE, RQ_FILE, new_sock, RQ_CLIENT_SIN, &new_addr, NULL );
+       request_init( &req, RQ_DAEMON, PACKAGE_NAME, RQ_FILE, new_sock, RQ_CLIENT_SIN, &new_addr, NULL );
        if( ! hosts_access( &req ))
        {
                /* Access denied! */

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 2f1112e87be2ec86dd2e0fe35477fd0db61fab85..1c3e4d59c4a8edc2f3fb50d3723cf2f9f2dfe0a4 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-info.c,v 1.14 2003/01/01 13:30:35 alex Exp $";
+static char UNUSED id[] = "$Id: irc-info.c,v 1.15 2003/03/31 15:54:21 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -513,7 +513,7 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req )
        }
 
        /* mit Versionsinfo antworten */
-       return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE, VERSION, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( ));
+       return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( ));
 } /* IRC_VERSION */
 
 

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index c7ff831da06740d24e94733407f45e0727111d80..280923a798856413fef87fa036aeaa20125fe3b2 100644 (file)
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-login.c,v 1.33 2003/01/08 22:28:12 alex Exp $";
+static char UNUSED id[] = "$Id: irc-login.c,v 1.34 2003/03/31 15:54:21 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -445,9 +445,9 @@ Hello_User( CLIENT *Client )
        IRC_WriteStrServers( NULL, "NICK %s 1 %s %s 1 +%s :%s", Client_ID( Client ), Client_User( Client ), Client_Hostname( Client ), Client_Modes( Client ), Client_Info( Client ));
 
        if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return FALSE;
-       if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return FALSE;
+       if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return FALSE;
        if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return FALSE;
-       if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, USERMODES, CHANMODES )) return FALSE;
+       if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, USERMODES, CHANMODES )) return FALSE;
 
        /* Features */
        if( ! IRC_WriteStrClient( Client, RPL_ISUPPORT_MSG, Client_ID( Client ), CLIENT_NICK_LEN - 1, CHANNEL_TOPIC_LEN - 1, CLIENT_AWAY_LEN - 1, Conf_MaxJoins )) return DISCONNECTED;

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index caf23dc021fc39697bb09800da0f4f04c8ac6fed..6d977be496475d8df936ebbfcec4ce80b3bad7bf 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc.c,v 1.119 2003/03/19 21:16:53 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.120 2003/03/31 15:54:21 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -212,7 +212,7 @@ IRC_TRACE( CLIENT *Client, REQUEST *Req )
                /* Send RPL_TRACELINK back to initiator */
                idx = Client_Conn( Client ); assert( idx > NONE );
                idx2 = Client_Conn( Client_NextHop( target )); assert( idx2 > NONE );
-               if( ! IRC_WriteStrClient( from, RPL_TRACELINK_MSG, Client_ID( from ), PACKAGE, VERSION, Client_ID( target ), Client_ID( Client_NextHop( target )), Option_String( idx2 ), time( NULL ) - Conn_StartTime( idx2 ), Conn_SendQ( idx ), Conn_SendQ( idx2 ))) return DISCONNECTED;
+               if( ! IRC_WriteStrClient( from, RPL_TRACELINK_MSG, Client_ID( from ), PACKAGE_NAME, PACKAGE_VERSION, Client_ID( target ), Client_ID( Client_NextHop( target )), Option_String( idx2 ), time( NULL ) - Conn_StartTime( idx2 ), Conn_SendQ( idx ), Conn_SendQ( idx2 ))) return DISCONNECTED;
 
                /* Forward command */
                IRC_WriteStrClientPrefix( target, from, "TRACE %s", Req->argv[0] );
@@ -243,7 +243,7 @@ IRC_TRACE( CLIENT *Client, REQUEST *Req )
        /* Some information about us */
        if( ! IRC_WriteStrClient( from, RPL_TRACESERVER_MSG, Client_ID( from ), Conf_ServerName, Client_Mask( Client_ThisServer( )), Option_String( Client_Conn( Client )))) return DISCONNECTED;
 
-       return IRC_WriteStrClient( from, RPL_TRACEEND_MSG, Client_ID( from ), Conf_ServerName, PACKAGE, VERSION, NGIRCd_DebugLevel );
+       return IRC_WriteStrClient( from, RPL_TRACEEND_MSG, Client_ID( from ), Conf_ServerName, PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_DebugLevel );
 } /* IRC_TRACE */
 
 

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index db0f076795c4c2f485533b6b7cf5633363c4b2ae..9e226a5ad0e7e639225d40b2c327a704e6e10df2 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.42 2002/12/19 04:30:00 alex Exp $";
+static char UNUSED id[] = "$Id: log.c,v 1.43 2003/03/31 15:54:21 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -52,7 +52,7 @@ Log_Init( VOID )
 {
 #ifdef USE_SYSLOG
        /* Syslog initialisieren */
-       openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+       openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
 
        /* Hello World! */
@@ -95,7 +95,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,8 +119,8 @@ GLOBAL VOID
 Log_Exit( VOID )
 {
        /* Good Bye! */
-       if( NGIRCd_SignalRestart ) 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 ));
@@ -207,7 +207,7 @@ GLOBAL VOID
 Log_Init_Resolver( VOID )
 {
 #ifdef USE_SYSLOG
-       openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+       openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
 } /* Log_Init_Resolver */
 

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 45cdfac3b2a41239a32c0ab989aac8f1ec5c32a6..046ff959857295634ad163df308f3b7449ba74f6 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: ngircd.c,v 1.75 2003/03/27 01:22:44 alex Exp $";
+static char UNUSED id[] = "$Id: ngircd.c,v 1.76 2003/03/31 15:54:21 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -186,8 +186,8 @@ main( int argc, const char *argv[] )
 
                                if( ! ok )
                                {
-                                       printf( "%s: invalid option \"-%c\"!\n", PACKAGE, argv[i][n] );
-                                       printf( "Try \"%s --help\" for more information.\n", PACKAGE );
+                                       printf( "%s: invalid option \"-%c\"!\n", PACKAGE_NAME, argv[i][n] );
+                                       printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME );
                                        exit( 1 );
                                }
                        }
@@ -195,8 +195,8 @@ main( int argc, const char *argv[] )
                }
                if( ! ok )
                {
-                       printf( "%s: invalid option \"%s\"!\n", PACKAGE, argv[i] );
-                       printf( "Try \"%s --help\" for more information.\n", PACKAGE );
+                       printf( "%s: invalid option \"%s\"!\n", PACKAGE_NAME, argv[i] );
+                       printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME );
                        exit( 1 );
                }
        }
@@ -239,7 +239,7 @@ main( int argc, const char *argv[] )
                        if( pid < 0 )
                        {
                                /* Fehler */
-                               printf( "%s: Can't fork: %s!\nFatal error, exiting now ...\n", PACKAGE, strerror( errno ));
+                               printf( "%s: Can't fork: %s!\nFatal error, exiting now ...\n", PACKAGE_NAME, strerror( errno ));
                                exit( 1 );
                        }
 
@@ -297,13 +297,13 @@ main( int argc, const char *argv[] )
                 * beim PASS-Befehl verwendete Syntax sowie die erweiterten Flags
                 * sind in doc/Protocol.txt beschrieben. */
 #ifdef IRCPLUS
-               sprintf( NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE, VERSION, IRCPLUSFLAGS );
+               sprintf( NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS );
 #ifdef USE_ZLIB
                strcat( NGIRCd_ProtoID, "Z" );
 #endif
                if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" );
 #else
-               sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE, VERSION );
+               sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION );
 #endif
                strcat( NGIRCd_ProtoID, " P" );
 #ifdef USE_ZLIB
@@ -318,7 +318,7 @@ main( int argc, const char *argv[] )
                if( Conn_InitListeners( ) < 1 )
                {
                        Log( LOG_ALERT, "Server isn't listening on a single port!" );
-                       Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+                       Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
                        exit( 1 );
                }
                
@@ -346,9 +346,9 @@ NGIRCd_Version( VOID )
        STATIC CHAR version[126];
        
 #ifdef CVSDATE
-       sprintf( version, "%s %s(%s)-%s", PACKAGE, VERSION, CVSDATE, NGIRCd_VersionAddition( ));
+       sprintf( version, "%s %s(%s)-%s", PACKAGE_NAME, PACKAGE_VERSION, CVSDATE, NGIRCd_VersionAddition( ));
 #else
-       sprintf( version, "%s %s-%s", PACKAGE, VERSION, NGIRCd_VersionAddition( ));
+       sprintf( version, "%s %s-%s", PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition( ));
 #endif
        return version;
 } /* NGIRCd_Version */