cleanup: Fix extraneous whitespace throughout.

diff --git a/Makefile b/Makefile
index dcfbc39..f235f0e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ LD = gcc
 CFLAGS = -O2 -g -pedantic -Wall -DVERSION=\"$(VERSION)\"
 LINK = $(LD) $(LDFLAGS) -o $@ $^
 
 CFLAGS = -O2 -g -pedantic -Wall -DVERSION=\"$(VERSION)\"
 LINK = $(LD) $(LDFLAGS) -o $@ $^
 

-INST = 
+INST =

 prefix = /usr/local
 bindir = $(prefix)/bin
 sbindir = $(prefix)/sbin
 prefix = /usr/local
 bindir = $(prefix)/bin
 sbindir = $(prefix)/sbin

diff --git a/MdwOpt.pm b/MdwOpt.pm
index b268c15..6ee8112 100644 (file)
--- a/MdwOpt.pm
+++ b/MdwOpt.pm
@@ -39,7 +39,7 @@ require Exporter;
 #              routine, although the interface is rather different, since it
 #              takes advantage of some of Perl's object-oriented features.
 #
 #              routine, although the interface is rather different, since it
 #              takes advantage of some of Perl's object-oriented features.
 #

-#              
+#

 #          How options parsing appears to users
 #
 #              A command line consists of a number of `words' (which may
 #          How options parsing appears to users
 #
 #              A command line consists of a number of `words' (which may


@@ -166,7 +166,7 @@ require Exporter;
 #              permute         Force permuting of the argument list
 #              inorder         Read options in order
 #              posix           Force use of POSIX option semantics
 #              permute         Force permuting of the argument list
 #              inorder         Read options in order
 #              posix           Force use of POSIX option semantics

