März 2014 - ngIRCd GIT Updates

Alexander Barton : Update #include's: remove unused and add missing ones
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

Module: ngircd.git Branch: master Commit: b130b35f48d19450240748425e12d21f2c38350f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b130b35f… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 17 02:28:39 2014 +0100 Update #include's: remove unused and add missing ones The "deheader" tool (<http://www.catb.org/~esr/deheader/>) has been used to find unused #include directives as well as missing ones. Tested on: - A/UX 3.1.1 - ArchLinux (2014-03-17) - Debian GNU/Hurd - Debian GNU/Linux 6.0.9 - Debian GNU/Linux 7.4 - Fedora 20 - FreeBSD 9.2 - OpenBSD 4.8 - OpenBSD 5.1 - OS X 10.9 - Solaris 11 --- src/ipaddr/ng_ipaddr.h | 1 + src/ngircd/array.c | 5 ++++- src/ngircd/channel.c | 3 +-- src/ngircd/class.c | 6 +----- src/ngircd/client-cap.c | 4 ---- src/ngircd/client.c | 4 +--- src/ngircd/conf.c | 6 +----- src/ngircd/conn-encoding.c | 9 ++++----- src/ngircd/conn-func.c | 7 ++++--- src/ngircd/conn.c | 17 ++++++----------- src/ngircd/hash.c | 2 -- src/ngircd/io.c | 2 +- src/ngircd/irc-cap.c | 5 +---- src/ngircd/irc-channel.c | 3 --- src/ngircd/irc-encoding.c | 6 ++---- src/ngircd/irc-info.c | 5 +---- src/ngircd/irc-login.c | 5 +---- src/ngircd/irc-metadata.c | 6 +----- src/ngircd/irc-mode.c | 3 --- src/ngircd/irc-op.c | 4 ---- src/ngircd/irc-oper.c | 4 +--- src/ngircd/irc-server.c | 6 ------ src/ngircd/irc-write.c | 2 -- src/ngircd/irc.c | 8 +++++--- src/ngircd/lists.c | 12 ++++-------- src/ngircd/log.c | 10 ++++------ src/ngircd/login.c | 10 +++++----- src/ngircd/match.c | 1 - src/ngircd/ngircd.c | 6 ------ src/ngircd/numeric.c | 9 ++------- src/ngircd/op.c | 3 --- src/ngircd/pam.c | 17 +++++++---------- src/ngircd/parse.c | 10 ++++------ src/ngircd/proc.c | 4 +++- src/ngircd/resolve.c | 8 ++------ src/ngircd/sighandlers.c | 3 +-- 36 files changed, 68 insertions(+), 148 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=b130…

1 0

Alexander Barton : portab.h: Restructure and clean up code
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

