Homogenize the use of single-spacing after colons

LICENSE

@@ -53,7 +53,7 @@ files.  Specifically (but possibly not comprehensively):
 
    lib/md5.c is covered under the standard free MD5 license from RSA Data
    Security.  See the file for more details.  A clarification is also
-   provided here:  <http://www.ietf.org/ietf/IPR/RSA-MD-all>.
+   provided here: <http://www.ietf.org/ietf/IPR/RSA-MD-all>.
 
       "Implementations of these message-digest algorithms, including
       implementations derived from the reference C code in RFC-1319,

Makefile

@@ -41,7 +41,7 @@ DISTFILES   = -e 1,2d -e '/(Directory)/d' -e 's/ .*//'
 ##  Major target -- build everything.  Rather than just looping through
 ##  all the directories, use a set of parallel rules so that make -j can
 ##  work on more than one directory at a time.
-##  Be careful of a non-GNU make:  after a completed command, it does not
+##  Be careful of a non-GNU make: after a completed command, it does not
 ##  necessarily return the script back to the starting directory.
 all: all-include all-libraries all-programs
 	cd doc     && $(MAKE) all || exit 1 ; cd ..

TODO

@@ -303,7 +303,7 @@ Needed Bug Fixes
 * ctlinnd begin <site-name> was causing innd to core dump.
 
 * Handling of innfeed's dropped batches needs looking at.  There are three
-  places where articles can fall between the cracks:  an innfeed.togo file
+  places where articles can fall between the cracks: an innfeed.togo file
   written by innd when the feed can't be spawned, a batch file named after
   the feed name which can be created under similar circumstances, and the
   dropped files written by innfeed itself.  procbatch can clean these up,
@@ -425,7 +425,7 @@ Requested New Features
   articles, you'll then also reject the correct versions of the articles
   from other peers.  This should probably be rethought.
 
-* Additional limits for readers.conf:  Limit on concurrent parallel reader
+* Additional limits for readers.conf: Limit on concurrent parallel reader
   streams, limit on KB/second download (preliminary support for this is
   already in), and a limit on maximum posted articles per day (tied in
   with the backoff stuff?).  These should be per-IP or per-user, but
@@ -649,7 +649,7 @@ Long-Term Projects
   accessible via ctlinnd.
 
 * There is a fundamental problem with the current design of the