-#              quiet           Don't report errors when they happen    
+#              quiet           Don't report errors when they happen

 
 sub new
 {
 
 sub new
 {


@@ -382,7 +382,7 @@ sub read
 
   ($opt,$self->{this})=(substr($self->{this},0,1),substr($self->{this},1));
   $prefix=($self->{flags}{_neg} ? '+' : '-');
 
   ($opt,$self->{this})=(substr($self->{this},0,1),substr($self->{this},1));
   $prefix=($self->{flags}{_neg} ? '+' : '-');

-  
+

   if ($self->{short} =~ /\Q$opt/ &&
       (!$self->{flags}{_neg} || substr($',0,1) eq '+'))
   {
   if ($self->{short} =~ /\Q$opt/ &&
       (!$self->{flags}{_neg} || substr($',0,1) eq '+'))
   {


@@ -401,7 +401,7 @@ sub read
        return ('?',$self->err("option `$prefix$opt' requires an argument"))
          unless defined($arg);
       }
        return ('?',$self->err("option `$prefix$opt' requires an argument"))
          unless defined($arg);
       }

-    }  
+    }

 
     $opt.='+' if $self->{flags}{_neg};
     return ($opt,$arg);
 
     $opt.='+' if $self->{flags}{_neg};
     return ($opt,$arg);

diff --git a/buf.1 b/buf.1
index 021aabe..e5004f1 100644 (file)
--- a/buf.1
+++ b/buf.1
@@ -20,7 +20,7 @@ buf \- buffer stdin to a file
 .SH DESCRIPTION
 The
 .B buf
 .SH DESCRIPTION
 The
 .B buf

-program writes standard input to a temporary file.  It then runs 
+program writes standard input to a temporary file.  It then runs

 .VS
 .IR "command arguments " ... " stdinfile"
 .VE
 .VS
 .IR "command arguments " ... " stdinfile"
 .VE

diff --git a/cdb-assign b/cdb-assign
index 686d0f7..18051b1 100755 (executable)
--- a/cdb-assign
+++ b/cdb-assign
@@ -6,7 +6,7 @@ from sys import argv, stdin, stderr, exit
 
 ego = r_sub(r'^.*[/\\]', '', argv[0])
 def die(msg, prefix = True):
 
 ego = r_sub(r'^.*[/\\]', '', argv[0])
 def die(msg, prefix = True):

-  if prefix: msg ='%s: %s' % (ego, msg) 
+  if prefix: msg ='%s: %s' % (ego, msg)

   print >>stderr, msg
   exit(1)
 
   print >>stderr, msg
   exit(1)
 


@@ -16,9 +16,9 @@ def files(args):
   else:
     for a in args:
       if a == '-':
   else:
     for a in args:
       if a == '-':

-        yield stdin
+       yield stdin

       else:
       else:

-        yield open(a, 'r')
+       yield open(a, 'r')

 
 if len(argv) < 2:
   die('usage: %s CDB [INPUT ...]' % ego, False)
 
 if len(argv) < 2:
   die('usage: %s CDB [INPUT ...]' % ego, False)

diff --git a/cdb-list b/cdb-list
index ee85a14..1a18f32 100755 (executable)
--- a/cdb-list
+++ b/cdb-list
@@ -6,7 +6,7 @@ from sys import argv, stdin, stderr, exit
 
 ego = r_sub(r'^.*[/\\]', '', argv[0])
 def die(msg, prefix = True):
 
 ego = r_sub(r'^.*[/\\]', '', argv[0])
 def die(msg, prefix = True):

-  if prefix: msg ='%s: %s' % (ego, msg) 
+  if prefix: msg ='%s: %s' % (ego, msg)

   print >>stderr, msg
   exit(1)
 
   print >>stderr, msg
   exit(1)
 


@@ -16,9 +16,9 @@ def files(args):
   else:
     for a in args:
       if a == '-':
   else:
     for a in args:
       if a == '-':

-        yield stdin
+       yield stdin

       else:
       else:

-        yield open(a, 'r')
+       yield open(a, 'r')

 
 if len(argv) < 2:
   die('usage: %s CDB [INPUT ...]' % ego, False)
 
 if len(argv) < 2:
   die('usage: %s CDB [INPUT ...]' % ego, False)

diff --git a/cdb-list.1 b/cdb-list.1
index 9cc6d4c..c2cefd8 100644 (file)
--- a/cdb-list.1
+++ b/cdb-list.1
@@ -16,7 +16,7 @@ Comments and blank lines in the inputs are ignored.  Each other line
 .I line
 causes an entry to be inserted into the BDB, whose key is
 .I line
 .I line
 causes an entry to be inserted into the BDB, whose key is
 .I line

-with leading and trailing spaces stripped, and whose value is empty.  
+with leading and trailing spaces stripped, and whose value is empty.

 .PP
 The CDB file is written to
 .IB cdb .new
 .PP
 The CDB file is written to
 .IB cdb .new

diff --git a/cdb-map b/cdb-map
index f230a42..684005d 100755 (executable)
--- a/cdb-map
+++ b/cdb-map
@@ -6,7 +6,7 @@ from sys import argv, stdin, stderr, exit
 
 ego = r_sub(r'^.*[/\\]', '', argv[0])
 def die(msg, prefix = True):
 
 ego = r_sub(r'^.*[/\\]', '', argv[0])
 def die(msg, prefix = True):

-  if prefix: msg ='%s: %s' % (ego, msg) 
+  if prefix: msg ='%s: %s' % (ego, msg)

   print >>stderr, msg
   exit(1)
 
   print >>stderr, msg
   exit(1)
 


@@ -16,9 +16,9 @@ def files(args):
   else:
     for a in args:
       if a == '-':
   else:
     for a in args:
       if a == '-':

-        yield stdin
+       yield stdin

       else:
       else:

-        yield open(a, 'r')
+       yield open(a, 'r')

 
 if len(argv) < 2:
   die('usage: %s CDB [INPUT ...]' % ego, False)
 
 if len(argv) < 2:
   die('usage: %s CDB [INPUT ...]' % ego, False)

diff --git a/check-sender.1 b/check-sender.1
index 7e972f8..948d041 100644 (file)
--- a/check-sender.1
+++ b/check-sender.1
@@ -7,7 +7,7 @@ check-sender \- check an envelope sender's domain in a CDB file
 .B .qmail
 file)
 .br
 .B .qmail
 file)
 .br

-.B |check-sender 
+.B |check-sender

 .BI < cdb
 .SH DESCRIPTION
 If the domain part of the email address in the
 .BI < cdb
 .SH DESCRIPTION
 If the domain part of the email address in the

diff --git a/debian/changelog b/debian/changelog
index 9773dde..6e2bae8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ nsict-utils (1.1.1) experimental; urgency=low
   * Fix splitconf documentation to be right.
   * Fix gorp to produce base32 (ugh!) and safe64 output.
 
   * Fix splitconf documentation to be right.
   * Fix gorp to produce base32 (ugh!) and safe64 output.
 

- -- Mark Wooding <mdw@nsict.org>  Sat,  5 Feb 2005 10:39:52 +0000
+ -- Mark Wooding <mdw@nsict.org>  Sat, 5 Feb 2005 10:39:52 +0000

 
 nsict-utils (1.1.0) experimental; urgency=low
 
 
 nsict-utils (1.1.0) experimental; urgency=low
 


@@ -14,7 +14,7 @@ nsict-utils (1.1.0) experimental; urgency=low
  -- Mark Wooding <mdw@nsict.org>  Tue, 18 Nov 2003 18:47:21 +0000
 
 nsict-utils (1.0) experimental; urgency=low
  -- Mark Wooding <mdw@nsict.org>  Tue, 18 Nov 2003 18:47:21 +0000
 
 nsict-utils (1.0) experimental; urgency=low

-  
+

   * Debianization!
   * Debianization!

-  
+

  -- Mark Wooding <mdw@nsict.org>  Tue, 18 Nov 2003 13:48:03 +0000
  -- Mark Wooding <mdw@nsict.org>  Tue, 18 Nov 2003 13:48:03 +0000

diff --git a/debian/rules b/debian/rules
index 80aed10..744cdfa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ install: build
        done <debian/inst
        mkdir -p debian/nsict-utils
 
        done <debian/inst
        mkdir -p debian/nsict-utils
 

-binary-indep: 
+binary-indep:

        dh_testdir -i
        dh_testroot -i
        dh_compress -i
        dh_testdir -i
        dh_testroot -i
        dh_compress -i


@@ -56,4 +56,4 @@ source:
        d=`pwd`; cd ..; dpkg-source -i -b $$d/=inst=/=deb=/*
        rm -rf =inst=
 
        d=`pwd`; cd ..; dpkg-source -i -b $$d/=inst=/=deb=/*
        rm -rf =inst=
 

-.PHONY: binary binary-arch binary-indep clean install source 
+.PHONY: binary binary-arch binary-indep clean install source

diff --git a/gorp.1 b/gorp.1
index ac3d02a..69bb892 100644 (file)
--- a/gorp.1
+++ b/gorp.1
@@ -34,7 +34,7 @@ Prints the random string using the chosen output
 .IR format ,
 which may be
 .B base64
 .IR format ,
 which may be
 .B base64

-(standard Base64 encoding, as described in RFC2045; this is the default), 
+(standard Base64 encoding, as described in RFC2045; this is the default),

 .B file64
 (Base64 encoding, with
 .RB ` % '
 .B file64
 (Base64 encoding, with
 .RB ` % '

diff --git a/gorp.c b/gorp.c
index 81b4608..d5ce481 100644 (file)
--- a/gorp.c
+++ b/gorp.c
@@ -48,7 +48,7 @@ static void do_format(size_t n, unsigned line, void *ctx,
   }
   if (fix) fix(d.buf, d.len);
   DPUTC(&d, '\n');
   }
   if (fix) fix(d.buf, d.len);
   DPUTC(&d, '\n');

-  DWRITE(&d, stdout);  
+  DWRITE(&d, stdout);

 }
 
 static void do_base64(void *ctx, char *p, size_t sz, dstr *d)
 }
 
 static void do_base64(void *ctx, char *p, size_t sz, dstr *d)


@@ -65,7 +65,7 @@ static void do_format_base64(size_t n, unsigned line,
 }
 static void format_base64(size_t n, unsigned line)
   { do_format_base64(n, line, 0); }
 }
 static void format_base64(size_t n, unsigned line)
   { do_format_base64(n, line, 0); }

-  
+

 static void do_base32(void *ctx, char *p, size_t sz, dstr *d)
   { base32_encode(ctx, p, sz, d); }
 static void format_base32(size_t n, unsigned line)
 static void do_base32(void *ctx, char *p, size_t sz, dstr *d)
   { base32_encode(ctx, p, sz, d); }
 static void format_base32(size_t n, unsigned line)

diff --git a/inplace.1 b/inplace.1
index a5b4d50..eaebe9d 100644 (file)
--- a/inplace.1
+++ b/inplace.1
@@ -34,7 +34,7 @@ with standard input redirected from
 and redirecting standard output to
 .IR file \c
 .BR .new .
 and redirecting standard output to
 .IR file \c
 .BR .new .

-If all these programs are successful, then each 
+If all these programs are successful, then each

 .I file
 is copied to
 .IB file .old
 .I file
 is copied to
 .IB file .old


@@ -44,7 +44,7 @@ renamed to
 .IR file ;
 the
 .IB file .old
 .IR file ;
 the
 .IB file .old

-files are then deleted.  If something went wrong, the 
+files are then deleted.  If something went wrong, the

 .IB file .new
 files are all deleted and the original
 .IR file s
 .IB file .new
 files are all deleted and the original
 .IR file s

diff --git a/locking.c b/locking.c
index cd4e81d..f486ea4 100644 (file)
--- a/locking.c
+++ b/locking.c
@@ -7,7 +7,7 @@
  * (c) 2003 Mark Wooding
  */
 
  * (c) 2003 Mark Wooding
  */
 

-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*

  *
  * This file is part of the Toys utilties collection.
  *
  *
  * This file is part of the Toys utilties collection.
  *


@@ -15,12 +15,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.

- * 
+ *

  * Toys is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  * Toys is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.

- * 
+ *

  * You should have received a copy of the GNU General Public License
  * along with Toys; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * You should have received a copy of the GNU General Public License
  * along with Toys; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

diff --git a/pause.c b/pause.c
index fd688e5..f182c09 100644 (file)
--- a/pause.c
+++ b/pause.c
@@ -7,7 +7,7 @@
  * (c) 1999 Mark Wooding
  */
 
  * (c) 1999 Mark Wooding
  */
 

-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*

  *
  * This file is part of Pause.
  *
  *
  * This file is part of Pause.
  *


@@ -15,12 +15,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later ersion.
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later ersion.

- * 
+ *

  * Pause is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  * Pause is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.

- * 
+ *

  * You should have received a copy of the GNU General Public License
  * along with Pause; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * You should have received a copy of the GNU General Public License
  * along with Pause; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


@@ -192,7 +192,7 @@ int main(int argc, char *argv[])
       case 'h': t *= 60;
       case 'm': t *= 60;
       case 's':        if (q[1] != 0)
       case 'h': t *= 60;
       case 'm': t *= 60;
       case 's':        if (q[1] != 0)

-      default:    t = 0;
+      default:   t = 0;

       case 0:  break;
     }
     if (t <= 0)
       case 0:  break;
     }
     if (t <= 0)

diff --git a/qmail-checkspam.c b/qmail-checkspam.c
index 9f7411e..849d6ed 100644 (file)
--- a/qmail-checkspam.c
+++ b/qmail-checkspam.c
@@ -7,18 +7,18 @@
  * (c) 2003 Mark Wooding
  */
 
  * (c) 2003 Mark Wooding
  */
 

-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*

  *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.

- * 
+ *

  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.

- * 
+ *

  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

diff --git a/shadowfix b/shadowfix
index 3793a30..1c5e4b6 100755 (executable)
--- a/shadowfix
+++ b/shadowfix
@@ -266,7 +266,7 @@ sub unlockfile {
   }
 
   # --- Move the old file out of the way ---
   }
 
   # --- Move the old file out of the way ---

-  
+

   !-e $file or rename("${file}", "${file}-") or do {
     unlink "${file}.lock";
     unlink "${file}.edit";
   !-e $file or rename("${file}", "${file}-") or do {
     unlink "${file}.lock";
     unlink "${file}.edit";


@@ -348,7 +348,7 @@ while ($line = $gr->getline) {
   $#f = 3;
   $a = { data => [ @f ],
         members => { hashify(split /,/, $f[3]) },
   $#f = 3;
   $a = { data => [ @f ],
         members => { hashify(split /,/, $f[3]) },

-         name => $f[0], gid => $f[2] };
+        name => $f[0], gid => $f[2] };

   $gbynam{$a->{name}} = $gbygid{$a->{gid}} = $a;
 }
 $gr->close;
   $gbynam{$a->{name}} = $gbygid{$a->{gid}} = $a;
 }
 $gr->close;


@@ -508,7 +508,7 @@ for $g (values %gbynam) {
     # --- Check that the group's administrators exist ---
 
     if ($sg->{data}[2] ne "" && !$suyb) {
     # --- Check that the group's administrators exist ---
 
     if ($sg->{data}[2] ne "" && !$suyb) {

-      my @admins = 
+      my @admins =

       my $admin;
       foreach $admin (split(/,/, $sg->{data}[2])) {
        exists $ubynam{$admin} or
       my $admin;
       foreach $admin (split(/,/, $sg->{data}[2])) {
        exists $ubynam{$admin} or

diff --git a/stamp.1 b/stamp.1
index 5cbe9f0..fb55caf 100644 (file)
--- a/stamp.1
+++ b/stamp.1
@@ -31,9 +31,9 @@ Show usage message for
 .BR stamp .
 .TP
 .BI "\-f, \-\-format=" format
 .BR stamp .
 .TP
 .BI "\-f, \-\-format=" format

-Use 
+Use

 .I format
 .I format

-as the 
+as the

 .BR strftime (3)
 format string for the datestamps.  Note that if the datestamp is meant
 to be separated from the rest of the line by anything, then that
 .BR strftime (3)
 format string for the datestamps.  Note that if the datestamp is meant
 to be separated from the rest of the line by anything, then that

diff --git a/stamp.c b/stamp.c
index a5655a6..28eca79 100644 (file)
--- a/stamp.c
+++ b/stamp.c
@@ -135,4 +135,4 @@ int main(int argc, char *argv[])
   }
 
   return ((f & F_BOGUS) ? EXIT_FAILURE : 0);
   }
 
   return ((f & F_BOGUS) ? EXIT_FAILURE : 0);

-}      
+}

diff --git a/z.1 b/z.1
index 05f64d8..918f97f 100644 (file)
--- a/z.1
+++ b/z.1
@@ -31,6 +31,6 @@ The decompressed versions of files are always created with default
 owner, group and permissions (as set by the current euid, egid and umask
 settings).
 .PP
 owner, group and permissions (as set by the current euid, egid and umask
 settings).
 .PP

-It doesn't leave file extensions on the decompressed files. 
+It doesn't leave file extensions on the decompressed files.

 .SH AUTHOR
 Mark Wooding <mdw@distorted.org.uk>
 .SH AUTHOR
 Mark Wooding <mdw@distorted.org.uk>