Use uniform indentation, add missing copyleft headers, update years.

25 files changed, 66 insertions, 34 deletions

diff --git a/Make.rules b/Make.rules
index 186de06..cafa879 100644
--- a/Make.rules
+++ b/Make.rules
@@ -1,8 +1,8 @@
 # This file is part of BEAM
-# Copyright (C) 2012 Sergey Poznyakoff
+# Copyright (C) 2012-2014 Sergey Poznyakoff
 #
 # BEAM 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 3, or (at your option)
 # any later version.
 #
diff --git a/Makefile.am b/Makefile.am
index c65a39d..551f7b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of BEAM
-# Copyright (C) 2012 Sergey Poznyakoff
+# Copyright (C) 2012-2014 Sergey Poznyakoff
 #
 # BEAM 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 3, or (at your option)
 # any later version.
 #
diff --git a/NEWS b/NEWS
index 7ef3571..1671079 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
-BEAM NEWS -- history of user-visible changes. 2013-08-05
-Copyright (C) 2012, 2013 Sergey Poznyakoff.
+BEAM NEWS -- history of user-visible changes. 2014-03-19
+Copyright (C) 2012-2014 Sergey Poznyakoff.
 See the end of file for copying conditions.
 
 Please send mailutils bug reports to <gray@gnu.org.ua>.
 
 Version 1.5, 2013-08-05
 
@@ -41,13 +41,13 @@ Version 1.2 (git)
 First release.
 
 
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 2012, 2013 Sergey Poznyakoff.
+Copyright (C) 2012-2014 Sergey Poznyakoff.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
    copyright notice and this permission notice are preserved,
    thus giving the recipient permission to redistribute in turn.
 
diff --git a/README b/README
index c407c0a..9e7410c 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 BEAM README file.
-Copyright (C) 2012 Sergey Poznyakoff
+Copyright (C) 2012-2014 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 * Introduction
 
 BEAM is a flexible and configurable tool for backup management.  Its
 name is an acronym for "Backup Easy And Manageable".  The tool
@@ -109,13 +109,13 @@ The documentation in man page format is available:
 
 Send bug reports to <gray@gnu.org.ua>.
 
 
 * Copyright information:
 
-Copyright (C) 2012 Sergey Poznyakoff
+Copyright (C) 2012-2014 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
    the copyright notice and this permission notice are preserved,
    thus giving the recipient permission to redistribute in turn.
 
diff --git a/backup.in b/backup.in
index ca479b1..477b839 100644
--- a/backup.in
+++ b/backup.in
@@ -1,9 +1,9 @@
 #! /bin/sh
 # This file is part of BEAM
-# Copyright (C) 2012 Sergey Poznyakoff
+# Copyright (C) 2012-2014 Sergey Poznyakoff
 #
 # BEAM 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 3, or (at your option)
 # any later version.
 #
diff --git a/beam.in b/beam.in
index 480351c..7281a18 100644
--- a/beam.in
+++ b/beam.in
@@ -1,7 +1,22 @@
 #! /bin/sh
+# This file is part of BEAM
+# Copyright (C) 2012-2014 Sergey Poznyakoff
+#
+# BEAM 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 3, or (at your option)
+# any later version.
+#
+# BEAM 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 BEAM.  If not, see <http://www.gnu.org/licenses/>.
 
 libdir=@LIBDIR@/beam
 set -e
 . $libdir/common.sh
 set +e
 
diff --git a/cleaner.in b/cleaner.in
index 035892f..0a9a35f 100755
--- a/cleaner.in
+++ b/cleaner.in
@@ -1,7 +1,22 @@
 #! /bin/sh
+# This file is part of BEAM
+# Copyright (C) 2012-2014 Sergey Poznyakoff
+#
+# BEAM 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 3, or (at your option)
+# any later version.
+#
+# BEAM 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 BEAM.  If not, see <http://www.gnu.org/licenses/>.
 
 libdir=@LIBDIR@/beam
 set -e
 . $libdir/common.sh
 set +e
 
diff --git a/configure.ac b/configure.ac
index a90c938..6e39a4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # This file is part of BEAM -*- autoconf -*-
-# Copyright (C) 2012, 2013 Sergey Poznyakoff
+# Copyright (C) 2012-2014 Sergey Poznyakoff
 #
 # BEAM 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 3, or (at your option)
 # any later version.
 #
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 846c1de..0d82900 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of BEAM
-# Copyright (C) 2012 Sergey Poznyakoff
+# Copyright (C) 2012-2014 Sergey Poznyakoff
 #
 # BEAM 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 3, or (at your option)
 # any later version.
 #
