- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Make sourcecode compatible with ansi2knr again
by alex＠arthur.barton.de 24 Okt '10

24 Okt '10

Module: ngircd.git Branch: master Commit: 596bc096b02ef94efe3d73bb747c6ab0368f63bf URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=596bc096… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 24 21:48:32 2010 +0200 Make sourcecode compatible with ansi2knr again This allows to compile ngIRCd using a pre-ANSI K&R C compiler again: all source files are automatically converted by the included ansi2knr program (of GNU automake/autoconf) before compiling them with the K&R C compiler, but a few coding standards must be met. Tested on Apple A/UX 3.x. Regression testing on Linux and Mac OS X. --- src/ipaddr/ng_ipaddr.h | 7 ++++- src/ngircd/client.c | 3 +- src/ngircd/conf-ssl.h | 3 +- src/ngircd/conf.c | 3 +- src/ngircd/conn.c | 6 +++- src/ngircd/conn.h | 4 ++- src/ngircd/io.c | 49 +++++++++++++++++++++++++++++++++++------------ src/ngircd/irc-info.c | 4 ++- src/ngircd/resolve.c | 8 +++--- src/tool/tool.c | 4 +- 10 files changed, 63 insertions(+), 28 deletions(-) diff --git a/src/ipaddr/ng_ipaddr.h b/src/ipaddr/ng_ipaddr.h index 4582e2a..54a9703 100644 --- a/src/ipaddr/ng_ipaddr.h +++ b/src/ipaddr/ng_ipaddr.h @@ -103,8 +103,11 @@ GLOBAL const char *ng_ipaddr_tostr PARAMS((const ng_ipaddr_t *addr)); /* convert struct sockaddr to string. dest must be NG_INET_ADDRSTRLEN bytes long */ GLOBAL bool ng_ipaddr_tostr_r PARAMS((const ng_ipaddr_t *addr, char *dest)); #else -static inline const char * -ng_ipaddr_tostr(const ng_ipaddr_t *addr) { return inet_ntoa(addr->sin4.sin_addr); } +static inline const char* +ng_ipaddr_tostr(const ng_ipaddr_t *addr) +{ + return inet_ntoa(addr->sin4.sin_addr); +} static inline bool ng_ipaddr_tostr_r(const ng_ipaddr_t *addr, char *d) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 0334783..739c5ea 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -363,7 +363,8 @@ Client_SetUser( CLIENT *Client, const char *User, bool Idented ) * @param User User name to set. */ GLOBAL void -Client_SetOrigUser(CLIENT UNUSED *Client, const char UNUSED *User) { +Client_SetOrigUser(CLIENT UNUSED *Client, const char UNUSED *User) +{ assert(Client != NULL); assert(User != NULL); diff --git a/src/ngircd/conf-ssl.h b/src/ngircd/conf-ssl.h index e88d3e8..cdb9968 100644 --- a/src/ngircd/conf-ssl.h +++ b/src/ngircd/conf-ssl.h @@ -39,7 +39,8 @@ bool ConnSSL_InitLibrary(void); #else static inline bool -ConnSSL_InitLibrary(void) { return true; } +ConnSSL_InitLibrary(void) +{ return true; } #endif /* SSL_SUPPORT */ #endif /* conf_ssl_h */ diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index f8b470f..4804f2b 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -844,7 +844,8 @@ Check_ArgIsTrue( const char *Arg ) } /* Check_ArgIsTrue */ -static unsigned int Handle_MaxNickLength(int Line, const char *Arg) +static unsigned int +Handle_MaxNickLength(int Line, const char *Arg) { unsigned new; diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index d74f251..bbb186e 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -681,9 +681,11 @@ SSL_WantWrite(const CONNECTION *c) } #else static inline bool -SSL_WantRead(UNUSED const CONNECTION *c) { return false; } +SSL_WantRead(UNUSED const CONNECTION *c) +{ return false; } static inline bool -SSL_WantWrite(UNUSED const CONNECTION *c) { return false; } +SSL_WantWrite(UNUSED const CONNECTION *c) +{ return false; } #endif diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 1e938ad..280c61b 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -122,7 +122,9 @@ GLOBAL PROC_STAT* Conn_GetProcStat PARAMS((CONN_ID i)); GLOBAL bool Conn_GetCipherInfo PARAMS((CONN_ID Idx, char *buf, size_t len)); GLOBAL bool Conn_UsesSSL PARAMS((CONN_ID Idx)); #else -static inline bool Conn_UsesSSL(UNUSED CONN_ID Idx) { return false; } +static inline bool +Conn_UsesSSL(UNUSED CONN_ID Idx) +{ return false; } #endif GLOBAL long Conn_Count PARAMS((void)); diff --git a/src/ngircd/io.c b/src/ngircd/io.c index 411b383..d13a5e2 100644 --- a/src/ngircd/io.c +++ b/src/ngircd/io.c @@ -115,7 +115,7 @@ static fd_set writers; * the largest fd registered, plus one. */ static int select_maxfd; -static int io_dispatch_select(struct timeval *tv); +static int io_dispatch_select PARAMS((struct timeval *tv)); #ifndef IO_USE_EPOLL #define io_masterfd -1 @@ -127,12 +127,15 @@ static array io_events; static void io_docallback PARAMS((int fd, short what)); #ifdef DEBUG_IO -static void io_debug(const char *s, int fd, int what) +static void +io_debug(const char *s, int fd, int what) { Log(LOG_DEBUG, "%s: %d, %d\n", s, fd, what); } #else -static inline void io_debug(const char UNUSED *s,int UNUSED a, int UNUSED b) {/*NOTHING*/} +static inline void +io_debug(const char UNUSED *s,int UNUSED a, int UNUSED b) +{ /* NOTHING */ } #endif static io_event * @@ -227,8 +230,12 @@ io_library_init_devpoll(unsigned int eventsize) eventsize, io_masterfd); } #else -static inline void io_close_devpoll(int UNUSED x) {/* NOTHING */} -static inline void io_library_init_devpoll(unsigned int UNUSED ev) {/*NOTHING*/} +static inline void +io_close_devpoll(int UNUSED x) +{ /* NOTHING */ } +static inline void +io_library_init_devpoll(unsigned int UNUSED ev) +{ /* NOTHING */ } #endif @@ -331,8 +338,12 @@ io_library_init_poll(unsigned int eventsize) } } #else -static inline void io_close_poll(int UNUSED x) {/* NOTHING */} -static inline void io_library_init_poll(unsigned int UNUSED ev) {/*NOTHING*/} +static inline void +io_close_poll(int UNUSED x) +{ /* NOTHING */ } +static inline void +io_library_init_poll(unsigned int UNUSED ev) +{ /* NOTHING */ } #endif @@ -340,11 +351,15 @@ static inline void io_library_init_poll(unsigned int UNUSED ev) {/*NOTHING*/} static int io_dispatch_select(struct timeval *tv) { - fd_set readers_tmp = readers; - fd_set writers_tmp = writers; + fd_set readers_tmp; + fd_set writers_tmp; short what; int ret, i; int fds_ready; + + readers_tmp = readers; + writers_tmp = writers; + ret = select(select_maxfd + 1, &readers_tmp, &writers_tmp, NULL, tv); if (ret <= 0) return ret; @@ -418,8 +433,12 @@ io_close_select(int fd) } } #else -static inline void io_library_init_select(int UNUSED x) {/* NOTHING */} -static inline void io_close_select(int UNUSED x) {/* NOTHING */} +static inline void +io_library_init_select(int UNUSED x) +{ /* NOTHING */ } +static inline void +io_close_select(int UNUSED x) +{ /* NOTHING */ } #endif /* SELECT */ @@ -494,7 +513,9 @@ io_library_init_epoll(unsigned int eventsize) #endif } #else -static inline void io_library_init_epoll(unsigned int UNUSED ev) {/* NOTHING */} +static inline void +io_library_init_epoll(unsigned int UNUSED ev) +{ /* NOTHING */ } #endif /* IO_USE_EPOLL */ @@ -620,7 +641,9 @@ io_library_init_kqueue(unsigned int eventsize) library_initialized = true; } #else -static inline void io_library_init_kqueue(unsigned int UNUSED ev) {/* NOTHING */} +static inline void +io_library_init_kqueue(unsigned int UNUSED ev) +{ /* NOTHING */ } #endif diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 8f86e80..638a8e9 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1239,7 +1239,9 @@ static bool Show_MOTD_SSLInfo(CLIENT *Client) return ret; } #else -static inline bool Show_MOTD_SSLInfo(UNUSED CLIENT *c) { return true; } +static inline bool +Show_MOTD_SSLInfo(UNUSED CLIENT *c) +{ return true; } #endif GLOBAL bool diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 9bc3a87..5839c19 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -344,15 +344,15 @@ Addr_in_list(const array *resolved_addr, const ng_ipaddr_t *Addr) static void Log_Forgery_NoIP(const char *ip, const char *host) { - Log_Subprocess(LOG_WARNING, "Possible forgery: %s resolved to %s " - "(which has no ip address)", ip, host); + Log_Subprocess(LOG_WARNING, + "Possible forgery: %s resolved to %s (which has no ip address)", ip, host); } static void Log_Forgery_WrongIP(const char *ip, const char *host) { - Log_Subprocess(LOG_WARNING,"Possible forgery: %s resolved to %s " - "(which points to different address)", ip, host); + Log_Subprocess(LOG_WARNING, + "Possible forgery: %s resolved to %s (which points to different address)", ip, host); } diff --git a/src/tool/tool.c b/src/tool/tool.c index 9e29074..dbdb49a 100644 --- a/src/tool/tool.c +++ b/src/tool/tool.c @@ -186,8 +186,8 @@ CODE facilitynames[] = { #endif -GLOBAL const char -*ngt_SyslogFacilityName(int Facility) +GLOBAL const char* +ngt_SyslogFacilityName(int Facility) { int i = 0; while(facilitynames[i].c_name) {