-  control.ctl file.  It combines two things:  A database of hierarchies,
+  control.ctl file.  It combines two things: A database of hierarchies,
   their maintainers, and related information, and a list of which
   hierarchies the local server should honor.  These should be separated
   out into the database (which could mostly be updated from a remote
@@ -658,7 +658,7 @@ Long-Term Projects
   that control messages should be honored for.  This should be reasonably
   simple although correct handling of checkgroups could get a mite tricky.
 
-* Possible NNTP extension:  Compression of the protocol, using gzip,
+* Possible NNTP extension: Compression of the protocol, using gzip,
   bzip2, or some other technique.  Particularly useful for long lists like
   the active file information or the overview information, but possibly
   useful in general for other things.

backends/innbind.c

@@ -67,7 +67,7 @@ convert_string(const char *string, long *result)
 
 /*
 **  Parse a command-line argument into a struct binding.  The command line
-**  argument is four comma-separated values:  the file descriptor, the family,
+**  argument is four comma-separated values: the file descriptor, the family,
 **  the listening address, and the port number.  The caller is responsible for
 **  freeing the address attribute of the supplied binding struct, although if
 **  a binding struct is passed in for use and has a non-NULL address, it will

backends/mod-active.in

@@ -103,7 +103,7 @@ if (!rename "$oldact", "$oldact.old") {
 }
 
 if (!rename "$newact", "$oldact") {
-  # Do not restart INN here:  we no longer have a valid active file!
+  # Do not restart INN here: we no longer have a valid active file!
   die "$0: rename $newact $oldact: $!\n";
 }
 

backends/news2mail.in

@@ -16,7 +16,7 @@
 #
 # where the first token is the name fed to us from the INN's newsfeeds file.
 # The second token is the actual address sendmail ships the article to.
-# The third token is optional:  it sets the envelope-from address.
+# The third token is optional: it sets the envelope-from address.
 #
 # In the INN's newsfeeds file, you need to have a channel feed:
 #     news2mail!:!*:Ac,Tc,Wn*:<pathbin>/news2mail
@@ -84,12 +84,12 @@ while (<STDIN>) {
     my @bad  = grep { !defined($maddr{$_}) } @addrs;
 
     if (!@good) {
-        syslog('notice', "unknown list(s):  $lnames") if ($use_syslog);
+        syslog('notice', "unknown list(s): $lnames") if ($use_syslog);
         next;
     }
 
     if (@bad) {
-        syslog('info', 'skipping list(s):  ', join(' ', @bad)) if ($use_syslog);
+        syslog('info', 'skipping list(s): ', join(' ', @bad)) if ($use_syslog);
     }
 
     my $sa = $INN::Config::newsuser;

backends/nntpsend.in

@@ -148,7 +148,7 @@ NNTPLOCK=${LOCKS}/LOCK.nntpsend
 if [ -z "${NOLOCK}" ]; then
     shlock -p $$ -f ${NNTPLOCK} || {
         # Nothing to do.
-        echo "${PROGNAME}:  Lock found" 1>&2
+        echo "${PROGNAME}: Lock found" 1>&2
         exit 0
     }
 fi
@@ -158,7 +158,7 @@ INPUT=${TMPDIR}/nntpsend$$
 cp /dev/null ${INPUT}
 while [ $# -gt 0 ]; do
     if [ $# -lt 2 ]; then
-	echo "${PROGNAME}:  Bad host/fqdn pair" 1>&2
+	echo "${PROGNAME}: Bad host/fqdn pair" 1>&2
 	rm -f ${NNTPLOCK}
 	exit 1
     fi

backends/sendinpaths.in

@@ -47,7 +47,7 @@ Usage:
   -d               enables debug messages
   -h               prints this help message
   -k keep-days     specifies how many days to keep processed dump files
-  -n               nomail:  gathers stats, but does not auto-submit e-mails
+  -n               nomail: gathers stats, but does not auto-submit e-mails
   -r report-days   specifies how many days of dump files should be processed
 
   Current default submit address: [$emaildef].
@@ -80,11 +80,11 @@ sub main {
   $debug = 1 if defined $opt{'d'};
 
   # Scan the ninpaths directory.
-  opendir(my $DIR, $ninpathsdir) || die "cannot open $ninpathsdir:  $!\n";
+  opendir(my $DIR, $ninpathsdir) || die "cannot open $ninpathsdir: $!\n";
   @files = readdir($DIR);
   closedir($DIR);
 
-  chdir($ninpathsdir) || die "cannot chdir $ninpathsdir:  $!\n";
+  chdir($ninpathsdir) || die "cannot chdir $ninpathsdir: $!\n";
 
   foreach my $file (@files) {
     # Process only inpaths files.
@@ -115,9 +115,9 @@ sub main {
     printf("exec'ing %s\n", join(' ', @cmd)) if $debug;
 
     $pid = open(my $NINPATHS, '-|');
-    die "cannot fork:  $!\n" if $pid < 0;
+    die "cannot fork: $!\n" if $pid < 0;
     if ($pid == 0) {
-      exec(@cmd) || die "cannot exec ninpaths:  $!\n";
+      exec(@cmd) || die "cannot exec ninpaths: $!\n";
     } else {
       while (<$NINPATHS>) {
         ;
@@ -141,14 +141,14 @@ sub main {
   printf("exec'ing %s\n", join(' ', @cmd)) if $debug;
 
   $pid = open(my $NINPATHS, '-|');
-  die "cannot fork:  $!\n" if $pid < 0;
+  die "cannot fork: $!\n" if $pid < 0;
   if ($pid == 0) {
-    exec(@cmd) || die "cannot exec ninpaths:  $!\n";
+    exec(@cmd) || die "cannot exec ninpaths: $!\n";
   } else {
     while (<$NINPATHS>) {
       $sendout .= $_;
     }
-    close($NINPATHS) || die "execution of ninpaths failed:  $!\n";
+    close($NINPATHS) || die "execution of ninpaths failed: $!\n";
   }
 
   if (defined $opt{'n'}) {
@@ -165,16 +165,16 @@ sub main {
 
     # Fork and spawn the MTA without using the shell.
     $pid = open(my $MTA, '|-');
-    die "cannot fork:  $!\n" if $pid < 0;
+    die "cannot fork: $!\n" if $pid < 0;
     if ($pid == 0) {
-      exec(split(/\s+/, $sm)) || die "cannot exec $sm:  $!";
+      exec(split(/\s+/, $sm)) || die "cannot exec $sm: $!";
     } else {
 
     print $MTA 'To: ' . join(",\n\t", @emailto);
     print $MTA "\nSubject: inpaths $pathhost\n\n";
     print $MTA $sendout;
     print $MTA "\n";
-    close($MTA) || die "execution of $sm failed:  $!\n";
+    close($MTA) || die "execution of $sm failed: $!\n";
     }
 
     # Remove old dumps.

configure.ac

@@ -18,7 +18,7 @@ dnl reasonable; obviously, makefile things like library paths and so forth and
 dnl paths to programs have to use AC_SUBST, but any compile-time parameters
 dnl are easier to handle with AC_DEFINE.  (And AC_SUBST is slower.)
 dnl
-dnl And remember:  If you don't have any alternative available if your check
+dnl And remember: If you don't have any alternative available if your check
 dnl for something fails, and there's no purpose served in aborting configure
 dnl instead of the compile if what you're checking for is missing, don't
 dnl bother checking for it.  Compile-time errors often produce a lot more

contrib/count_overview.pl

@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl
 #
-# count_overview.pl:  Count the groups in a bunch of xref records.
+# count_overview.pl: Count the groups in a bunch of xref records.
 
 while (<>) {
 

contrib/expirectl.c

@@ -16,7 +16,7 @@
  * 
  * [...]
  *     Oh, while I'm at it, I also wrote a cute program that builds the 
- *     expire.ctl file dynamically based on available space.   Feel free
+ *     expire.ctl file dynamically based on available space.  Feel free
  *     to include this in the dist (or not) as you please.
  * 
  *     Basically, the expirectl programs determines the amount of disk blocks

contrib/sample.init.script

@@ -46,7 +46,7 @@ restart)
     ;;
 
 *)
-    echo "Recognized arguments:  start|stop|reload|force-reload|restart" >&2
+    echo "Recognized arguments: start|stop|reload|force-reload|restart" >&2
     exit 1
     ;;
 

control/controlbatch.in

@@ -4,7 +4,7 @@
 ########################################################################
 # controlbatch - Run controlchan against a batch file.
 #
-# Command usage:  controlbatch [feedsite batchfile]
+# Command usage: controlbatch [feedsite batchfile]
 # Defaults are feedsite: controlchan!, batchfile: ${BATCH}/controlchan!
 ########################################################################
 #

control/controlchan.in

@@ -585,11 +585,11 @@ sub convdate {
     my $result = 0;
 
     my $pid = open(my $CONVDATE, '-|');
-    logdie("Cannot fork:  $!") if $pid < 0;
+    logdie("Cannot fork: $!") if $pid < 0;
     if ($pid == 0) {
         # exec() properly escapes its arguments to prevent shell injection.
         exec("$INN::Config::pathbin/convdate", @args) or
-             logdie("Cannot exec convdate:  $!");
+             logdie("Cannot exec convdate: $!");
     } else {
         $result = <$CONVDATE>;
         close($CONVDATE);

control/perl-nocem.in

@@ -558,7 +558,7 @@ to process NoCeM notices.  Various legacy options in command-line
 (like in the example above) should however still be used.
 
 The keys of NoCeM issuers can be found in the web site of I<The NoCeM
-Registry>:  L<http://rosalind.home.xs4all.nl/nocemreg/nocemreg.html>.
+Registry>: L<http://rosalind.home.xs4all.nl/nocemreg/nocemreg.html>.
 You can even download there a unique file which contains all the keys.
 
 =item 2.

doc/FAQ

@@ -170,7 +170,7 @@ may have some additional bug fixes over the current released version.
 The daily snapshots with CURRENT in the name are of the current
 development version.
 
-Please note:  There is no guarantee that a snapshot will even compile, let
+Please note: There is no guarantee that a snapshot will even compile, let
 alone function well as a news server.  In particular, the CURRENT branch
 is under active development, and all sorts of things may be broken at any
 given point in time.  Use snapshots with caution, and don't use snapshots

expire/prunehistory.c

@@ -21,7 +21,7 @@ static void Usage(void) __attribute__ ((__noreturn__));
 static void
 Usage(void)
 {
-    fprintf(stderr, "Usage:  prunehistory [-p] [-f file]\n");
+    fprintf(stderr, "Usage: prunehistory [-p] [-f file]\n");
     exit(1);
 }
 

frontends/mailpost.in

@@ -136,7 +136,7 @@ if ($opt_z) {
 
 $newsgroups = join ",", @ARGV ;
 
-die "usage:  $0 newsgroup [newsgroup ...]\n" unless $newsgroups;
+die "usage: $0 newsgroup [newsgroup ...]\n" unless $newsgroups;
 
 #
 # Do the header.  Our input is a mail message, with or without the From.
@@ -363,7 +363,7 @@ if (!open TMPFILE,">$tmpfile") {
 	die "die(no tmpfile): sendmail: $!\n" ;
     print TMPFILE <<"EOF";
 To: $Maintainer
-Subject: mailpost failure ($newsgroups):  $msg
+Subject: mailpost failure ($newsgroups): $msg
 
 -------- Article Contents
 
@@ -476,7 +476,7 @@ if ($opt_c) {
   umask($umask_bak);
 
   my $dup = undef ;
-  syslog("err", "check   " . $DATABASE{$message_id} . " :  $newsgroups") if $debugging && $use_syslog;
+  syslog("err", "check   " . $DATABASE{$message_id} . " : $newsgroups") if $debugging && $use_syslog;
   $dup = 1 if ($DATABASE{$message_id} ne $newsgroups) ;
 
   dbmclose(%DATABASE) || mailArtAndDie ("can't dbmclose $Database: $!") ;
@@ -756,7 +756,7 @@ If the B<-t> flag is used, then it defines the location of the
 directory to use to temporarily store error messages that are sent to
 the newsmaster.  This option may be required if the default value refers
 to a path that does not exist or the B<mailpost> process does not have
-write access to.  Two paths are tried by default:  I<pathtmp> as set
+write access to.  Two paths are tried by default: I<pathtmp> as set
 in F<inn.conf>, and then F</var/tmp> if I<pathtmp> is not writable.
 
 =item B<-x> I<header>[B<:>I<header>...]

frontends/pullnews.in

@@ -11,26 +11,27 @@
 #               Full changelog can be found in the Git commit history of the
 #               INN project.  Major changes are:
 #
-#               January 2010:  Geraint A. Edwards added header-only feeding (-B);
+#               January 2010: Geraint A. Edwards added header-only feeding (-B);
 #               added ability to hashfeed (-a) - uses MD5 - Diablo-compatible;
 #               enabled -m to remove headers matching (or not) a given regexp;
 #               minor bug fix to rnews when -O; improved rnews reporting.
 #
-#               December 2008:  Matija Nalis added -O (optimized mode, checking
-#               whether the downstream server already has the article to download).
-#               Bug fixes too.
+#               December 2008: Matija Nalis added -O (optimized mode, checking
+#               whether the downstream server already has the article to
+#               download).  Bug fixes too.
 #
-#               May 2008:  Geraint A. Edwards greatly improved pullnews, adding
-#               -b, -C, -d, -G, -H, -k, -l, -m, -M, -n, -P, -Q, -R, -t, -T, -w and
-#               improving -s as well as fixing some bugs.
-#               He also integrated the backupfeed contrib script by Kai Henningsen,
-#               adding -f, -F, -N, -S, -z and -Z to pullnews.
+#               May 2008: Geraint A. Edwards greatly improved pullnews, adding
+#               -b, -C, -d, -G, -H, -k, -l, -m, -M, -n, -P, -Q, -R, -t, -T, -w
+#               and improving -s as well as fixing some bugs.
+#               He also integrated the backupfeed contrib script by Kai
+#               Henningsen, adding -f, -F, -N, -S, -z and -Z to pullnews.
 #
 # Description:  A simple pull feeder.  Connects to multiple upstream 
 #               machines (in the guise of a reader), and pulls over articles 
-#               and feeds them to a downstream server (in the guise of a feeder).
+#               and feeds them to a downstream server (in the guise of a
+#               feeder).
 #
-#               Uses a simple configuration file:  <pathdb>/pullnews.marks when
+#               Uses a simple configuration file: <pathdb>/pullnews.marks when
 #               run as the news user, or otherwise ~/pullnews.marks, to define
 #               which machines to pull articles from and which groups at each
 #               machine to pull over.  There is also support for more specific

frontends/scanspool.in

@@ -4,7 +4,7 @@ use strict;
 
 # @(#)scanspool.pl	1.20 4/6/92 00:47:35
 #
-# Written by:  Landon Curt Noll		(chongo was here  /\../\)
+# Written by: Landon Curt Noll		(chongo was here  /\../\)
 #
 # This code is placed in the public domain.
 #

include/inn/innconf.h

@@ -17,7 +17,7 @@
 **  This structure is organized in the same order as the variables contained
 **  in it are mentioned in the inn.conf documentation, and broken down into
 **  the same sections.  Note that due to the implementation, only three types
-**  of variables are permissible here:  char *, bool, struct vector *, long
+**  of variables are permissible here: char *, bool, struct vector *, long
 **  and unsigned long.
 */
 struct innconf {

innd/art.c

@@ -2437,7 +2437,7 @@ ARTpost(CHANNEL *cp)
       } else {
         /* if !GroupMissing, then all the groups the article was posted
          * to have a flag of "x" in our active file, and therefore
-         * we should throw the article away:  if you have set
+         * we should throw the article away: if you have set
          * innconf->remembertrash true, then you want all trash except that
          * which you explicitly excluded in your active file. */
   	if (!GroupMissing) {
@@ -2627,7 +2627,7 @@ ARTpost(CHANNEL *cp)
   }
 
   /* And finally, send to everyone who should get it.
-   * sp->Sendit is false for funnel sites:  ARTpropagate()
+   * sp->Sendit is false for funnel sites: ARTpropagate()
    * transferred it to the corresponding funnel. */
   for (sp = Sites, i = nSites; --i >= 0; sp++) {
     if (sp->Sendit) {

innd/innd.c

@@ -659,8 +659,8 @@ main(int ac, char *av[])
     /* There is no file descriptor limit on some hosts; for those, cap at
        MaxOutgoing plus maxconnections plus 20, or 5000, whichever is larger. 
        Otherwise, we use insane amounts of memory for the channel table.
-       FIXME:  Get rid of this hard-coded constant.
-       (TODO:  Consider implementing libevent.) */
+       FIXME: Get rid of this hard-coded constant.
+       (TODO: Consider implementing libevent.) */
     if (i > 5000) {
         unsigned long max;