diff --git a/doc/beam-backup.1in b/doc/beam-backup.1in
index be45a44..2438d7b 100644
--- a/doc/beam-backup.1in
+++ b/doc/beam-backup.1in
@@ -1,8 +1,8 @@
 .\" This file is part of BEAM -*- nroff -*-
-.\" Copyright (C) 2012 Sergey Poznyakoff
+.\" Copyright (C) 2012-2014 Sergey Poznyakoff
 .\"
 .\" BEAM 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 3, or (at your option)
 .\" any later version.
 .\"
@@ -11,13 +11,13 @@
 .\" 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 BEAM.  If not, see <http://www.gnu.org/licenses/>.
 .\"
-.TH BEAM\-BACKUP 1 "October 24, 2012" "BEAM" "BEAM User Reference"
+.TH BEAM\-BACKUP 1 "March 19, 2014" "BEAM" "BEAM User Reference"
 .SH NAME
 beam\-backup \- create a back up.
 .SH SYNOPSIS
 .B beam backup
 [\fB\-vnN\fR] [\fB\-\-verbose\fR] [\fB\-l\fR \fIFILE\fR]\
  [\fB\-\-logfile\fR \fIFILE\fR]\
diff --git a/doc/beam-cleaner.1in b/doc/beam-cleaner.1in
index 36f2de7..59a39b4 100644
--- a/doc/beam-cleaner.1in
+++ b/doc/beam-cleaner.1in
@@ -1,8 +1,8 @@
 .\" This file is part of BEAM -*- nroff -*-
-.\" Copyright (C) 2012 Sergey Poznyakoff
+.\" Copyright (C) 2012-2014 Sergey Poznyakoff
 .\"
 .\" BEAM 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 3, or (at your option)
 .\" any later version.
 .\"
@@ -11,13 +11,13 @@
 .\" 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 BEAM.  If not, see <http://www.gnu.org/licenses/>.
 .\"
-.TH BEAM\-CLEANER 1 "October 24, 2012" "BEAM" "BEAM User Reference"
+.TH BEAM\-CLEANER 1 "March 19, 2014" "BEAM" "BEAM User Reference"
 .SH NAME
 beam\-cleaner \- clean up old backup files.
 .SH SYNOPSIS
 .B beam\-cleaner
 [\fB\-s\fR \fISUF\fR] [\fB\-r\fR \fIN\fs] [\fB\-vn\fR] \
  [\fB\-\-suffix\fR \fISUF\fR] [\fB\-\-retain\fR \fIN\fR] \
diff --git a/doc/beam-list.1in b/doc/beam-list.1in
index 0614e81..57aa537 100644
--- a/doc/beam-list.1in
+++ b/doc/beam-list.1in
@@ -1,8 +1,8 @@
 .\" This file is part of BEAM -*- nroff -*-
-.\" Copyright (C) 2012 Sergey Poznyakoff
+.\" Copyright (C) 2012-2014 Sergey Poznyakoff
 .\"
 .\" BEAM 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 3, or (at your option)
 .\" any later version.
 .\"
@@ -11,13 +11,13 @@
 .\" 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 BEAM.  If not, see <http://www.gnu.org/licenses/>.
 .\"
-.TH BEAM\-LIST 1 "October 24, 2012" "BEAM" "BEAM User Reference"
+.TH BEAM\-LIST 1 "March 19, 2014" "BEAM" "BEAM User Reference"
 .SH NAME
 beam\-list \- list items included in backup
 .SH SYNOPSIS
 .B beam list
 [\fB\-l\fR] [\fB\-\-number\fR]
 
diff --git a/doc/beam-module.5in b/doc/beam-module.5in
index f650c65..9ba239f 100644
--- a/doc/beam-module.5in
+++ b/doc/beam-module.5in
@@ -1,8 +1,8 @@
 .\" This file is part of BEAM -*- nroff -*-
-.\" Copyright (C) 2012 Sergey Poznyakoff
+.\" Copyright (C) 2012-2014 Sergey Poznyakoff
 .\"
 .\" BEAM 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 3, or (at your option)
 .\" any later version.
 .\"
@@ -11,13 +11,13 @@
 .\" 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 BEAM.  If not, see <http://www.gnu.org/licenses/>.
 .\"
-.TH BEAM\-MODULE 5 "January 16, 2013" "BEAM" "BEAM Programmer Reference"
+.TH BEAM\-MODULE 5 "March 19, 2014" "BEAM" "BEAM Programmer Reference"
 .SH NAME
 beam\-module \- format of 
 .BR beam (1)
 modules
 .SH DESCRIPTION
 This manual page explains how to write new modules for
diff --git a/doc/beam-restore.1in b/doc/beam-restore.1in
index bbbfbba..6d24ad8 100644
--- a/doc/beam-restore.1in
+++ b/doc/beam-restore.1in
@@ -1,8 +1,8 @@
 .\" This file is part of BEAM -*- nroff -*-
-.\" Copyright (C) 2012 Sergey Poznyakoff
+.\" Copyright (C) 2012-2014 Sergey Poznyakoff
 .\"
 .\" BEAM 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 3, or (at your option)
 .\" any later version.
 .\"
@@ -11,13 +11,13 @@
 .\" 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 BEAM.  If not, see <http://www.gnu.org/licenses/>.
 .\"
-.TH BEAM\-RESTORE 1 "October 24, 2012" "BEAM" "BEAM User Reference"
+.TH BEAM\-RESTORE 1 "March 19, 2014" "BEAM" "BEAM User Reference"
 .SH NAME
 beam\-restore \- restore file system from a backup.
 .SH SYNOPSIS
 .B beam restore
 [\fB\-cntv\fR] [\fB\-\-confirm\fR] [\fB\-C\fR \fIDIR\fR]\
  [\fB\-\-directory\fR \fIDIR\fR] [\fB\-\-verbose\fR]
diff --git a/doc/beam-s3.1in b/doc/beam-s3.1in
index 68dc66b..a295270 100644
--- a/doc/beam-s3.1in
+++ b/doc/beam-s3.1in
@@ -1,8 +1,8 @@
 .\" This file is part of BEAM -*- nroff -*-
-.\" Copyright (C) 2012 Sergey Poznyakoff
+.\" Copyright (C) 2012-2014 Sergey Poznyakoff
 .\"
 .\" BEAM 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 3, or (at your option)
 .\" any later version.
 .\"
@@ -11,13 +11,13 @@
 .\" 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 BEAM.  If not, see <http://www.gnu.org/licenses/>.
 .\"
-.TH BEAM\-S3 1 "October 24, 2012" "BBE" "BBE User Reference"
+.TH BEAM\-S3 1 "March 19, 2014" "BBE" "BBE User Reference"
 .SH NAME
 beam\-s3 \- manage a backup s3 bucket
 .SH SYNOPSIS
 .B beam s3
 mount
 
diff --git a/doc/beam.1in b/doc/beam.1in
index fc15064..0fd3ce5 100644
--- a/doc/beam.1in
+++ b/doc/beam.1in
@@ -1,8 +1,8 @@
 .\" This file is part of BEAM -*- nroff -*-
-.\" Copyright (C) 2012 Sergey Poznyakoff
+.\" Copyright (C) 2012-2014 Sergey Poznyakoff
 .\"
 .\" BEAM 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 3, or (at your option)
 .\" any later version.
 .\"
@@ -11,13 +11,13 @@
 .\" 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 BEAM.  If not, see <http://www.gnu.org/licenses/>.
 .\"
-.TH BEAM 1 "October 24, 2012" "BEAM" "BEAM User Reference"
+.TH BEAM 1 "March 19, 2014" "BEAM" "BEAM User Reference"
 .SH NAME
 beam \- a backup manager
 .SH SYNOPSIS
 .B beam
 backup [\fIoptions\fB]
 
diff --git a/lib/beam/Makefile.am b/lib/beam/Makefile.am
index 22c9a12..81385ad 100644
--- a/lib/beam/Makefile.am
+++ b/lib/beam/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of BEAM
-# Copyright (C) 2012 Sergey Poznyakoff
+# Copyright (C) 2012-2014 Sergey Poznyakoff
 #
 # BEAM 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 3, or (at your option)
 # any later version.
 #
diff --git a/lib/beam/common.in b/lib/beam/common.in
index 4f2184b..94b4565 100644
--- a/lib/beam/common.in
+++ b/lib/beam/common.in
@@ -171,13 +171,13 @@ This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 EOF
     exit 0
 }
 
 wtf() {
-  l=`echo "${1#beam-}"|sed "s|.|.|g"`
+    l=$(echo "${1#beam-}"|sed "s|.|.|g")
     s=$(echo "                " | sed "s|$l|${1#beam-}|")
     shift
     echo "    $s $@"
 }
 
 dry_mail() {
diff --git a/lib/beam/fs.sh b/lib/beam/fs.sh
index b4d0c2d..015082b 100755
--- a/lib/beam/fs.sh
+++ b/lib/beam/fs.sh
@@ -1,9 +1,9 @@
 #! /bin/sh
 # This file is part of BEAM
-# Copyright (C) 2012 Sergey Poznyakoff
+# Copyright (C) 2012-2014 Sergey Poznyakoff
 #
 # BEAM 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 3, or (at your option)
 # any later version.
 #
diff --git a/lib/beam/ldap.sh b/lib/beam/ldap.sh
index f6e56b8..40b9a4b 100755
--- a/lib/beam/ldap.sh
+++ b/lib/beam/ldap.sh
@@ -1,9 +1,9 @@
 #! /bin/sh
 # This file is part of BEAM
-# Copyright (C) 2012 Sergey Poznyakoff
+# Copyright (C) 2012-2014 Sergey Poznyakoff
 #
 # BEAM 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 3, or (at your option)
 # any later version.
 #
diff --git a/lib/beam/postgres.sh b/lib/beam/postgres.sh
index b5a9b6e..3938c1a 100755
--- a/lib/beam/postgres.sh
+++ b/lib/beam/postgres.sh
@@ -1,9 +1,9 @@
 #! /bin/sh
 # This file is part of BEAM
-# Copyright (C) 2012 Sergey Poznyakoff
+# Copyright (C) 2012-2014 Sergey Poznyakoff
 #
 # BEAM 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 3, or (at your option)
 # any later version.
 #
diff --git a/lib/beam/s3.sh b/lib/beam/s3.sh
index d2fcfe6..7b6ad91 100644
--- a/lib/beam/s3.sh
+++ b/lib/beam/s3.sh
@@ -1,9 +1,9 @@
 #! /bin/sh
 # This file is part of BEAM
-# Copyright (C) 2012 Sergey Poznyakoff
+# Copyright (C) 2012-2014 Sergey Poznyakoff
 #
 # BEAM 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 3, or (at your option)
 # any later version.
 #
@@ -37,13 +37,14 @@ s3_getmpoint()
 	    mount -tfuse.s3backer | 
             awk '/https?:\/\/.*'$backup_bucket_name'/ { print $3 }';;
 	s3)
 	    s=$(mount | grep "^${backup_mp_s3backer}/file" | awk '{ print $3 }')
 	    if [ -z "$s" ]; then
                 # Some kernels print device name instead of the actual mount file:
-      s=$(mount | grep "^/dev/loop[0-9] on ${backup_mp_s3}" | awk '{ print $3 }')
+		s=$(mount | grep "^/dev/loop[0-9] on ${backup_mp_s3}" |
+		    awk '{ print $3 }')
 	    fi
 	    echo $s;;
 	*)
 	    abent 1 "invalid usage of getmpoint"
     esac
 }
@@ -74,13 +75,14 @@ s3_mount() {
 	    beam-s3)  ;;
 	    *)       error "called as $0: assuming default mount options"
 	esac
 	test -n "$backup_s3_mount_options" &&
 	    mountopt="$mountopt,$backup_s3_mount_options"
         # NOTE: For ext4 add the journal_async_commit option.
-    $dry_run mount -oloop$mountopt $backup_mp_s3backer/file $backup_mp_s3 || 
+	    $dry_run mount -oloop$mountopt \
+		$backup_mp_s3backer/file $backup_mp_s3 || 
                    abend 1 "unable to mount $backup_mp_s3backer/file"
 	      umount_list="$backup_mp_s3 $umount_list"
     else
 	backup_mp_s3=$1
     fi
     epilogue_hook="s3_unmount $epilogue_hook"
diff --git a/list.in b/list.in
index 1452a9d..4198d3c 100644
--- a/list.in
+++ b/list.in
@@ -1,9 +1,9 @@
 #! /bin/sh
 # This file is part of BEAM
-# Copyright (C) 2012 Sergey Poznyakoff
+# Copyright (C) 2012-2014 Sergey Poznyakoff
 #
 # BEAM 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 3, or (at your option)
 # any later version.
 #
diff --git a/restore.in b/restore.in
index c1dc0c6..8618e2d 100644
--- a/restore.in
+++ b/restore.in
diff --git a/s3.in b/s3.in
index e4d838f..3d9f2c5 100644
--- a/s3.in
+++ b/s3.in
@@ -1,9 +1,9 @@
 #! /bin/sh
 # This file is part of BEAM
-# Copyright (C) 2012 Sergey Poznyakoff
+# Copyright (C) 2012-2014 Sergey Poznyakoff
 #
 # BEAM 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 3, or (at your option)
 # any later version.
 #