Module: ngircd.git Branch: master Commit: 37090a28e8319650e49b4bd3e0518c2f8cbc8ae4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=37090a28… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 17 01:17:30 2014 +0100 portab.h: Restructure and clean up code - Don't use HAVE_SYS_TYPES_H, <sys/types.h> is a required header now. - Streamline check for boolean data types. - Better indent #ifdef constructs. --- src/portab/portab.h | 84 ++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 44 deletions(-) diff --git a/src/portab/portab.h b/src/portab/portab.h index e30262d..78b6f7e 100644 --- a/src/portab/portab.h +++ b/src/portab/portab.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2014 Alexander Barton (alex(a)barton.de) and Contributors. * * 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 @@ -23,28 +23,6 @@ # define NDEBUG #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> -# define NGIRC_GOT_INTTYPES -#else -# ifdef HAVE_STDINT_H -# include <stdint.h> -# define NGIRC_GOT_INTTYPES -# endif -#endif - -#ifdef HAVE_STDDEF_H -# include <stddef.h> -#endif - -#ifdef HAVE_STDBOOL_H -# include <stdbool.h> -#endif - /* compiler features */ #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 7)) @@ -65,6 +43,22 @@ /* datatypes */ +#include <sys/types.h> + +#ifdef HAVE_STDDEF_H +# include <stddef.h> +#endif + +#ifdef HAVE_INTTYPES_H +# include <inttypes.h> +# define NGIRC_GOT_INTTYPES +#else +# ifdef HAVE_STDINT_H +# include <stdint.h> +# define NGIRC_GOT_INTTYPES +# endif +#endif + #ifndef PROTOTYPES # ifndef signed # define signed @@ -83,26 +77,28 @@ typedef unsigned short UINT16; typedef unsigned int UINT32; #endif -#ifndef HAVE_STDBOOL_H +#ifdef HAVE_STDBOOL_H +# include <stdbool.h> +#else typedef unsigned char bool; -#define true (bool)1 -#define false (bool)0 +# define true (bool)1 +# define false (bool)0 #endif #ifndef NULL -#ifdef PROTOTYPES -# define NULL (void *)0 -#else -# define NULL 0L -#endif +# ifdef PROTOTYPES +# define NULL (void *)0 +# else +# define NULL 0L +# endif #endif #ifdef NeXT -#define S_IRUSR 0000400 /* read permission, owner */ -#define S_IWUSR 0000200 /* write permission, owner */ -#define S_IRGRP 0000040 /* read permission, group */ -#define S_IROTH 0000004 /* read permission, other */ -#define ssize_t int +# define S_IRUSR 0000400 /* read permission, owner */ +# define S_IWUSR 0000200 /* write permission, owner */ +# define S_IRGRP 0000040 /* read permission, group */ +# define S_IROTH 0000004 /* read permission, other */ +# define ssize_t int #endif #undef GLOBAL @@ -111,25 +107,25 @@ typedef unsigned char bool; /* SPLint */ #ifdef S_SPLINT_S -#include "splint.h" +# include "splint.h" #endif /* target constants */ #ifndef HOST_OS -#define HOST_OS "unknown" +# define HOST_OS "unknown" #endif #ifndef HOST_CPU -#define HOST_CPU "unknown" +# define HOST_CPU "unknown" #endif #ifndef HOST_VENDOR -#define HOST_VENDOR "unknown" +# define HOST_VENDOR "unknown" #endif #ifdef __HAIKU__ -#define SINGLE_USER_OS +# define SINGLE_USER_OS #endif /* configure options */ @@ -168,15 +164,15 @@ extern int vsnprintf PARAMS(( char *str, size_t count, const char *fmt, va_list #endif #ifndef HAVE_GAI_STRERROR -#define gai_strerror(r) "unknown error" +# define gai_strerror(r) "unknown error" #endif #ifndef PACKAGE_NAME -#define PACKAGE_NAME PACKAGE +# define PACKAGE_NAME PACKAGE #endif #ifndef PACKAGE_VERSION -#define PACKAGE_VERSION VERSION +# define PACKAGE_VERSION VERSION #endif #endif

1 0

Alexander Barton : configure[.ng]: <sys/types.h> is a required header file
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

Module: ngircd.git Branch: master Commit: 67256f9da1cd43a31e3e703d15fbd4cf75c23923 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=67256f9d… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 17 00:47:45 2014 +0100 configure[.ng]: <sys/types.h> is a required header file ngIRCd already includes <sys/types.h> in a lot of places without checking for its existence (for example in "ngircd.c", "io.c", ...), therefore make it a required header file. --- configure.ng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ng b/configure.ng index 5f85a4d..bd40694 100644 --- a/configure.ng +++ b/configure.ng @@ -155,7 +155,7 @@ AC_HEADER_TIME # Required header files AC_CHECK_HEADERS([ \ fcntl.h netdb.h netinet/in.h stdlib.h string.h \ - strings.h sys/socket.h sys/time.h unistd.h \ + strings.h sys/socket.h sys/time.h sys/types.h unistd.h \ ],,AC_MSG_ERROR([required C header missing!])) # Optional header files

1 0

Alexander Barton : Remove imp.h and exp.h header files
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

1 0

Alexander Barton : io.c: <sys/time.h> is only needed when using select()
by alex＠arthur.barton.de 17 Mär '14

17 Mär '14

Module: ngircd.git Branch: master Commit: 7b10a0e4ee64657e138dc9ef3a0d8a68c0e275f0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7b10a0e4… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 17 00:45:07 2014 +0100 io.c: <sys/time.h> is only needed when using select() Only include the <sys/time.h> header when using the select() IO API, it isn't required otherwise. --- src/ngircd/io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/io.c b/src/ngircd/io.c index dab3043..791190f 100644 --- a/src/ngircd/io.c +++ b/src/ngircd/io.c @@ -18,7 +18,6 @@ #include <assert.h> #include <stdlib.h> #include <string.h> -#include <sys/time.h> #include <sys/types.h> #include <unistd.h> #include <fcntl.h> @@ -119,6 +118,7 @@ static bool io_event_change_devpoll(int fd, short what); #endif #ifdef IO_USE_SELECT +#include <sys/time.h> #include "defines.h" /* for conn.h */ #include "proc.h" /* for PROC_STAT (needed by conf.h) */ #include "conn.h" /* for CONN_ID (needed by conf.h) */

1 0

Alexander Barton : strdup.c: Code cleanup
by alex＠arthur.barton.de 16 Mär '14

16 Mär '14