1 0

Alexander Barton : ./configure: check support for C prototypes again
by alex＠arthur.barton.de 24 Okt '10

24 Okt '10

Module: ngircd.git Branch: master Commit: 3b7428087910a79cf7d332206470efb59182a22f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3b742808… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 24 13:50:22 2010 +0200 ./configure: check support for C prototypes again --- configure.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index cd08ef6..d2acc14 100644 --- a/configure.in +++ b/configure.in @@ -43,6 +43,7 @@ AH_TEMPLATE([TARGET_CPU], [Target CPU name]) # -- C Compiler -- AC_PROG_CC +AC_C_PROTOTYPES # -- Helper programs --

1 0

Alexander Barton : ./configure: check if C compiler can compile ISO Standard C
by alex＠arthur.barton.de 24 Okt '10

24 Okt '10

Module: ngircd.git Branch: master Commit: 5700329f8c7dda39610f5836d641f4cea6912197 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5700329f… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 24 14:14:30 2010 +0200 ./configure: check if C compiler can compile ISO Standard C This is required for enabling ansi2knr on systems that don't have an ANSI C compiler installed (e.g. on A/UX with Apple standard C compiler). --- configure.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index d2acc14..965258a 100644 --- a/configure.in +++ b/configure.in @@ -43,6 +43,7 @@ AH_TEMPLATE([TARGET_CPU], [Target CPU name]) # -- C Compiler -- AC_PROG_CC +AC_PROG_CC_STDC AC_C_PROTOTYPES # -- Helper programs --

1 0

Alexander Barton : Don't use PARAMS() macro for function implementations
by alex＠arthur.barton.de 24 Okt '10

24 Okt '10

Module: ngircd.git Branch: master Commit: f1267ca375b0b754bb466e6c95713566072d3345 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f1267ca3… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 24 13:41:51 2010 +0200 Don't use PARAMS() macro for function implementations The PARAMS() macro is only needed for function prototypes; don't use it for the actual implementations. --- src/ngircd/irc-info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 905799e..8f86e80 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1337,7 +1337,7 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan ) * See <http://www.irc.org/tech_docs/005.html> for details. */ GLOBAL bool -IRC_Send_ISUPPORT PARAMS((CLIENT * Client)) +IRC_Send_ISUPPORT(CLIENT * Client) { if (!IRC_WriteStrClient(Client, RPL_ISUPPORT1_MSG, Client_ID(Client), Conf_MaxJoins))

1 0

Alexander Barton : Added m68k/apple/aux3.0.1 (gcc 2.7.2) to doc/Platforms. txt
by alex＠arthur.barton.de 19 Okt '10

19 Okt '10

Module: ngircd.git Branch: master Commit: ccb175dce6dc257c9baf561e8a9f704f26e49f17 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ccb175dc… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 19 22:19:18 2010 +0200 Added m68k/apple/aux3.0.1 (gcc 2.7.2) to doc/Platforms.txt --- doc/Platforms.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index ce06e27..32cb8c1 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -57,6 +57,7 @@ i686/pc/linux-gnu gcc 2.95.4 0.8.0 04-05-30 alex Y Y Y Y (1) i686/pc/linux-gnu gcc 3.3.5 14.1 09-08-04 alex Y Y Y Y (1) i386/pc/linux-gnu gcc 4.1.2 13~rc1 08-12-05 alex Y Y Y Y (1) i686/pc/linux-gnu gcc 4.3.2 14.1 09-08-04 alex Y Y Y Y (1) +m68k/apple/aux3.0.1 gcc 2.7.2 17~rc1 10-10-12 alex Y Y Y Y m68k/apple/aux3.1.1 Orig. A/UX 0.7.x-CVS 03-04-22 alex Y Y Y Y (2) m68k/hp/hp-ux9.10 Orig. HPUX 0.7.x-CVS 03-04-30 goetz Y Y Y Y m88k/dg/dgux5.4R3.10 gcc 2.5.8 CVSHEAD 04-03-15 alex Y Y ? ?

1 0

Alexander Barton : Only try to set FD_CLOEXEC if this flag is defined
by alex＠arthur.barton.de 19 Okt '10

19 Okt '10

Module: ngircd.git Branch: master Commit: 99e08eaced30fc80c91be9fdb8635409a4b93500 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=99e08eac… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 19 22:17:12 2010 +0200 Only try to set FD_CLOEXEC if this flag is defined A/UX 3.x doesn't implement this constant, for example. --- src/ngircd/io.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/ngircd/io.c b/src/ngircd/io.c index 6843899..411b383 100644 --- a/src/ngircd/io.c +++ b/src/ngircd/io.c @@ -791,7 +791,9 @@ io_setcloexec(int fd) int flags = fcntl(fd, F_GETFD); if (flags == -1) return false; +#ifdef FD_CLOEXEC flags |= FD_CLOEXEC; +#endif return fcntl(fd, F_SETFD, flags) == 0; }

1 0

Alexander Barton : Only use "__attribute__ ((unused))" if GCC >=2.8 is used
by alex＠arthur.barton.de 19 Okt '10

19 Okt '10

Module: ngircd.git Branch: master Commit: 5f2bc55d36810499a4533589acb45839f4721c84 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5f2bc55d… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 19 22:13:12 2010 +0200 Only use "__attribute__ ((unused))" if GCC >=2.8 is used At least GCC 2.7.2 doesn't support this attribute. --- src/portab/portab.h | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/portab/portab.h b/src/portab/portab.h index 56d4249..d2f769f 100644 --- a/src/portab/portab.h +++ b/src/portab/portab.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2005 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 Alexander Barton (alex(a)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 @@ -8,8 +8,6 @@ * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: portab.h,v 1.22 2005/07/31 20:13:11 alex Exp $ - * * Portability functions and declarations (header for libngbportab). */ @@ -48,7 +46,7 @@ /* compiler features */ -#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) +#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 7)) # define PUNUSED(x) __attribute__ ((unused)) x # define UNUSED __attribute__ ((unused)) #else

1 0

Alexander Barton : doc/Makefile.am: don¹t set docdir , automake handles it already
by alex＠arthur.barton.de 19 Okt '10

19 Okt '10

Module: ngircd.git Branch: master Commit: 1fa5b119950780b8ad2c052d737b8b8f89e0ef2d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1fa5b119… Author: Alexander Barton <alex(a)barton.de> Date: Wed Oct 13 22:46:29 2010 +0200 doc/Makefile.am: don¹t set docdir, automake handles it already And elder make(1) programs don¹t like "x ?= y" ... --- doc/Makefile.am | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 34dd9c9..3a37ff4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -19,8 +19,6 @@ EXTRA_DIST = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \ maintainer-clean-local: rm -f Makefile Makefile.in -docdir ?= $(datadir)/doc/$(PACKAGE) - documents = $(EXTRA_DIST) ../AUTHORS ../COPYING ../ChangeLog ../INSTALL \ ../NEWS ../README

1 0

Tag rel-17-rc1: Alexander Barton : ngIRCd release 17~rc1
by alex＠arthur.barton.de 11 Okt '10

11 Okt '10

Module: ngircd.git Branch: refs/tags/rel-17-rc1 Tag: 17069510d79de660b9c63eb7fd13ddc3d48290c6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=17069510d79… Tagger: Alexander Barton <alex(a)barton.de> Date: Mon Oct 11 23:26:45 2010 +0200 ngIRCd release 17~rc1

1 0

Alexander Barton : ngIRCd release 17~rc1
by alex＠arthur.barton.de 11 Okt '10

11 Okt '10

Module: ngircd.git Branch: master Commit: d00a0f1e7c8b7e247f26a8fc265ca8217eaace8b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d00a0f1e… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 11 23:25:48 2010 +0200 ngIRCd release 17~rc1 --- ChangeLog | 1 + NEWS | 2 ++ configure.in | 2 +- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index de87b29..00e8c39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ ngIRCd Release 17 + ngIRCd 17~rc1 (2010-10-11) - New configuration option "NoZeroConf" to disable service registration at runtime even if ngIRCd is compiled with support for ZeroConf (e.g. using Howl, Avahi or on Mac OS X). diff --git a/NEWS b/NEWS index 3ab5ae9..3b71765 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,7 @@ ngIRCd Release 17 + ngIRCd 17~rc1 (2010-10-11) - New configuration option "NoZeroConf" to disable service registration at runtime even if ngIRCd is compiled with support for ZeroConf (e.g. using Howl, Avahi or on Mac OS X). @@ -35,6 +36,7 @@ ngIRCd Release 17 - New configuration option "NoPAM" to disable PAM. - Implement asynchronous user authentication using PAM, please see the file doc/PAM.txt for details. + - Add some documentation for using BOPM with ngIRCd, see doc/Bopm.txt. - Implement user mode "c": receive connect/disconnect NOTICEs. Note that this new mode requires the user to be an IRC operator. - Show SSL status in WHOIS output, numeric 275. diff --git a/configure.in b/configure.in index 897d424..cd08ef6 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 17-dev) +AC_INIT(ngircd, 17~rc1) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index a337686..d7c2d5a 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (17~rc1-0ab1) unstable; urgency=low + + * New "upstream" release candidate 1 for ngIRCd Release 17. + + -- Alexander Barton <alex(a)barton.de> Mon, 11 Oct 2010 16:57:47 +0200 + ngircd (16-0ab1) unstable; urgency=low * New "upstream" release: ngIRCd 16. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index 4ecc152..6b4821a 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 16 +%define version 17~rc1 %define release 1 %define prefix %{_prefix}

1 0