INN commit: branches/2.5 (4 files)

[INN Commit]

    Date: Tuesday, August 18, 2009 @ 06:55:11
  Author: iulius
Revision: 8576

Various fixes and homogenizations.

Modified:
  branches/2.5/doc/pod/cnfsstat.pod
  branches/2.5/doc/pod/fastrm.pod
  branches/2.5/expire/expirerm.in
  branches/2.5/expire/fastrm.c

----------------------+
 doc/pod/cnfsstat.pod |    2 ++
 doc/pod/fastrm.pod   |   34 +++++++++++++++++-----------------
 expire/expirerm.in   |    4 +++-
 expire/fastrm.c      |    2 +-
 4 files changed, 23 insertions(+), 19 deletions(-)

Modified: doc/pod/cnfsstat.pod
===================================================================
--- doc/pod/cnfsstat.pod	2009-08-18 13:53:54 UTC (rev 8575)
+++ doc/pod/cnfsstat.pod	2009-08-18 13:55:11 UTC (rev 8576)
@@ -59,6 +59,8 @@
 Write additional information, especially about consistency checks for article
 storage and the F<history> file.
 
+=back
+
 =head1 HISTORY
 
 Written by Katsuhiro Kondou <kondou at nec.co.jp> for InterNetNews.  Converted

Modified: doc/pod/fastrm.pod
===================================================================
--- doc/pod/fastrm.pod	2009-08-18 13:53:54 UTC (rev 8575)
+++ doc/pod/fastrm.pod	2009-08-18 13:55:11 UTC (rev 8576)
@@ -4,7 +4,7 @@
 
 =head1 SYNOPSIS
 
-B<fastrm> [B<-de>] [B<-u>|B<-u>I<N>] [B<-s>|B<-s>I<M>] [B<-c>|B<-c>I<I>]
+B<fastrm> [B<-de>] [B<-c>|B<-c>I<I>] [B<-s>|B<-s>I<M>] [B<-u>|B<-u>I<N>]
 I<base-directory>
 
 =head1 DESCRIPTION
@@ -40,7 +40,7 @@
 The input to B<fastrm> should always be sorted S<-- or> even better be in the
 order file names are output by S<find(1) --> if speed is an issue and the
 input isn't solely storage API tokens.  (It deals fine with unsorted
-input, but is unlikely to be any faster in that case than a simple C<xargs
+input, but is unlikely to be any faster in that case than a simple C<| xargs
 rm> command.)  Sorting may even slightly speed up the removal of storage
 API tokens due to caching effects, since sorting will tend to keep all of
 the tokens from a particular storage method together.
@@ -58,6 +58,17 @@
 
 =over 4
 
+=item B<-c>[I<I>]
+
+Controls when B<fastrm> calls chdir(2).  If the number of files to be
+unlinked from a given directory is at least I<I>, then B<fastrm> will
+change to that directory before unlinking those files.  Otherwise, it will
+use either the absolute path names or a path name relative to the current
+directory (whichever is likely more efficient).  The I<I> parameter is
+optional; if just B<-c> is given, B<-c1> is assumed, which will cause
+B<fastrm> to always chdir before calling unlink(2).  The default is
+B<-c3>.  Use B<-c0> to prevent B<fastrm> from ever using chdir(2).
+
 =item B<-d>
 
 Don't remove any files.  Instead, print a list of the files that would be
@@ -74,19 +85,8 @@
 is last in a pipeline after a preceding sort(1) command, ensuring that
 B<fastrm> will fail if the sort fails.
 
-=item B<-c>I<I>
+=item B<-s>[I<M>]
 
-Controls when B<fastrm> calls chdir(2).  If the number of files to be
-unlinked from a given directory is at least I<I>, then B<fastrm> will
-change to that directory before unlinking those files.  Otherwise, it will
-use either the absolute path names or a path name relative to the current
-directory (whichever is likely more efficient).  The I<I> parameter is
-optional; if just B<-c> is given, B<-c1> is assumed, which will cause
-B<fastrm> to always chdir before calling unlink(2).  The default is
-B<-c3>.  Use B<-c0> to prevent B<fastrm> from ever using chdir(2).
-
-=item B<-s>I<M>
-
 When B<-s> is given and the number of files to remove in a directory is
 greater than I<M>, rather than remove files in the order given, B<fastrm>
 will open the directory and read it, unlinking files in the order that
@@ -108,7 +108,7 @@
 
 This optimization is off by default.
 
-=item B<-u>I<N>
+=item B<-u>[I<N>]
 
 Specifying this option promises that there are no symbolic links in the
 directory tree from which files are being removed.  This allows B<fastrm>
@@ -129,7 +129,7 @@
 =back
 
 B<fastrm> also accepts B<-a> and B<-r> options, which do nothing at all
-except allow you to say C<fastrm -usa>, C<fastrm -ussr>, or C<fastrm
+except allow you to say C<fastrm -usa>, C<fastrm -usr>, or C<fastrm
 -user>.  These happen to often be convenient sets of options to use.
 
 =head1 EXIT STATUS
@@ -179,7 +179,7 @@
 =head1 HISTORY
 
 B<fastrm> was originally written by <kre at munnari.oz.au>.  This manual page
-rewritten in POD by Russ Allbery <rra at stanford.edu> for InterNetNews.
+was rewritten in POD by Russ Allbery <rra at stanford.edu> for InterNetNews.
 
 $Id$
 

Modified: expire/expirerm.in
===================================================================
--- expire/expirerm.in	2009-08-18 13:53:54 UTC (rev 8575)
+++ expire/expirerm.in	2009-08-18 13:55:11 UTC (rev 8576)
@@ -1,6 +1,8 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
+##  $Id$
+##
 ##  Remove articles listed by expire -z.
 ##  Remove all files specified in the input file.
 
@@ -25,6 +27,6 @@
     && mv $1 ${MOST_LOGS}/expire.list"
 if [ -f $1 ] ; then
     echo "Expire had problems removing articles on `hostname`" \
-	| eval ${MAIL}
+  | eval ${MAIL}
     exit 1
 fi

Modified: expire/fastrm.c
===================================================================
--- expire/fastrm.c	2009-08-18 13:53:54 UTC (rev 8575)
+++ expire/fastrm.c	2009-08-18 13:55:11 UTC (rev 8576)
@@ -2,7 +2,7 @@
 **
 **  Delete a list of filenames or tokens from stdin.
 **
-**  Originally written by <kre at munnari.oz.au> (to only handle files)
+**  Originally written by <kre at munnari.oz.au> (to only handle files).
 **
 **  Files that can't be unlinked because they didn't exist are considered
 **  okay.  Any error condition results in exiting with non-zero exit