Remove some trailing blank leftovers;

Sort .mailmap and .gitignore;
Don't send another blank line in /info.

[ci skip]

diff --git a/.gitignore b/.gitignore
index 5fe7ae619a0f335478284529f6bde35aa337b832..6669f5260c0955090a828cfe9c8e19c61bafe474 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,98 +1,103 @@
-tags
-Makefile
-*~
+!tests/runtime/modules/*.so
+!tests/runtime/modules/autoload/*.so
 *.a
-*.o
-*.so
-*.lo
+*.dSYM/
+*.exe
 *.la
-*.orig
+*.lo
 *.log
+*.o
+*.orig
+*.so
 *.sw?
+*~
 .deps
 .dirstamp
 .libs
+/libtool
+COPYING
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
 authd/authd
+autom4te.cache
 bandb/bandb
 bandb/bantool
-autom4te.cache
-aclocal.m4
 compile
 confdefs.h
 config.guess
-config.sub
-depcomp
-ltmain.sh
-missing
 config.log
 config.status
+config.sub
 configure
-stamp-h1
-shtool
+depcomp
+include/serno.h
+include/setup.h
+include/setup.h.in
 install-sh
+ircd/charybdis
+ircd/charybdis
+ircd/ircd_lexer.c
+ircd/ircd_parser.c
+ircd/ircd_parser.h
+ircd/version.c
+ircd/version.c
+ircd/version.c.last
+ircd/version.c.last
 libltdl/
-librb/configure
+librb/COPYING
+librb/INSTALL
+librb/aclocal.m4
 librb/compile
+librb/configure
 librb/depcomp
-librb/aclocal.m4
+librb/include/librb-config.h
+librb/include/librb-config.h.tmp
 librb/include/librb_config.h
 librb/include/librb_config.h.in
-librb/include/librb-config.h
 librb/include/serno.h
+librb/libratbox.pc
 librb/librb.pc
+librb/libtool
 librb/ltmain.sh
 librb/missing
-librb/libratbox.pc
-librb/libtool
 librb/src/version.c
 librb/src/version.c.last
+ltmain.sh
+m4/argz.m4
+m4/libtool.m4
+m4/ltargz.m4
+m4/ltdl.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+missing
 scripts/*.tar.bz2
 scripts/*.tar.gz
-include/setup.h
-include/setup.h.in
-ircd/charybdis
-ircd/ircd_parser.c
-ircd/ircd_parser.h
-ircd/ircd_lexer.c
-ircd/version.c
-ircd/version.c.last
+shtool
 ssld/ssld
-wsockd/wsockd
+stamp-h1
+tags
+tests/*.c.ban.db
+tests/*.c.ban.db-journal
+tests/*.c.log
+tests/*.c.pid
 tests/core
 tests/msgbuf_parse1
 tests/msgbuf_unparse1
 tests/rb_dictionary1
 tests/rb_snprintf_append1
 tests/rb_snprintf_try_append1
+tests/runtests
 tests/send1
 tests/serv_connect1
 tests/substitution1
-tests/runtests
-tests/*.c.ban.db
-tests/*.c.ban.db-journal
-tests/*.c.log
-tests/*.c.pid
-!tests/runtime/modules/*.so
-!tests/runtime/modules/autoload/*.so
 testsuite/ircd.pid.*
-tools/charybdis-mkpasswd
 tools/charybdis-mkfingerprint
+tools/charybdis-mkpasswd
 tools/genssl
 tools/mkpasswd
 tools/viconf
-include/serno.h
-ircd/charybdis
-ircd/version.c
-ircd/version.c.last
-/libtool
-Makefile.in
-m4/argz.m4
-m4/libtool.m4
-m4/ltargz.m4
-m4/ltdl.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-*.dSYM/
-*.exe
+wsockd/wsockd

diff --git a/.mailmap b/.mailmap
index 0c7637e72a251afcada6effa9a64e203b17a9cda..b7526c71ce29414818c8bb641018ece336edefbb 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -3,6 +3,8 @@ Alexander Færøy <ahf@0x90.dk> Alexander F?r?y <ahf@0x90.dk>
 Brett Greenham <taros@shadowircd.net> B.Greenham <taros@shadowircd.net>
 Chris Mills <chris@chrisam.net> TheChrisAM <chris@chrisam.net>
 Chris Mills <chris@chrisam.net> freenode!ChrisAM <chris@chrisam.net>
+Christine Dodrill <shadow.h511@gmail.com> <quora@lavabit.com>
+Christine Dodrill <shadow.h511@gmail.com> <quorawings@gmail.com>
 Elizabeth Myers <elizabeth@interlinked.me> <elizabeth@sporksirc.net>
 Elizabeth Myers <elizabeth@interlinked.me> <elizabeth@sporksmoo.net>
 Elizabeth Myers <elizabeth@interlinked.me> <spaz@whotookspaz.org>
@@ -17,5 +19,3 @@ Valeriy Yatsko <dwr@shadowircd.net> <darkwire@sellcenter.ru>
 Valeriy Yatsko <dwr@shadowircd.net> <dwr@it-penza.org>
 William Pitcock <nenolod@dereferenced.org> <nenolod@atheme.org>
 William Pitcock <nenolod@dereferenced.org> nenolod <devnull@localhost>
-Christine Dodrill <shadow.h511@gmail.com> <quora@lavabit.com>
-Christine Dodrill <shadow.h511@gmail.com> <quorawings@gmail.com>

diff --git a/CREDITS b/CREDITS
index c8cf208717c83c2450713e91274cc3e935e3c972..0df0727a28d8b332bd4c8e4567ef5e24f2af8bcc 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -26,7 +26,7 @@ AndroSyn, Aaron Sethman <androsyn -at- ratbox.org>
 anfl, Lee Hardy <lee -at- leeh.co.uk>
 beu, Elfyn McBratney <elfyn.mcbratney -at- gmail.com>
 BlindSight, Matt Ullman <matt -at- airraidsirens.com>
-Entrope, Michael Poole <mdpoole -at- trolius.org> 
+Entrope, Michael Poole <mdpoole -at- trolius.org>
 gxti, Michael Tharp <gxti -at- partiallystapled.com>
 mniip <mniip -at- mniip.com>
 spb, Stephen Bennett <spb -at- attenuate.org>

diff --git a/NEWS.md b/NEWS.md
index 39ab2601c77fd5771585d64d538d06598cdedd61..d32d3886a7dab29de9b90e240b536bc4acbedcbe 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -745,7 +745,7 @@ See LICENSE for licensing details (GPL v2).
 ## charybdis-1.0
 
 - Implement channel mode +L for channel list limit exemptions.
-- Implement channel mode +P primarily as a status mode, permanant 
+- Implement channel mode +P primarily as a status mode, permanant
   channel -- this is usually enforced via services registrations.
 - Change behaviour of /stats p: now displays all staff members instead
   of local ones only.

diff --git a/help/opers/cmode b/help/opers/cmode
index 3383ed55b058a8d9d3245f72b68491fad694517f..5625cad6238009d6ca0895b72276ab34554820f0 100644 (file)
--- a/help/opers/cmode
+++ b/help/opers/cmode
@@ -2,7 +2,7 @@ MODE <channel> <+|-><modes> [parameters]
 
 ? designates that the cmode is provided by an extension
 and may not be present on this server.
- 
+
 CHANNELMODE - DESCRIPTION
 ------------------------------------------------------------------------
 NO PARAMETERS:
@@ -35,7 +35,7 @@ NO PARAMETERS:
   ?  +O     - IRC Operator only channel.
   ?  +A     - IRC server administrator only channel.
   ?  +T     - No NOTICEs allowed in the channel.
-  ?  +S     - Only users connected via SSL/TLS may join the channel while this 
+  ?  +S     - Only users connected via SSL/TLS may join the channel while this
               mode is set. Users already in the channel are not affected.
 
 WITH PARAMETERS:
@@ -53,7 +53,7 @@ WITH PARAMETERS:
      +o     - Op.  Allows a user full control over the channel.
               PARAMS: /mode #channel +o nick
      +b     - Ban.  Prevents a user from entering the channel, and from
-              sending or changing nick if they are on it, based on a 
+              sending or changing nick if they are on it, based on a
               nick!ident@host match.
               PARAMS: /mode #channel +b nick!user@host
      +q     - Quiet.  Prevents a user from sending to the channel or changing
@@ -63,6 +63,6 @@ WITH PARAMETERS:
               they are banned (+b) or quieted (+q), based on a nick!ident@host
               match.
               PARAMS: /mode #channel +e nick!user@host
-     +I     - Invite Exempt.  Allows a user to join a +i channel without an 
+     +I     - Invite Exempt.  Allows a user to join a +i channel without an
               invite, based on a nick!user@host match.
               PARAMS: /mode #channel +I nick!user@host

diff --git a/help/opers/invite b/help/opers/invite
index cafca20c8c240637f5aea2b4c102896bb45cccd5..d46712341b8dc54a972026c8cfc21538b62d0305 100644 (file)
--- a/help/opers/invite
+++ b/help/opers/invite
@@ -1,6 +1,6 @@
 INVITE <nickname> <channel>
 
-INVITE sends a notice to the user that you have 
+INVITE sends a notice to the user that you have
 asked him/her to come to the specified channel.
 If the channel is +i, +j, +l or +r, this will
 allow the user to bypass these modes.

diff --git a/help/opers/monitor b/help/opers/monitor
index 646ff769b1d4822225f306a1dc66870fe7a87bd4..e843eba2dad1df95180cef86a527fcb9e369b000 100644 (file)
--- a/help/opers/monitor
+++ b/help/opers/monitor
@@ -9,9 +9,9 @@ Manages the online-notification list (similar to WATCH elsewhere). The
 
   -   removes the given list of nicknames from the monitor list, does
       not return anything
-  
+
   C   clears the monitor list, does not return anything
-  
+
   L   returns the current monitor list as RPL_MONLIST numerics,
       terminated with RPL_ENDOFMONLIST
 

diff --git a/help/opers/quit b/help/opers/quit
index b6d07356174f8b0468655434d612ad65a98437c1..1f1aa7cae25c0e570c60dc3bf853fd8a425f880a 100644 (file)
--- a/help/opers/quit
+++ b/help/opers/quit
@@ -1,5 +1,5 @@
 QUIT :[quit message]
 
-QUIT sends a message to the IRC server letting it know you would 
-like to disconnect.  The quit message will be displayed to the 
-users in the channels you were in when you are disconnected. 
+QUIT sends a message to the IRC server letting it know you would
+like to disconnect.  The quit message will be displayed to the
+users in the channels you were in when you are disconnected.

diff --git a/help/opers/resv b/help/opers/resv
index a46ce158f15b2d8af17cf4c02dc187e9ef48d5e4..fdf517439b4cd9d49747553e229b6b488d7c82ca 100644 (file)
--- a/help/opers/resv
+++ b/help/opers/resv
@@ -1,6 +1,6 @@
 RESV [time] <channel|nick> :<reason>
 
-Reserves a channel or nickname from use.  If [time] is not specified this 
+Reserves a channel or nickname from use.  If [time] is not specified this
 is added to the database, otherwise is temporary for [time] minutes.
 
 Nick resvs accept the same wildcard chars as xlines.

diff --git a/help/opers/set b/help/opers/set
index aa64c588ef71bbb6f22fe37296db0d3f2f28ea0a..1450a5bea5ac8bd402ec70c66410a71c2b6c2a68 100644 (file)
--- a/help/opers/set
+++ b/help/opers/set
@@ -20,7 +20,7 @@ SET <option> <value>
   SPLITMODE   - Sets splitmode to <value>:
                  ON   - splitmode is permanently on
                  OFF  - splitmode is permanently off
-                 AUTO - ircd chooses splitmode based on 
+                 AUTO - ircd chooses splitmode based on
                         SPLITUSERS and SPLITNUM
   SPLITUSERS  - Sets the minimum amount of users needed to
                 deactivate automatic splitmode.

diff --git a/help/opers/userhost b/help/opers/userhost
index f776fcdea9333d7acfa90b196012412574b7b04c..295d086b5cca7ac7a70f29cd83aa85a464d1bf0c 100644 (file)
--- a/help/opers/userhost
+++ b/help/opers/userhost
@@ -1,6 +1,6 @@
 USERHOST <nick>
 
-USERHOST displays the username, hostname, 
+USERHOST displays the username, hostname,
 operator status, and presence of valid ident of
 the specified nickname.
 

diff --git a/help/opers/who b/help/opers/who
index d7c2729a51cd8b1a93dd1bcd694bd92530f65f82..80246de786586c77157344777324b43f48713df4 100644 (file)
--- a/help/opers/who
+++ b/help/opers/who
@@ -1,9 +1,9 @@
 WHO <#channel|nick|mask> [o][%format]
 
-The WHO command displays information about a user, 
-such as their GECOS information, their user@host, 
+The WHO command displays information about a user,
+such as their GECOS information, their user@host,
 whether they are an IRC operator or not, etc.  A
-sample WHO result from a command issued like 
+sample WHO result from a command issued like
 "WHO pokey" may look something like this:
 
 #lamers ~pokey ppp.example.net irc.example.com pokey H :0 Jim Jones
@@ -26,11 +26,11 @@ G       -       The user is set away.
                 in the first field.
 +       -       The user is voiced in the channel listed.
 
-The final field displays the number of server hops and 
+The final field displays the number of server hops and
 the user's GECOS information.
 
 This command may be executed on a channel, such as
-"WHO #lamers".  The output will consist of WHO 
+"WHO #lamers".  The output will consist of WHO
 listings for each user on the channel.  If you are
 not on the channel, it must not have cmode +s set
 and users with umode +i are not shown.

diff --git a/modules/m_info.c b/modules/m_info.c
index 81d69a969244ab3949fd77f89bbc6aa559d3ecfa..6b1367b39bb40d769dccfd2e20b9a887fbd13f07 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -733,8 +733,6 @@ send_info_text(struct Client *source_p)
        {
                sendto_one_numeric(source_p, RPL_INFO, form_str(RPL_INFO), *text++);
        }
-
-       sendto_one_numeric(source_p, RPL_INFO, form_str(RPL_INFO), "");
 }
 
 /*

diff --git a/testsuite/ircd.conf.1 b/testsuite/ircd.conf.1
index 46e71b61c51e74a2065f913109b628b073755d4e..cce6ea5fdd0aebccc8d7aeebd51856c2d96d8397 100644 (file)
--- a/testsuite/ircd.conf.1
+++ b/testsuite/ircd.conf.1
@@ -43,7 +43,7 @@ auth { user = "*@127.0.0.0/8"; class = "users"; };
 
 operator "oper" {
        user = "*@127.0.0.0/8";
-       password = "oper"; 
+       password = "oper";
        flags = global_kill, remote, kline, unkline, nick_changes,
                die, rehash, admin, xline, operwall, oper_spy, ~encrypted;
 };

diff --git a/testsuite/ircd.conf.2 b/testsuite/ircd.conf.2
index a94cc6e085743cd2984e08005d9900ea8aca0f21..c0c46f89c349d924835e7c457e312baed74700c1 100644 (file)
--- a/testsuite/ircd.conf.2
+++ b/testsuite/ircd.conf.2
@@ -43,7 +43,7 @@ auth { user = "*@127.0.0.0/8"; class = "users"; };
 
 operator "oper" {
        user = "*@127.0.0.0/8";
-       password = "oper"; 
+       password = "oper";
        flags = global_kill, remote, kline, unkline, nick_changes,
                die, rehash, admin, xline, operwall, oper_spy, ~encrypted;
 };

diff --git a/testsuite/ircd.conf.3 b/testsuite/ircd.conf.3
index d93cb320fa59e0bda9bbfc9ce227a0cce65184d2..17fea171c382e4a4107b687b95a2a659639bce5b 100644 (file)
--- a/testsuite/ircd.conf.3
+++ b/testsuite/ircd.conf.3
@@ -43,7 +43,7 @@ auth { user = "*@127.0.0.0/8"; class = "users"; };
 
 operator "oper" {
        user = "*@127.0.0.0/8";
-       password = "oper"; 
+       password = "oper";
        flags = global_kill, remote, kline, unkline, nick_changes,
                die, rehash, admin, xline, operwall, oper_spy, ~encrypted;
 };

diff --git a/tools/README.mkpasswd b/tools/README.mkpasswd
index 2bae860c15e937357fa85ca96777fe41eba23c15..a400b27973cb16c5e303b4b698263d3e16f53040 100644 (file)
--- a/tools/README.mkpasswd
+++ b/tools/README.mkpasswd
@@ -4,7 +4,7 @@ This is documentation for the updated mkpasswd.c included with a number
 of ircd, irc services, and non-IRC related programs
 
 This version of mkpasswd can create Blowfish, MD5, SHA256, and SHA512 crypted
-passwords, with either randomly generated or user provided salts.  
+passwords, with either randomly generated or user provided salts.
 
 Options:
 -x Generate a SHA256 password