ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Alexander Barton : platformtest.sh: New option "-x", don' t renegerate build system
by alex＠arthur.barton.de 11 Jan '14

11 Jan '14

Module: ngircd.git Branch: master Commit: 97b4fd8a086af9d4a979e8fa3a714352fcffdca3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=97b4fd8a… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 11 01:27:12 2014 +0100 platformtest.sh: New option "-x", don't renegerate build system --- contrib/platformtest.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index 76f4169..dfefc1a 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -16,6 +16,7 @@ NAME=`basename "$0"` VERBOSE= +CLEAN=1 PLATFORM= COMPILER="unknown" @@ -36,8 +37,15 @@ while [ $# -gt 0 ]; do "-v") VERBOSE=1 ;; + "-x") + CLEAN= + ;; *) - echo "Usage: $NAME [-v]" + echo "Usage: $NAME [-v] [-x]" + echo + echo " -v Verbose output" + echo " -x Don't regenerate build system, even when possible" + echo exit 2 esac shift @@ -58,7 +66,7 @@ echo "$NAME: Checking for GIT tree ..." if [ -d .git ]; then echo "$NAME: Checking for \"git\" command ..." git version >/dev/null 2>&1 - if [ $? -eq 0 ]; then + if [ $? -eq 0 -a -n "$CLEAN" ]; then echo "$NAME: Running \"git clean\" ..." [ -n "$VERBOSE" ] && git clean -dxf || git clean -dxf >/dev/null fi

1 0

Alexander Barton : platformtest.sh: Show only up to 10 bytes of version information
by alex＠arthur.barton.de 11 Jan '14

11 Jan '14

Module: ngircd.git Branch: master Commit: 1f5508d0497f1cace5a482fcd7f50ecfce0715f7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1f5508d0… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 11 01:32:12 2014 +0100 platformtest.sh: Show only up to 10 bytes of version information --- contrib/platformtest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index dfefc1a..f34a889 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -151,8 +151,8 @@ fi # Get ngIRCd version information eval $(grep "^VERSION = " Makefile | sed -e 's/ //g') case "$VERSION" in - *-*-*) - VERSION=`echo "$VERSION" | cut -d'-' -f3 | cut -b2-` + *~*-*) + VERSION=`echo "$VERSION" | cut -b1-10` ;; esac [ -n "$VERSION" ] || VERSION="unknown"

1 0

Alexander Barton : platformtest.sh: Allow using separate source and build trees
by alex＠arthur.barton.de 11 Jan '14

11 Jan '14

Module: ngircd.git Branch: master Commit: 2560e5f1560b6b4a225e77de67876a588543c53d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2560e5f1… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 11 01:33:24 2014 +0100 platformtest.sh: Allow using separate source and build trees Now you can call platformtest.sh using its complete path name from an other directory which is then used for building. See <http://www.gnu.org/software/automake/manual/html_node/VPATH-Builds.html> Please not that the build system itself is still (re-)genrated in the original source tree. This can be avoided by passing the "-x" switch to the platformtest.sh script. --- contrib/platformtest.sh | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index f34a889..1067a6e 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -29,6 +29,9 @@ R_MAKE= R_CHECK= R_RUN= +SRC_D=`dirname "$0"` +MY_D="$PWD" + [ -n "$MAKE" ] || MAKE="make" export MAKE CC @@ -52,35 +55,41 @@ while [ $# -gt 0 ]; do done echo "$NAME: Checking ngIRCd base source directory ..." -grep "ngIRCd" ./ChangeLog >/dev/null 2>&1 +grep "ngIRCd" "$SRC_D/ChangeLog" >/dev/null 2>&1 if [ $? -ne 0 ]; then - grep "ngIRCd" ../ChangeLog >/dev/null 2>&1 + grep "ngIRCd" "$SRC_D/../ChangeLog" >/dev/null 2>&1 if [ $? -ne 0 ]; then echo "$NAME: ngIRCd base source directory not found!?" exit 1 fi - cd .. + SRC_D="$SRC_D/.." fi +echo "$NAME: - source directory: $SRC_D" +echo "$NAME: - working directory: $MY_D" echo "$NAME: Checking for GIT tree ..." -if [ -d .git ]; then +if [ -d "$SRC_D/.git" ]; then echo "$NAME: Checking for \"git\" command ..." git version >/dev/null 2>&1 if [ $? -eq 0 -a -n "$CLEAN" ]; then echo "$NAME: Running \"git clean\" ..." + cd "$SRC_D" || exit 1 [ -n "$VERBOSE" ] && git clean -dxf || git clean -dxf >/dev/null + cd "$MY_D" || exit 1 fi fi -echo "$NAME: Checking for \"./configure\" script ..." -if [ ! -r ./configure ]; then - echo "$NAME: Running \"./autogen.sh\" ..." +echo "$NAME: Checking for \"$SRC_D/configure\" script ..." +if [ ! -r "$SRC_D/configure" ]; then + echo "$NAME: Running \"$SRC_D/autogen.sh\" ..." + cd "$SRC_D" || exit 1 [ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null + cd "$MY_D" || exit 1 fi -if [ -r ./configure ]; then - echo "$NAME: Running \"./configure\" script ..." - [ -n "$VERBOSE" ] && ./configure || ./configure >/dev/null +if [ -r "$SRC_D/configure" ]; then + echo "$NAME: Running \"$SRC_D/configure\" script ..." + [ -n "$VERBOSE" ] && "$SRC_D/configure" -C || "$SRC_D/configure" -C >/dev/null if [ $? -eq 0 -a -r ./Makefile ]; then R_CONFIGURE=1 echo "$NAME: Running \"$MAKE\" ..."

