commit 33b1204349ed1d26564b562599414fa2718db276 from: Alexander Barton date: Thu Apr 24 22:14:11 2008 UTC Get rid of cvs-version.* and CVSDATE definition. (cherry picked from commit b187fac244f4e14705f882ba7c43eef0238e2830) commit - 09968ee8435bfd18b6b0219b2b5b05a1a9484a5c commit + 33b1204349ed1d26564b562599414fa2718db276 blob - cfa45e19716ff63299919a66bc7bcb0f8f14ee08 blob + 1a5119f29853382625a06297043581ca0a9c4875 --- src/ngircd/Makefile.am +++ src/ngircd/Makefile.am @@ -36,7 +36,7 @@ noinst_HEADERS = ngircd.h array.h channel.h client.h c defines.h messages.h clean-local: - rm -f check-version check-help lint.out cvs-version.* + rm -f check-version check-help lint.out maintainer-clean-local: rm -f Makefile Makefile.in @@ -77,23 +77,6 @@ lint: || echo "Result: no warnings found."; \ echo; [ $$warnings -gt 0 ] && exit 1 -ngircd.c: cvs-version.h - -irc-login.c: cvs-version.h - -irc-info.c: cvs-version.h - -cvs-version.h: cvs-date - -cvs-date: - grep 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 \ - || echo "" > cvs-version.new - diff cvs-version.h cvs-version.new 2>/dev/null \ - || cp cvs-version.new cvs-version.h - TESTS = check-version check-help # -eof- blob - 87ed2ad00c6e7d00037a58c5242731f6629527a0 blob + dbeed978d056cd041525ed398bbb0eb6ece7c96a --- src/ngircd/irc-info.c +++ src/ngircd/irc-info.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2005 Alexander Barton (alex@barton.de) + * Copyright (c)2001-2008 Alexander Barton (alex@barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -13,8 +13,6 @@ #include "portab.h" - -static char UNUSED id[] = "$Id: irc-info.c,v 1.44 2008/02/17 13:26:42 alex Exp $"; #include "imp.h" #include @@ -25,7 +23,6 @@ static char UNUSED id[] = "$Id: irc-info.c,v 1.44 2008 #include #include "ngircd.h" -#include "cvs-version.h" #include "conn-func.h" #include "conn-zip.h" #include "client.h" @@ -640,9 +637,6 @@ GLOBAL bool IRC_VERSION( CLIENT *Client, REQUEST *Req ) { CLIENT *target, *prefix; -#ifdef CVSDATE - char ver[12], vertxt[30]; -#endif assert( Client != NULL ); assert( Req != NULL ); @@ -669,21 +663,15 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req ) return CONNECTED; } - /* mit Versionsinfo antworten */ - IRC_SetPenalty( Client, 1 ); -#ifdef CVSDATE - strlcpy( ver, CVSDATE, sizeof( ver )); - strncpy( ver + 4, ver + 5, 2 ); - strncpy( ver + 6, ver + 8, 3 ); - snprintf( vertxt, sizeof( vertxt ), "%s(%s)", PACKAGE_VERSION, ver ); - return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE_NAME, vertxt, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition ); -#else - return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition ); -#endif + /* send version information */ + IRC_SetPenalty(Client, 1); + return IRC_WriteStrClient(Client, RPL_VERSION_MSG, Client_ID(prefix), + PACKAGE_NAME, PACKAGE_VERSION, + NGIRCd_DebugLevel, Conf_ServerName, + NGIRCd_VersionAddition); } /* IRC_VERSION */ - static bool write_whoreply(CLIENT *Client, CLIENT *c, const char *channelname, const char *flags) { blob - 1f7038ee8761853c1db69c11427cae7782a22e58 blob + dd436192caa888c395572b91ea47d2aa10e30921 --- src/ngircd/irc-login.c +++ src/ngircd/irc-login.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2008 Alexander Barton (alex@barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,8 +14,6 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-login.c,v 1.55 2008/02/05 11:46:55 fw Exp $"; - #include "imp.h" #include #include @@ -35,7 +33,6 @@ static char UNUSED id[] = "$Id: irc-login.c,v 1.55 200 #include "irc.h" #include "irc-info.h" #include "irc-write.h" -#include "cvs-version.h" #include "exp.h" #include "irc-login.h" @@ -507,7 +504,7 @@ IRC_PING(CLIENT *Client, REQUEST *Req) Client_ID(from), Client_ID(Client)); #else /* Some clients depend on the argument being returned in the PONG - * reply (not mentioned in any RFC, though) */ + * reply (not mentioned in any RFC, though) */ return IRC_WriteStrClient(Client, "PONG %s :%s", Client_ID(from), Req->argv[0]); #endif @@ -573,61 +570,60 @@ IRC_PONG(CLIENT *Client, REQUEST *Req) static bool -Hello_User( CLIENT *Client ) +Hello_User(CLIENT * Client) { -#ifdef CVSDATE - char ver[12], vertxt[30]; -#endif + assert(Client != NULL); - assert( Client != NULL ); - /* Check password ... */ - if( strcmp( Client_Password( Client ), Conf_ServerPwd ) != 0 ) - { + if (strcmp(Client_Password(Client), Conf_ServerPwd) != 0) { /* Bad password! */ - Log( LOG_ERR, "User \"%s\" rejected (connection %d): Bad password!", Client_Mask( Client ), Client_Conn( Client )); - Conn_Close( Client_Conn( Client ), NULL, "Bad password", true); + Log(LOG_ERR, + "User \"%s\" rejected (connection %d): Bad password!", + Client_Mask(Client), Client_Conn(Client)); + Conn_Close(Client_Conn(Client), NULL, "Bad password", true); return DISCONNECTED; } - Log( LOG_NOTICE, "User \"%s\" registered (connection %d).", Client_Mask( Client ), Client_Conn( Client )); + Log(LOG_NOTICE, "User \"%s\" registered (connection %d).", + Client_Mask(Client), Client_Conn(Client)); /* Inform other servers */ - 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 )); - - /* Welcome :-) */ - if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return false; - - /* Version and system type */ -#ifdef CVSDATE - strlcpy( ver, CVSDATE, sizeof( ver )); - memmove( ver + 4, ver + 5, 2 ); - memmove( ver + 6, ver + 8, 3 ); - snprintf( vertxt, sizeof( vertxt ), "%s(%s)", PACKAGE_VERSION, ver ); - if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), vertxt, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return false; -#else - if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return false; -#endif + 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_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return false; -#ifdef CVSDATE - if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), vertxt, USERMODES, CHANMODES )) return false; -#else - if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, USERMODES, CHANMODES )) return false; -#endif + 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()), 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()), PACKAGE_VERSION, USERMODES, + CHANMODES)) + return false; /* Features supported by this server (005 numeric, ISUPPORT), * see for details. */ - if (! IRC_Send_ISUPPORT(Client)) + if (!IRC_Send_ISUPPORT(Client)) return DISCONNECTED; - Client_SetType( Client, CLIENT_USER ); + Client_SetType(Client, CLIENT_USER); - if( ! IRC_Send_LUSERS( Client )) return DISCONNECTED; - if( ! IRC_Show_MOTD( Client )) return DISCONNECTED; + if (!IRC_Send_LUSERS(Client)) + return DISCONNECTED; + if (!IRC_Show_MOTD(Client)) + return DISCONNECTED; /* Suspend the client for a second ... */ - IRC_SetPenalty( Client, 1 ); + IRC_SetPenalty(Client, 1); return CONNECTED; } /* Hello_User */ blob - 5b872fc52a309b498f58935001d1dd040b42e803 blob + 626b8b235245b21f43bf17749cb22d2b9182e5d1 --- src/ngircd/ngircd.c +++ src/ngircd/ngircd.c @@ -40,7 +40,6 @@ #include "client.h" #include "channel.h" #include "conf.h" -#include "cvs-version.h" #include "lists.h" #include "log.h" #include "parse.h" @@ -410,12 +409,9 @@ Fill_Version( void ) strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition )); strlcat( NGIRCd_VersionAddition, TARGET_OS, sizeof( NGIRCd_VersionAddition )); -#ifdef CVSDATE - snprintf( NGIRCd_Version, sizeof NGIRCd_Version,"%s %s(%s)-%s", PACKAGE_NAME, PACKAGE_VERSION, CVSDATE, NGIRCd_VersionAddition); -#else - snprintf( NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s", PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition); -#endif -} /* Fill_Version */ + snprintf(NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s", + PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition); + } /* Fill_Version */ /**