Module: ngircd.git Branch: master Commit: 51396f8f1c10506b558ce98aafb80aff4b2a95bd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=51396f8f… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 16 22:59:03 2014 +0100 strdup.c: Code cleanup --- src/portab/strdup.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/portab/strdup.c b/src/portab/strdup.c index 7c0ee8f..795af72 100644 --- a/src/portab/strdup.c +++ b/src/portab/strdup.c @@ -19,18 +19,19 @@ #include "exp.h" GLOBAL char * -strdup( const char *s ) +strdup(const char *s) { - char *dup; - size_t len = strlen( s ); - size_t alloc = len + 1; + char *dup; + size_t len = strlen(s); + size_t alloc = len + 1; - if (len >= alloc ) return NULL; - dup = malloc( alloc ); - if (dup) strlcpy(dup, s, alloc ); + if (len >= alloc) + return NULL; + dup = malloc(alloc); + if (dup) + strlcpy(dup, s, alloc ); -return dup; + return dup; } #endif -

1 0

Alexander Barton : Don't define SSL_Want{Read|Write}() when SSL is disabled
by alex＠arthur.barton.de 16 Mär '14

16 Mär '14

Module: ngircd.git Branch: master Commit: 6238196dac6cab9dae0b4d01190a7fad307d5a93 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6238196d… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 16 22:28:37 2014 +0100 Don't define SSL_Want{Read|Write}() when SSL is disabled Not even call the "dummy" functions. --- src/ngircd/conn.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 6056355..fad3435 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -809,16 +809,6 @@ SSL_WantWrite(const CONNECTION *c) return false; } -#else - -static inline bool -SSL_WantRead(UNUSED const CONNECTION *c) -{ return false; } - -static inline bool -SSL_WantWrite(UNUSED const CONNECTION *c) -{ return false; } - #endif @@ -881,8 +871,10 @@ Conn_Handler(void) if (wdatalen > 0) #endif { +#ifdef SSL_SUPPORT if (SSL_WantRead(&My_Connections[i])) continue; +#endif io_event_add(My_Connections[i].sock, IO_WANTWRITE); }

1 0

Alexander Barton : Code cleanup, remove blank lines
by alex＠arthur.barton.de 16 Mär '14

16 Mär '14

Module: ngircd.git Branch: master Commit: 43fb18f2f5a506c4d78967e4b6e961b7339c98dc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=43fb18f2… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 16 22:11:26 2014 +0100 Code cleanup, remove blank lines --- src/ipaddr/ng_ipaddr.h | 1 + src/ngircd/channel.c | 2 -- src/ngircd/conn-encoding.c | 3 +-- src/ngircd/conn-func.c | 19 ------------------- src/ngircd/conn.c | 2 -- src/ngircd/log.c | 1 - src/ngircd/match.c | 9 --------- src/ngircd/ngircd.c | 1 - src/ngircd/numeric.c | 6 ------ src/ngircd/op.c | 2 -- src/portab/portab.h | 5 ----- src/portab/strlcpy.c | 2 -- src/portab/strndup.c | 2 +- 13 files changed, 3 insertions(+), 52 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=43fb…

1 0

Alexander Barton : Fix two K&R C portability issues
by alex＠arthur.barton.de 16 Mär '14

16 Mär '14

Module: ngircd.git Branch: master Commit: a4ed90ba9af1dce4df3f57f6a7c84097000c7256 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a4ed90ba… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 16 20:07:08 2014 +0100 Fix two K&R C portability issues Fix the following two errors emitted by the Apple K&R C compiler on Apple A/UX: "./class.c", line 47: no automatic aggregate initialization "./class.c", line 47: illegal lhs of assignment operator "./conf.c", line 1052: syntax error Tested on A/UX 3.1.1. --- src/ngircd/class.c | 6 ++++-- src/ngircd/conf.c | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index b2b1aa3..d08f4c5 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2014 Alexander Barton (alex(a)barton.de) and Contributors. * * 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 @@ -50,11 +50,13 @@ Class_Exit(void) GLOBAL bool Class_GetMemberReason(const int Class, CLIENT *Client, char *reason, size_t len) { - char str[COMMAND_LEN] = "listed"; + char str[COMMAND_LEN]; assert(Class < CLASS_COUNT); assert(Client != NULL); + strlcpy(str, "listed", sizeof(str)); + if (!Lists_CheckReason(&My_Classes[Class], Client, str, sizeof(str))) return false; diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 34abbad..c4b219f 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2013 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2014 Alexander Barton (alex(a)barton.de) and Contributors. * * 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 @@ -1053,9 +1053,13 @@ Read_Config(bool TestOnly, bool IsStarting) } /** - * ... + * Read in and handle a configuration file. + * + * @param File Name of the configuration file. + * @param fd File descriptor already opened for reading. */ -static void Read_Config_File(const char *File, FILE *fd) +static void +Read_Config_File(const char *File, FILE *fd) { char section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr; int i, line = 0;

1 0