1 0

Alexander Barton : Client_SetHostname(): Don't use strlen() to test for value
by alex＠arthur.barton.de 10 Jan '14

10 Jan '14

Module: ngircd.git Branch: master Commit: fe73835666238247809d6390661f66df10362a6e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fe738356… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 10 19:57:03 2014 +0100 Client_SetHostname(): Don't use strlen() to test for value --- src/ngircd/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 5f01648..bfb52e8 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -345,7 +345,7 @@ Client_SetHostname( CLIENT *Client, const char *Hostname ) assert(Client != NULL); assert(Hostname != NULL); - if (strlen(Conf_CloakHost)) { + if (Conf_CloakHost[0]) { char cloak[GETID_LEN]; strlcpy(cloak, Hostname, GETID_LEN);

1 0

Alexander Barton : Test suite: explicitely enable glibc memory checking
by alex＠arthur.barton.de 10 Jan '14

10 Jan '14

Module: ngircd.git Branch: master Commit: 5b4b7e2f55cee950f86966df3e0f335884cf8598 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5b4b7e2f… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 10 19:56:08 2014 +0100 Test suite: explicitely enable glibc memory checking --- src/testsuite/start-server.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/testsuite/start-server.sh b/src/testsuite/start-server.sh index 0fd61ea..3d19ffb 100755 --- a/src/testsuite/start-server.sh +++ b/src/testsuite/start-server.sh @@ -35,6 +35,10 @@ fi # generate MOTD for test-server echo "This is an ngIRCd Test Server" > ngircd-test${id}.motd +# glibc memory checking, see malloc(3) +MALLOC_CHECK_=3 +export MALLOC_CHECK_ + # starting up test-server ... ./T-ngircd${id} -n -f ${srcdir}/ngircd-test${id}.conf $* \ >ngircd-test${id}.log 2>&1 &

1 0

Alexander Barton : Send "fake '*' key" in "MODE -k" replies
by alex＠arthur.barton.de 08 Jan '14

08 Jan '14

Module: ngircd.git Branch: master Commit: 8ae2cdfce9f8ba75fe72d65603d4c05c87f6d9c2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8ae2cdfc… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 8 14:18:09 2014 +0100 Send "fake '*' key" in "MODE -k" replies According to RFC 2812 3.2.3 "Channel mode message" and the examples there, it looks like clients should use "MODE -k <key>" to unset channel keys; and that's how other servers and services behave and do expect it. (But please note that this is NOT the case for "MODE -l"!) In the end, it doesn't make sense to specify a key when UNsetting it at all, and different services behave diffrently when clients do not send the currently set key to unset it - some ignore such calls, for example! But this implementation is quite relaxed, it accepts any key when unsetting channel mode "k" and even accepts no key at all. But the reply will always include an "*" character for every "-k" parameter. --- src/ngircd/irc-mode.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index a29ed23..a59f085 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -582,9 +582,13 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) goto chan_exit; if (!set) { if (is_oper || is_machine || is_owner || - is_admin || is_op || is_halfop) + is_admin || is_op || is_halfop) { x[0] = *mode_ptr; - else + if (Channel_HasMode(Channel, 'k')) + strlcpy(argadd, "*", sizeof(argadd)); + if (arg_arg > mode_arg) + arg_arg++; + } else connected = IRC_WriteErrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(Origin),

1 0

Alexander Barton : Add "config.cache" to .gitignore file
by alex＠arthur.barton.de 06 Jan '14

06 Jan '14

Module: ngircd.git Branch: master Commit: 6685ae063f4e7dd75346cf50cff84c8c109e2d6b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6685ae06… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 6 17:20:54 2014 +0100 Add "config.cache" to .gitignore file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b4d402e..ffd498c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ ar-lib autom4te.cache build-stamp-ngircd* compile +config.cache config.log config.status configure

1 0

Alexander Barton : platformtest.sh: don't use "test -e", it isn't portable
by alex＠arthur.barton.de 05 Jan '14

