From 9d88a6ee9fc8b1e65e2d2caf519ce5be3950e65e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20=C3=89LIE?= Date: Thu, 28 Oct 2021 22:51:13 +0200 Subject: [PATCH] Homogenize the use of single-spacing after colons --- LICENSE | 2 +- Makefile | 2 +- TODO | 8 +++--- backends/innbind.c | 2 +- backends/mod-active.in | 2 +- backends/news2mail.in | 6 ++--- backends/nntpsend.in | 4 +-- backends/sendinpaths.in | 22 ++++++++-------- configure.ac | 2 +- contrib/count_overview.pl | 2 +- contrib/expirectl.c | 2 +- contrib/sample.init.script | 2 +- control/controlbatch.in | 2 +- control/controlchan.in | 4 +-- control/perl-nocem.in | 2 +- doc/FAQ | 2 +- expire/prunehistory.c | 2 +- frontends/mailpost.in | 8 +++--- frontends/pullnews.in | 23 +++++++++-------- frontends/scanspool.in | 2 +- include/inn/innconf.h | 2 +- innd/art.c | 4 +-- innd/innd.c | 4 +-- innd/keywords.c | 8 +++--- innd/nc.c | 2 +- innd/python.c | 2 +- innfeed/main.c | 2 +- innfeed/procbatch.in | 2 +- lib/uwildmat.c | 4 +-- m4/syslog.m4 | 2 +- nnrpd/nnrpd.c | 2 +- nnrpd/perm.c | 2 +- nnrpd/post.c | 4 +-- perl/INN/Config.pm.in | 2 +- readme.pod | 26 ++++++++++--------- samples/incoming.conf | 17 +++++++----- samples/motd.nnrpd | 2 +- samples/ovdb.conf | 4 +-- samples/send-uucp.cf | 2 +- scripts/inncheck.in | 10 ++++---- scripts/innmail.in | 8 +++--- scripts/innreport.in | 40 ++++++++++++++--------------- scripts/innshellvars.in | 2 +- scripts/innwatch.in | 6 ++--- scripts/news.daily.in | 4 +-- scripts/rc.news.in | 6 ++--- site/getsafe.sh | 2 +- storage/ovdb/ovdb.c | 4 +-- storage/timecaf/README.CAF | 2 +- storage/timecaf/caf.h | 4 +-- storage/tradindexed/tdx-group.c | 2 +- storage/tradindexed/tdx-structure.h | 2 +- support/install-sh | 2 +- 53 files changed, 147 insertions(+), 141 deletions(-) diff --git a/LICENSE b/LICENSE index f0267bef9..b43b4d114 100644 --- a/LICENSE +++ b/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: . + provided here: . "Implementations of these message-digest algorithms, including implementations derived from the reference C code in RFC-1319, diff --git a/Makefile b/Makefile index b8b8486e9..66d999b31 100644 --- a/Makefile +++ b/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 .. diff --git a/TODO b/TODO index d6cf9693d..354d5278f 100644 --- a/TODO +++ b/TODO @@ -303,7 +303,7 @@ Needed Bug Fixes * ctlinnd begin 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. diff --git a/backends/innbind.c b/backends/innbind.c index a197d2846..94c16ce24 100644 --- a/backends/innbind.c +++ b/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 diff --git a/backends/mod-active.in b/backends/mod-active.in index ac4960fe3..e845893b0 100644 --- a/backends/mod-active.in +++ b/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"; } diff --git a/backends/news2mail.in b/backends/news2mail.in index 6d015bb3d..32bcc4728 100644 --- a/backends/news2mail.in +++ b/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*:/news2mail @@ -84,12 +84,12 @@ while () { 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; diff --git a/backends/nntpsend.in b/backends/nntpsend.in index 8ef0f90da..077965122 100644 --- a/backends/nntpsend.in +++ b/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 diff --git a/backends/sendinpaths.in b/backends/sendinpaths.in index b9be217e6..c1c08749d 100644 --- a/backends/sendinpaths.in +++ b/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. diff --git a/configure.ac b/configure.ac index 167ce107d..7a5f5c9ea 100644 --- a/configure.ac +++ b/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 diff --git a/contrib/count_overview.pl b/contrib/count_overview.pl index 910938ead..96d89e6b2 100755 --- a/contrib/count_overview.pl +++ b/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 (<>) { diff --git a/contrib/expirectl.c b/contrib/expirectl.c index dc8f7c530..12f652502 100644 --- a/contrib/expirectl.c +++ b/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 diff --git a/contrib/sample.init.script b/contrib/sample.init.script index 4a28e6af7..61bd2e2c4 100644 --- a/contrib/sample.init.script +++ b/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 ;; diff --git a/control/controlbatch.in b/control/controlbatch.in index 9666cd5e8..950f001ba 100644 --- a/control/controlbatch.in +++ b/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! ######################################################################## # diff --git a/control/controlchan.in b/control/controlchan.in index e08b90de3..93aa3f97b 100644 --- a/control/controlchan.in +++ b/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); diff --git a/control/perl-nocem.in b/control/perl-nocem.in index fef9003af..bcf079622 100644 --- a/control/perl-nocem.in +++ b/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: L. +Registry>: L. You can even download there a unique file which contains all the keys. =item 2. diff --git a/doc/FAQ b/doc/FAQ index 7bb2637df..131be444b 100644 --- a/doc/FAQ +++ b/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 diff --git a/expire/prunehistory.c b/expire/prunehistory.c index ab9aa47c8..4860a3994 100644 --- a/expire/prunehistory.c +++ b/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); } diff --git a/frontends/mailpost.in b/frontends/mailpost.in index 0ab9fa0e9..17053c975 100644 --- a/frontends/mailpost.in +++ b/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 process does not have -write access to. Two paths are tried by default: I as set +write access to. Two paths are tried by default: I as set in F, and then F if I is not writable. =item B<-x> I
[B<:>I
...] diff --git a/frontends/pullnews.in b/frontends/pullnews.in index c55da4da1..10317a5c4 100644 --- a/frontends/pullnews.in +++ b/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: /pullnews.marks when +# Uses a simple configuration file: /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 diff --git a/frontends/scanspool.in b/frontends/scanspool.in index bd3840668..3896e1b05 100644 --- a/frontends/scanspool.in +++ b/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. # diff --git a/include/inn/innconf.h b/include/inn/innconf.h index 86d4e36fc..ca7f5b073 100644 --- a/include/inn/innconf.h +++ b/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 { diff --git a/innd/art.c b/innd/art.c index 41b7b9257..643870161 100644 --- a/innd/art.c +++ b/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) { diff --git a/innd/innd.c b/innd/innd.c index 72fc4ffa1..6eed02214 100644 --- a/innd/innd.c +++ b/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; diff --git a/innd/keywords.c b/innd/keywords.c index 0d17cce28..af03bc135 100644 --- a/innd/keywords.c +++ b/innd/keywords.c @@ -5,7 +5,7 @@ ** order to provide better (scorable) OVER data, containing bits of article ** body content which have a reasonable expectation of utility. ** -** Basic idea: simple word-counting. We find words in the article body, +** Basic idea: simple word-counting. We find words in the article body, ** separated by whitespace. Remove punctuation. Sort words, count unique ** words, sort those counts. Write the resulting Keywords: header containing ** the poster's original Keywords: (if any) followed by a magic cookie @@ -104,7 +104,7 @@ KEYgenerate( static char **word; static const char *whitespace = " \t\r\n"; - /* Prototype setup: regex match preparation. */ + /* Prototype setup: regex match preparation. */ static int regex_lib_init = 0; static regex_t preg; static const char *elim_regexp = "^\\([-+/0-9][-+/0-9]*\\|.*1st\\|.*2nd\\|.*3rd\\|.*[04-9]th\\|about\\|after\\|ago\\|all\\|already\\|also\\|among\\|and\\|any\\|anybody\\|anyhow\\|anyone\\|anywhere\\|are\\|bad\\|because\\|been\\|before\\|being\\|between\\|but\\|can\\|could\\|did\\|does\\|doing\\|done\\|dont\\|during\\|eight\\|eighth\\|eleven\\|else\\|elsewhere\\|every\\|everywhere\\|few\\|five\\|fifth\\|first\\|for\\|four\\|fourth\\|from\\|get\\|going\\|gone\\|good\\|got\\|had\\|has\\|have\\|having\\|he\\|her\\|here\\|hers\\|herself\\|him\\|himself\\|his\\|how\\|ill\\|into\\|its\\|ive\\|just\\|kn[eo]w\\|least\\|less\\|let\\|like\\|look\\|many\\|may\\|more\\|m[ou]st\\|myself\\|next\\|nine\\|ninth\\|not\\|now\\|off\\|one\\|only\\|onto\\|our\\|out\\|over\\|really\\|said\\|saw\\|says\\|second\\|see\\|set\\|seven\\|seventh\\|several\\|shall\\|she\\|should\\|since\\|six\\|sixth\\|some\\|somehow\\|someone\\|something\\|somewhere\\|such\\|take\\|ten\\|tenth\\|than\\|that\\|the\\|their\\!|them\\|then\\|there\\|therell\\|theres\\|these\\|they\\|thing\\|things\\|third\\|this\\|those\\|three\\|thus\\|together\\|told\\|too\\|twelve\\|two\\|under\\|upon\\|very\\|via\\|want\\|wants\\|was\\|wasnt\\|way\\|were\\|weve\\|what\\|whatever\\|when\\|where\\|wherell\\|wheres\\|whether\\|which\\|while\\|who\\|why\\|will\\|with\\|would\\|write\\|writes\\|wrote\\|yes\\|yet\\|you\\|your\\|youre\\|yourself\\)$"; @@ -136,7 +136,7 @@ KEYgenerate( hc->Length = 0; /* Now figure acceptable extents, and copy body to working string. - * (Memory-intensive for hefty articles: limit to non-ABSURD articles.) */ + * (Memory-intensive for hefty articles: limit to non-ABSURD articles.) */ if ((bodylen < 100) || (bodylen > innconf->keyartlimit)) /* Too small/big to bother. */ return; @@ -148,7 +148,7 @@ KEYgenerate( text_end = text + bodylen; - /* Abusive punctuation stripping: turn it all into spaces. */ + /* Abusive punctuation stripping: turn it all into spaces. */ for (punc = text; *punc; punc++) if (!isalpha((unsigned char) *punc)) *punc = ' '; diff --git a/innd/nc.c b/innd/nc.c index 52759fa75..c54942665 100644 --- a/innd/nc.c +++ b/innd/nc.c @@ -1345,7 +1345,7 @@ NCproc(CHANNEL *cp) snprintf(buff, sizeof(buff), "%d %s", syntaxerrorcode, cp->ac > 1 ? cp->av[1] : ""); } else { - snprintf(buff, sizeof(buff), "%d Syntax is: %s %s", + snprintf(buff, sizeof(buff), "%d Syntax is: %s %s", syntaxerrorcode, dp->Name, dp->Help ? dp->Help : "(no argument allowed)"); } /* If TAKETHIS, we have to read the entire multi-line response diff --git a/innd/python.c b/innd/python.c index 3e79a0906..ee67501bf 100644 --- a/innd/python.c +++ b/innd/python.c @@ -8,7 +8,7 @@ ** The astute reader may notice the commission of blatant atrocities against ** Python's OO model here. Don't tell Guido. ** -** A quick note regarding Python exceptions: functions like +** A quick note regarding Python exceptions: functions like ** PyObject_GetAttrString(PyObject *o, const char *attr_name) ** raise an exception when they fail, even though they return NULL. ** And as exceptions accumulate from caller to caller and so on, diff --git a/innfeed/main.c b/innfeed/main.c index e85b92d12..6e30f50f5 100644 --- a/innfeed/main.c +++ b/innfeed/main.c @@ -258,7 +258,7 @@ int main (int argc, char **argv) whatever has aquired the stdio descriptors, such as the socket to syslogd. - XXX possible problems: what if fd 0 is closed but no inputFile, + XXX possible problems: what if fd 0 is closed but no inputFile, XXX subProgram or talkToSelf is true? it will not be freopen()ed, so XXX innfeed won't have any fresh data (besides, fd 0 is only writable XXX here). perhaps a warning should be issued. diff --git a/innfeed/procbatch.in b/innfeed/procbatch.in index ba2fd10c7..5ab776758 100644 --- a/innfeed/procbatch.in +++ b/innfeed/procbatch.in @@ -35,7 +35,7 @@ my $usage = "$0 [-hquv] [-c [-s dir]] [-d dir] [-e host] [-m [-t dir]] inn-batch -e host to process on entries for only that host -h display a short help screen -m to have $0 move the new files to the backlog directory - -q quiet mode: only display error messages; good for cron jobs + -q quiet mode: only display error messages; good for cron jobs -s dir to specify where the news articles are ($spoolArts) -t dir to specify the backlog directory ($tapeDir) diff --git a/lib/uwildmat.c b/lib/uwildmat.c index dda6f3869..a73bc2926 100644 --- a/lib/uwildmat.c +++ b/lib/uwildmat.c @@ -16,8 +16,8 @@ ** This can greatly speed up failing wildcard patterns. For example: ** ** pattern: -*-*-*-*-*-*-12-*-*-*-m-*-*-* -** text 1: -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1 -** text 2: -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1 +** text 1: -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1 +** text 2: -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1 ** ** Text 1 matches with 51 calls, while text 2 fails with 54 calls. Without ** the ABORT code, it takes 22310 calls to fail. Ugh. The following diff --git a/m4/syslog.m4 b/m4/syslog.m4 index 6e4badde3..cb24697d4 100644 --- a/m4/syslog.m4 +++ b/m4/syslog.m4 @@ -20,7 +20,7 @@ dnl Source used by INN_LOG_FACILITY. AC_DEFUN([_INN_LOG_FACILITY], [[ #include #ifndef LOG_NEWS -error: LOG_NEWS not available! +error: LOG_NEWS not available! #endif ]]) diff --git a/nnrpd/nnrpd.c b/nnrpd/nnrpd.c index cc29a3387..e79997122 100644 --- a/nnrpd/nnrpd.c +++ b/nnrpd/nnrpd.c @@ -1620,7 +1620,7 @@ main(int argc, char *argv[]) /* Check usage. */ if ((cp->Minac != CMDany && ac < cp->Minac) || (cp->Maxac != CMDany && ac > cp->Maxac)) { - Reply("%d Syntax is: %s %s\r\n", NNTP_ERR_SYNTAX, cp->Name, + Reply("%d Syntax is: %s %s\r\n", NNTP_ERR_SYNTAX, cp->Name, cp->Help ? cp->Help : "(no argument allowed)"); continue; } diff --git a/nnrpd/perm.c b/nnrpd/perm.c index c06f0fdd9..b9e4aed3b 100644 --- a/nnrpd/perm.c +++ b/nnrpd/perm.c @@ -1789,7 +1789,7 @@ PERMgetpermissions(void) if (access_realms[i]->rejectwith) { syslog(L_NOTICE, "%s rejected by rule (%s)", Client.host, access_realms[i]->rejectwith); - Reply("%d Permission denied: %s\r\n", NNTP_FAIL_TERMINATING, + Reply("%d Permission denied: %s\r\n", NNTP_FAIL_TERMINATING, access_realms[i]->rejectwith); ExitWithStats(1, true); } diff --git a/nnrpd/post.c b/nnrpd/post.c index c98f3ab43..d8f64e38b 100644 --- a/nnrpd/post.c +++ b/nnrpd/post.c @@ -668,7 +668,7 @@ ProcessHeaders(char *idbuff, bool needmoderation) ** but reasonably effective for catching neophyte's mistakes. Son-of-1036 ** says: ** -** NOTE: While encouraging trimming is desirable, the 50% rule imposed +** NOTE: While encouraging trimming is desirable, the 50% rule imposed ** by some old posting agents is both inadequate and counterproductive. ** Posters do not respond to it by being more selective about quoting; ** they respond by padding short responses, or by using different @@ -677,7 +677,7 @@ ProcessHeaders(char *idbuff, bool needmoderation) ** useful forms of automatic analysis that reading agents might wish to ** do. ** -** NOTE: At the very least, if a minimum-unquoted quota is being set, +** NOTE: At the very least, if a minimum-unquoted quota is being set, ** article bodies shorter than (say) 20 lines, or perhaps articles ** which exceed the quota by only a few lines, should be exempt. This ** avoids the ridiculous situation of complaining about a 5-line diff --git a/perl/INN/Config.pm.in b/perl/INN/Config.pm.in index df188bceb..d85326aca 100644 --- a/perl/INN/Config.pm.in +++ b/perl/INN/Config.pm.in @@ -264,7 +264,7 @@ if you specify what you want to import: Note that a legacy F is also provided in I/lib for compatibility reasons with old Perl scripts not shipped with INN. It was used by versions of INN anterior to 2.5.0. The corresponding -scripts for Shell and Tcl are, however, still in use: F +scripts for Shell and Tcl are, however, still in use: F and F. They offer the same capabilities as this module. diff --git a/readme.pod b/readme.pod index 397658527..1e5d690d8 100644 --- a/readme.pod +++ b/readme.pod @@ -66,7 +66,7 @@ passes along articles it receives to all of the news servers it peers with, those servers pass the articles along to their peers, and so on, resulting in "flood fill" propagation of news articles. -A news server performs three basic functions: it accepts articles from +A news server performs three basic functions: it accepts articles from other servers and stores them on disk, sends articles it has received out to other servers, and offers stored news articles to readers on demand. It additionally has to perform some periodic maintenance tasks, such as @@ -194,7 +194,7 @@ find one that doesn't have a man page, that's a bug. Please do report it.) When trying to figure out some specific problem, reading the man pages for all of the configuration files involved is a very good start. -URL: L (online +URL: L (online documentation) =head1 Reporting Bugs @@ -268,7 +268,7 @@ read-only (no postings allowed). Where announcements about INN are set (only maintainers may post). -URL: L +URL: L =item inn-workers@lists.isc.org @@ -280,14 +280,14 @@ users, we encourage you to join this mailing list to answer questions. (You may also want to read the newsgroup news.software.nntp, which gets a lot of INN-related questions.) -URL: L +URL: L =item inn-committers@lists.isc.org Git commit messages for INN are sent to this list (only the automated messages are sent here, no regular posting). -URL: L +URL: L =item inn-bugs@lists.isc.org @@ -295,7 +295,7 @@ GitHub issues for INN are sent to this list (only the automated messages are sent here, no regular posting). Bug reports should be sent to the inn-workers mailing list, or a GitHub issue created. -URL: L +URL: L =back @@ -338,7 +338,7 @@ answer questions about it. =item Cleanfeed -URL: L (maintained by Steve Crook) +URL: L (maintained by Steve Crook) Cleanfeed is an extremely powerful spam filter, probably the most widely used spam filter on Usenet currently. It catches excessive multiposting @@ -355,7 +355,7 @@ can be found at L. =item GUP (Group Update Program) -URL: L +URL: L GUP provides a way for your peers to update their F entries as they want without having to ask you to edit the configuration file all the @@ -364,7 +364,9 @@ feeds that change periodically. =item innduct -URL: L (maintained by Ian Jackson) +URL: +L +(maintained by Ian Jackson) A possible replacement for B, B and B that quickly and reliably streams Usenet article to a remote site. @@ -374,7 +376,7 @@ It also permits a realtime feed, contrary to B or B. =item NewsPortal -URL: L +URL: L A PHP-based web news reader that works as a front-end to a regular news server such as INN and lets people read and post without learning a news @@ -387,7 +389,7 @@ it for use on smartphones. =item PersonalINN -URL: L +URL: L PersonalINN is a version of INN modified for personal use and with a friendly GUI built on top of it. It is available for NEXTSTEP or OPENSTEP @@ -395,7 +397,7 @@ only, unfortunately. =item suck -URL: L +URL: L B is a separate package for downloading a news feed via a reading connection (rather than via a direct NNTP or UUCP feed) and sending diff --git a/samples/incoming.conf b/samples/incoming.conf index 096984e4d..47e9acc9b 100644 --- a/samples/incoming.conf +++ b/samples/incoming.conf @@ -1,6 +1,6 @@ ## incoming.conf -- Configuration of incoming news feeds ## -## This file consists of three types of entries: key/value, peer and group. +## This file consists of three types of entries: key/value, peer and group. ## Comments are taken from the hash character "#" to the end of the line. ## Blank lines are ignored. ## @@ -10,7 +10,8 @@ ## max-connections: 10 ## ## A legal key contains neither blanks, nor colon, nor "#". -## There are three different types of values: integers, booleans, and strings. +## There are three different types of values: integers, booleans, and +## strings. ## Integers are as to be expected. A boolean value is either "true" or ## "false" (case is significant). A string value is any other sequence of ## characters. If the string needs to contain whitespace, then it must be @@ -105,9 +106,9 @@ ## (default=0) ## ## hold-time: -## This key requires a positive integer value. It defines the hold time before -## close, if the connection is over the max-connections: value. A value of zero -## specifies immediate close. (default=0) +## This key requires a positive integer value. It defines the hold time +## before close, if the connection is over the max-connections: value. +## A value of zero specifies immediate close. (default=0) ## ## identd: ## This key requires a string value. It is used if you wish to require a @@ -123,10 +124,12 @@ ## of newsgroups which are to be accepted from this host. (default="*") ## ## email: -## This key requires a string value. Reserved for future use. (empty by default) +## This key requires a string value. Reserved for future use. +## (empty by default) ## ## comment: -## This key requires a string value. Reserved for future use. (empty by default) +## This key requires a string value. Reserved for future use. +## (empty by default) ## ## skip: ## This key requires a boolean value. Setting this entry causes this peer diff --git a/samples/motd.nnrpd b/samples/motd.nnrpd index a5fb67f71..b1a539f54 100644 --- a/samples/motd.nnrpd +++ b/samples/motd.nnrpd @@ -53,5 +53,5 @@ say not using TLS) will be rejected. Example 4 --------- -Support for a new SASL mechanism has been added: OPENID20 can now be +Support for a new SASL mechanism has been added: OPENID20 can now be used to authenticate. Feel free to use it! diff --git a/samples/ovdb.conf b/samples/ovdb.conf index 85b075f2c..06776fa26 100644 --- a/samples/ovdb.conf +++ b/samples/ovdb.conf @@ -2,7 +2,7 @@ # is set in inn.conf with the 'pathoverview' option. Other parameters # for tuning ovdb are in this file. -# Compression: if INN was compiled with zlib, and this compress +# Compression: if INN was compiled with zlib, and this compress # parameter is true, ovdb will compress overview records that are # longer than 600 bytes. See the ovdb(5) man page for more information. # Default is false. @@ -74,7 +74,7 @@ #maxlocks 4000 # The nocompact parameter affects the behaviour of expireover. The expireover -# function in ovdb can do its job in one of two ways: by simply deleting +# function in ovdb can do its job in one of two ways: by simply deleting # expired records from the database; or by re-writing the overview records # into a different location leaving out the expired records. The first # method is faster, but it leaves 'holes' that result in space that can diff --git a/samples/send-uucp.cf b/samples/send-uucp.cf index d04aec065..9d8b6438d 100644 --- a/samples/send-uucp.cf +++ b/samples/send-uucp.cf @@ -11,7 +11,7 @@ ## still use the third (maxsize) or the fourth (batchtime). So if you want ## to set a maxsize, you HAVE to add a compression method. ## -## compressor values can be one of: "bzip2", "compress", "gzip", "none". +## compressor values can be one of: "bzip2", "compress", "gzip", "none". ## ## You can use flags with your compressor, just add them with a '_' character ## instead of a space. For example, "compress_-b13" for 13 bits compression. diff --git a/scripts/inncheck.in b/scripts/inncheck.in index 5356b2199..e2f31f766 100644 --- a/scripts/inncheck.in +++ b/scripts/inncheck.in @@ -68,7 +68,7 @@ my %checklist = ( ); ## The modes of the config files we can check. -## Min and max values, by bit: between 0400 and 0640, +## Min and max values, by bit: between 0400 and 0640, ## 0600 is allowed, but not 0500 for instance (not executable). ## 0660 is used when the file can contain passwords. my %modes = ( @@ -173,7 +173,7 @@ my $ipv6 = "[$ip6]+(?:$ipv4)?"; # e.g. ::ffff:192.168.0.10 my $ipv6_cidr = "[$ip6]+\\/1?\\d?\\d"; my $ipv6_wildmat = "[$ip6$wildmat]+"; my $hostname = '[\w-]+|[\w.-]+\.[a-zA-Z]{2,}'; # hostname, FQDN -my $hostname_wildmat = '(?:[-\w\[\]\*\?]+\.)?'."(?:$hostname)"; # Assumption: wildmat chars only in leftmost subdomain part +my $hostname_wildmat = '(?:[-\w\[\]\*\?]+\.)?'."(?:$hostname)"; # Assumption: wildmat chars only in leftmost subdomain part my $hostnameRE = "(?:$hostname|$ipv4|$ipv6)"; my $hostblockRE = "(?:$hostname_wildmat|$ipv4_cidr|$ipv4_wildmat|$ipv6|$ipv6_cidr|$ipv6_wildmat)"; my %type_regex = ( @@ -208,7 +208,7 @@ parse_config while (my $word = get_config_word()) { if (defined $options->{$word}) { - # $word starts a new group definition: "peer news.example.com {" + # $word starts a new group definition: "peer news.example.com {" my ($name, $curly); $parse_error = 0; @@ -250,7 +250,7 @@ parse_config next; } - # include-file hack: ignore; user needs to check it separately + # include-file hack: ignore; user needs to check it separately if (defined $options->{''}->{$word}) { $parse_error = 0; my $includefile = get_config_word(); @@ -1016,7 +1016,7 @@ storage_conf }, } ); - # allowed method names include: cnfs timecaf timehash tradspool trash + # allowed method names include: cnfs timecaf timehash tradspool trash foreach my $method (keys %groups) { eprint "$file:$groups{$method}->{'line'}: not a valid storage method: $method.\n" unless $method =~ /^(?:cnfs|timecaf|timehash|tradspool|trash|)$/; diff --git a/scripts/innmail.in b/scripts/innmail.in index a42cde87d..e528dea3c 100644 --- a/scripts/innmail.in +++ b/scripts/innmail.in @@ -54,18 +54,18 @@ if ($sm =~ m!%s!) { my @smarr = split(/\s+/, $sm); (my $t = $INN::Config::mta) =~ s!\s.*!!; -die "$0: MTA variable definition is changed after substitution\n" +die "$0: MTA variable definition is changed after substitution\n" if ($t ne $smarr[0]); -die "$0: MTA excutable doesn't appear to exist: $smarr[0]\n" +die "$0: MTA excutable doesn't appear to exist: $smarr[0]\n" if ! -x $smarr[0]; # Startup MTA without using the shell. my $pid = open my $MTA, '|-'; if ($pid == 0) { - exec (@smarr) || die "$0: exec of $sm failed: $!\n"; + exec (@smarr) || die "$0: exec of $sm failed: $!\n"; } elsif ($pid < 0) { - die "$0: Fork failed: $!\n"; + die "$0: Fork failed: $!\n"; } print $MTA "To: ", join (",\n\t", @addrs), "\n"; diff --git a/scripts/innreport.in b/scripts/innreport.in index 9d87a670f..0a975accc 100644 --- a/scripts/innreport.in +++ b/scripts/innreport.in @@ -3,8 +3,8 @@ ########################################################################## # -# innreport: Perl script to summarize news log files -# (with optional HTML output and graphs). +# innreport: Perl script to summarize news log files +# (with optional HTML output and graphs). # # Copyright (c) 1996-2001, Fabien Tassin . # @@ -14,7 +14,7 @@ # ########################################################################## # -# Usage: innreport -f config_file [-[no]options] logfile [logfile2 [...]] +# Usage: innreport -f config_file [-[no]options] logfile [logfile2 [...]] # where options are: # -h (or -help) : this help page # -html : HTML output @@ -50,13 +50,13 @@ # # ABSOLUTELY NO WARRANTY WITH THIS PACKAGE. USE IT AT YOUR OWN RISKS. # -# Note: You need the Perl graphic library GD.pm if you want the graphs. -# GD is available on all good CPAN ftp sites. For instance: -# . -# Note: innreport will create PNG or GIF files depending upon -# the GD version. +# Note: You need the Perl graphic library GD.pm if you want the graphs. +# GD is available on all good CPAN ftp sites. For instance: +# . +# Note: innreport will create PNG or GIF files depending upon +# the GD version. # -# Documentation: for a short explanation of the different options, you +# Documentation: for a short explanation of the different options, you # can read the usage (obtained with the -h or -help switch). # # Install: - check the Perl location (first line). Require Perl 5.002 @@ -71,17 +71,17 @@ # ${PATHBIN}/innreport -f ${PATHETC}/innreport.conf ${OLD_SYSLOG} ${OLD_LOG} # # -# Report: Please report bugs (preferably) to the INN mailing list -# (see README) or directly to the author (do not forget to -# include the result of the "-config" switch, the parameters -# passed on the command line and the INN version). -# Please also report unknown entries. -# Be sure your are using the latest version of this script before -# any report. +# Report: Please report bugs (preferably) to the INN mailing list +# (see README) or directly to the author (do not forget to +# include the result of the "-config" switch, the parameters +# passed on the command line and the INN version). +# Please also report unknown entries. +# Be sure your are using the latest version of this script before +# any report. # ########################################################################## -# Note: References to have been +# Note: References to have been # removed from the output because this site appears to no longer exist. It # used to be the upstream source for innreport. If there is a new site for # innreport releases, please notify the INN maintainers. @@ -362,7 +362,7 @@ $transparent = (defined $transparent && $transparent eq 'true') ? 1 : 0; my $repeated = 1; -# 1E30 is a very large number: digit '1' followed by thirty zeroes. +# 1E30 is a very large number: digit '1' followed by thirty zeroes. # With binary radix the number has 100 digits. # On contemporary hardware, Perl converts it to the maximum value of # an unsigned integer (either 32 or 64 bit). @@ -654,7 +654,7 @@ if (!$NOT_DAILY && defined $output{'default'}{'unwanted_log'}) { # Misc... # Compare two time stamps. -# Example input: "May 12 06" for May 12, 6:00am. +# Example input: "May 12 06" for May 12, 6:00am. # - Only month, day of month and hour are checked; minutes and seconds # are ignored. # - Used with perl's sort function, arguments are passed as $a and $b. @@ -664,7 +664,7 @@ sub DateCompare { # can cheat to determine the order. It is only important if one date # is in January and the other in December. # - # Assume that every month has 36 days: 36 * 24 / 3 = 288. + # Assume that every month has 36 days: 36 * 24 / 3 = 288. # If dates differ for more than 300 days, they are assumed to be in # different years. However, this limit of 300 is based on a year of # 12 * 36 = 432 days. Mapped to a year of 365 days, the limit is diff --git a/scripts/innshellvars.in b/scripts/innshellvars.in index fceeb911d..371ff6815 100644 --- a/scripts/innshellvars.in +++ b/scripts/innshellvars.in @@ -2,7 +2,7 @@ ## Set up any and all shell variables that an INN shell script ## might need. Also sets umask. -## NOTE: When adding stuff here, add the corresponding variables to +## NOTE: When adding stuff here, add the corresponding variables to ## innshellvars.tcl and the INN::Config Perl module (as well as the ## old innshellvars.pl script). diff --git a/scripts/innwatch.in b/scripts/innwatch.in index 042c6adfe..41f4f4f77 100644 --- a/scripts/innwatch.in +++ b/scripts/innwatch.in @@ -71,7 +71,7 @@ while [ $# -gt 0 ] ; do break ;; X-*) - echo "${PROGNAME}: Unknown flag $1" 1>&2 + echo "${PROGNAME}: Unknown flag $1" 1>&2 exit 1 ;; *) @@ -83,7 +83,7 @@ done ## Process arguments. if [ $# -ne 0 ] ; then - echo "Usage: ${PROGNAME} [-f ctlfile] [-i seconds] [-l logfile] [-t seconds]" 1>&2 + echo "Usage: ${PROGNAME} [-f ctlfile] [-i seconds] [-l logfile] [-t seconds]" 1>&2 exit 1 fi @@ -149,7 +149,7 @@ do CHILDPID= NEXTSLEEP=${INNWATCHSLEEPTIME} - ## If news.daily is running, idle: we don't want to change the + ## If news.daily is running, idle: we don't want to change the ## status of anything while news.daily may be depending on what we ## have done. test -f "${DAILY}" && continue diff --git a/scripts/news.daily.in b/scripts/news.daily.in index 556130f65..347e9d04e 100644 --- a/scripts/news.daily.in +++ b/scripts/news.daily.in @@ -223,7 +223,7 @@ test -n "${RMFILE}" && { test -n "${LOWMARKFILE}" && { EXPIREOVERFLAGS="${EXPIREOVERFLAGS} -Z${LOWMARKFILE}" if [ "${DOEXPIREOVER}" != "true" ] ; then - echo "warning: lowmark requires expireover" + echo "warning: lowmark requires expireover" fi } @@ -340,7 +340,7 @@ if [ ${DOGROUPBASEEXPIRY} = true -a ${DOEXPIREOVER} = true ] ; then DOEXPIREOVER=false fi -## The heart of the matter: prologs, expire, epilogs. +## The heart of the matter: prologs, expire, epilogs. if ${DOEXPIRE} ; then ## Wait to be fairly certain innwatch is not in the middle of a pass. diff --git a/scripts/rc.news.in b/scripts/rc.news.in index 6dd36aa3b..dd1060a75 100644 --- a/scripts/rc.news.in +++ b/scripts/rc.news.in @@ -112,7 +112,7 @@ if [ -f ${SERVERPID} ] ; then echo 'INND is running' exit 0 fi - echo 'INND: PID file exists -- unclean shutdown!' + echo 'INND: PID file exists -- unclean shutdown!' RFLAG="-r" fi @@ -142,7 +142,7 @@ if [ ! -s ${ACTIVE} ] ; then if [ -s ${OLDACTIVE} ] ; then cp ${OLDACTIVE} ${ACTIVE} else - echo 'INND: No active file!' + echo 'INND: No active file!' exit 1 fi fi @@ -157,7 +157,7 @@ fi ## Overview data was rebuilt, and also active needs to be renumbered if [ -f ${PATHRUN}/.rebuildoverview ] ; then - echo 'INND: overview was rebuilt, and active needs to be renumbered!' + echo 'INND: overview was rebuilt, and active needs to be renumbered!' RFLAG="-r" fi diff --git a/site/getsafe.sh b/site/getsafe.sh index d6714eb08..794bfedc5 100644 --- a/site/getsafe.sh +++ b/site/getsafe.sh @@ -6,7 +6,7 @@ case $# in 2) ;; *) - echo "Can't get INN sample file: wrong number of arguments." 1>&2 + echo "Can't get INN sample file: wrong number of arguments." 1>&2 exit 1 ;; esac diff --git a/storage/ovdb/ovdb.c b/storage/ovdb/ovdb.c index 215327157..7120df183 100644 --- a/storage/ovdb/ovdb.c +++ b/storage/ovdb/ovdb.c @@ -1293,7 +1293,7 @@ count_records(struct groupinfo *gi) /* - * Locking: OVopen() calls ovdb_getlock(OVDB_LOCK_NORMAL). This + * Locking: OVopen() calls ovdb_getlock(OVDB_LOCK_NORMAL). This * aquires a read (shared) lock on the lockfile. Multiple processes * can have this file locked at the same time. That way, if there * are any processes that are using the database, the lock file will @@ -2630,7 +2630,7 @@ ovdb_expiregroup(const char *group, int *lo, struct history *h) delete_old_stuff(0); /* remove deleted groups first */ } - /* Special case: when called with NULL group, we're to clean out + /* Special case: when called with NULL group, we're to clean out * records for forgotton groups (groups removed from the active file * but not from overview). * This happens at the end of the expireover run, and only if all diff --git a/storage/timecaf/README.CAF b/storage/timecaf/README.CAF index 9006eb4d2..2e8d54624 100644 --- a/storage/timecaf/README.CAF +++ b/storage/timecaf/README.CAF @@ -94,7 +94,7 @@ article's position in the TOC. [Given the way the CAF code is currently used by the timecaf storage manager, it's almost always the case that we're appending to the end of the file.] - A note on the free bitmap portion of the CAF file: it's not just a simple + A note on the free bitmap portion of the CAF file: it's not just a simple bitmap (each bit of the bitmap tells whether a data block is in use or free). First there is an 'index' bitmap which tells which blocks of the 'main' bitmap have free blocks listed in them, and then a 'main' bitmap which tells whether diff --git a/storage/timecaf/caf.h b/storage/timecaf/caf.h index c5e9ea203..fc1de5d00 100644 --- a/storage/timecaf/caf.h +++ b/storage/timecaf/caf.h @@ -37,7 +37,7 @@ typedef struct _CAFHEADER { ** block, i.e. FreeZoneIndexSize. The rest of the table is a big bitmap ** listing free blocks in the 'data' portion of the CAF file. ** -** In the "index" bitmap: LSB of bitmap byte 0 is 1 if there are any 1s +** In the "index" bitmap: LSB of bitmap byte 0 is 1 if there are any 1s ** (free blocks) listed in the first block of the big bitmap, and 0 if there ** are no 1s in that block. The remaining bits of the index bitmap ** correspond to the remaining blocks of the big bitmap accordingly. @@ -145,7 +145,7 @@ extern CAFBITMAP *CAFReadFreeBM(int fd, CAFHEADER *h); extern void CAFDisposeBitmap(CAFBITMAP *cbm); /* -** Note: CAFIsBlockFree needs the fd, since blocks of the free bitmap may +** Note: CAFIsBlockFree needs the fd, since blocks of the free bitmap may ** need to be fetched from disk. */ extern int CAFIsBlockFree(CAFBITMAP *bm, int fd, off_t block); diff --git a/storage/tradindexed/tdx-group.c b/storage/tradindexed/tdx-group.c index e1201cb37..0b51137e6 100644 --- a/storage/tradindexed/tdx-group.c +++ b/storage/tradindexed/tdx-group.c @@ -31,7 +31,7 @@ ** even in strange Unix file formats, since the files are all in the same ** directory). ** -** We therefore use the following procedure to update the data: The high +** We therefore use the following procedure to update the data: The high ** water mark may be changed at any time but surrounded in a write lock. The ** base may only be changed as part of an index rebuild. To do an index ** rebuild, we follow the following procedure: diff --git a/storage/tradindexed/tdx-structure.h b/storage/tradindexed/tdx-structure.h index 01e8dffae..26205c35d 100644 --- a/storage/tradindexed/tdx-structure.h +++ b/storage/tradindexed/tdx-structure.h @@ -7,7 +7,7 @@ ** architecture-dependent due to structure padding). This will eventually be ** fixed. ** -** The structure of a tradindexed overview spool is as follows: At the root +** The structure of a tradindexed overview spool is as follows: At the root ** of the spool is a group.index file composed of a struct group_header ** followed by some number of struct group_entry's, one for each group plus ** possibly some number of free entries linked to a free list that's headed diff --git a/support/install-sh b/support/install-sh index 7afae127b..9f6e52d9d 100755 --- a/support/install-sh +++ b/support/install-sh @@ -277,7 +277,7 @@ do -* | [=\(\)!]) src=./$src;; esac - # INN addition: Cygwin compatibility. + # INN addition: Cygwin compatibility. if [ -x "$src".exe ]; then src=${src}.exe fi