05 Jan '14

Module: ngircd.git Branch: master Commit: e2b85ccde360ccc389afb0af12d5d75f0549f666 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e2b85ccd… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 5 00:48:31 2014 +0100 platformtest.sh: don't use "test -e", it isn't portable --- contrib/platformtest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index 6a1dc71..76f4169 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -1,7 +1,7 @@ #!/bin/sh # # 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 @@ -65,7 +65,7 @@ if [ -d .git ]; then fi echo "$NAME: Checking for \"./configure\" script ..." -if [ ! -e ./configure ]; then +if [ ! -r ./configure ]; then echo "$NAME: Running \"./autogen.sh\" ..." [ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null fi

1 0

Alexander Barton : Makefile.am: don't use "test -e", it isn't portable
by alex＠arthur.barton.de 05 Jan '14

05 Jan '14

Module: ngircd.git Branch: master Commit: 7b358a57acfbb6e70f7c63d796b1e45e86431d1f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7b358a57… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 5 00:12:00 2014 +0100 Makefile.am: don't use "test -e", it isn't portable --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0b797c1..11c382e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,7 +69,7 @@ osxpkg: have-packagemaker osxpkg-dest make osxpkg-clean osxpkg-clean: - [ ! -e ngircd.dest ] || sudo -n rm -rf ngircd.dest + [ ! -r ngircd.dest ] || sudo -n rm -rf ngircd.dest rm -rf ngircd.dest $(distdir).mpkg osxpkg-dest: have-xcodebuild osxpkg-clean clean

1 0

Alexander Barton : Support non-standard vsnprintf() return code
by alex＠arthur.barton.de 04 Jan '14

04 Jan '14

Module: ngircd.git Branch: master Commit: 5d88030bd1a197041f84530a88c2590e6bb1bbb1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5d88030b… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 4 23:57:05 2014 +0100 Support non-standard vsnprintf() return code C99 states that vsnprintf() "returns the number of characters that would have been printed if the n were unlimited"; but according to the Linux manual page "glibc until 2.0.6 would return -1 when the output was truncated" -- so we have to handle both cases ... --- src/ngircd/conn.c | 13 +++++++++++-- src/portab/portabtest.c | 25 ++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 3f447c6..fef568e 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.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 @@ -984,6 +984,7 @@ va_dcl size_t len; bool ok; va_list ap; + int r; assert( Idx > NONE ); assert( Format != NULL ); @@ -993,7 +994,8 @@ va_dcl #else va_start( ap ); #endif - if (vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) >= COMMAND_LEN - 2 ) { + r = vsnprintf(buffer, COMMAND_LEN - 2, Format, ap); + if (r >= COMMAND_LEN - 2 || r == -1) { /* * The string that should be written to the socket is longer * than the allowed size of COMMAND_LEN bytes (including both @@ -1014,6 +1016,13 @@ va_dcl * an other server only routing the message!), so the only * option left is to shorten the string and to hope that the * result is still somewhat useful ... + * + * Note: + * C99 states that vsnprintf() "returns the number of characters + * that would have been printed if the n were unlimited"; but + * according to the Linux manual page "glibc until 2.0.6 would + * return -1 when the output was truncated" -- so we have to + * handle both cases ... * -alex- */ diff --git a/src/portab/portabtest.c b/src/portab/portabtest.c index 9e6bd22..b104739 100644 --- a/src/portab/portabtest.c +++ b/src/portab/portabtest.c @@ -139,16 +139,35 @@ va_dcl { char str[5]; va_list ap; + int r; #ifdef PROTOTYPES va_start(ap, Format); #else va_start(ap); #endif - if (vsnprintf(str, sizeof(str), Format, ap) != Len) - Panic("vsnprintf return code"); + r = vsnprintf(str, sizeof(str), Format, ap); va_end(ap); - + if (r != Len) { + /* C99 states that vsnprintf() "returns the number of + * characters that would have been printed if the n were + * unlimited", but according to the Linux manual page "glibc + * until 2.0.6 would return -1 when the output was truncated", + * and other implementations (libUTIL on A/UX) even return the + * number of characters processed ... so we only test our own + * implementation and warn on errors otherwise :-/ */ +#ifdef HAVE_VSNPRINTF + fprintf(stderr, + "\n ** WARNING: The vsnprintf() function of this system isn't standard\n"); + fprintf(stderr, + " ** conformant and returns a WRONG result: %d (should be %d)! The test\n", + r, Len); + fprintf(stderr, + " ** result has been ignored but may lead to errors during execution!\n\n"); +#else + Panic("vsnprintf return code"); +#endif + } if (str[4] != '\0') Panic("vsnprintf NULL byte"); if (strlen(str) != 4)

1 0

Springe zur Seite:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates