mirror of
https://https.git.savannah.gnu.org/git/tar.git
synced 2026-01-26 08:07:53 +00:00
Omit trailing white space and empty lines
This commit is contained in:
parent
8ba9e244e8
commit
aec5d77437
@ -56,15 +56,3 @@ s/inadvertantly/inadvertently/
|
||||
|
||||
4dfcd6c054a5e9e1a371c822a3be90564dd9b690
|
||||
s/succesfully/successfully/
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ documentation files in various formats. If the doc/manual directory
|
||||
already exists, it will be removed prior to rebuilding.
|
||||
|
||||
The command produces very copious output. We advise you to examine it
|
||||
closely to make sure no error messages slip your attention.
|
||||
closely to make sure no error messages slip your attention.
|
||||
|
||||
For the completeness sake, there are two more Makefile goals related
|
||||
to the online manual:
|
||||
@ -55,7 +55,7 @@ before publishing:
|
||||
To publish the created manual, change to the tar top-level directory
|
||||
and run:
|
||||
|
||||
rsync -avz --exclude CVS --delete manual ~/websrc/tar
|
||||
rsync -avz --exclude CVS --delete manual ~/websrc/tar
|
||||
|
||||
This will synchronize the newly created manual pages with the content
|
||||
of the CVS sandbox. Then, change to the ~/websrc/tar directory and
|
||||
@ -67,7 +67,7 @@ to the repository:
|
||||
|
||||
Then commit your changes:
|
||||
|
||||
cvs commit
|
||||
cvs commit
|
||||
|
||||
Once the changes are committed to CVS a job is scheduled on the server,
|
||||
which synchronizes them with the content of the directory served by
|
||||
|
||||
@ -127,7 +127,7 @@ foo/bar/file
|
||||
@end example
|
||||
|
||||
Supposing its name is @file{file.list} and the script is named
|
||||
@file{restore.sh}, you can invoke it as follows:
|
||||
@file{restore.sh}, you can invoke it as follows:
|
||||
|
||||
@example
|
||||
# @kbd{sh restore.sh A.tar file.list}
|
||||
|
||||
@ -11,7 +11,7 @@ used to determine which files were modified since the last backup.
|
||||
|
||||
@GNUTAR{} version @value{VERSION} supports three snapshot file
|
||||
formats. The first format, called @dfn{format 0}, is the one used by
|
||||
@GNUTAR{} versions up to and including 1.15.1. The second format, called
|
||||
@GNUTAR{} versions up to and including 1.15.1. The second format, called
|
||||
@dfn{format 1} is an extended version of this format, that contains more
|
||||
metadata and allows for further extensions. It was used by alpha release
|
||||
version 1.15.90. For alpha version 1.15.91 and stable releases
|
||||
@ -42,7 +42,7 @@ where:
|
||||
@table @var
|
||||
@item nfs
|
||||
A single plus character (@samp{+}), if this directory is located on
|
||||
an @acronym{NFS}-mounted partition, otherwise empty.
|
||||
an @acronym{NFS}-mounted partition, otherwise empty.
|
||||
|
||||
(That is, for non-NFS directories, the first character on the
|
||||
description line contains the start of the @var{dev} field.)
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
kernel version, reconfiguring your hardware, loading kernel modules in a
|
||||
different order, using virtual volumes that are assembled dynamically
|
||||
(such as with @acronym{LVM} or @acronym{RAID}), hot-plugging drives
|
||||
(e.g. external USB or Firewire drives), etc. In the majority of
|
||||
(e.g. external USB or Firewire drives), etc. In the majority of
|
||||
cases this change is unnoticed by the users. However, it influences
|
||||
@command{tar} incremental backups: the device number is stored in tar
|
||||
snapshot files (@pxref{Snapshot Files}) and is used to determine whether
|
||||
@ -35,7 +35,7 @@ $ @kbd{tar-snapshot-edit @var{snapfile}}
|
||||
|
||||
@noindent
|
||||
where @var{snapfile} is the name of the snapshot file (you can supply as many
|
||||
files as you wish in a single command line). You can then compare the
|
||||
files as you wish in a single command line). You can then compare the
|
||||
numbers across snapshot files, or against those currently in use on the
|
||||
live filesystem (using @command{ls -l} or @command{stat}).
|
||||
|
||||
@ -44,7 +44,7 @@ to simply tell @GNUTAR{} to ignore the device number when processing the
|
||||
incremental snapshot files for these backups, using the
|
||||
@option{--no-check-device} option (@pxref{device numbers}).
|
||||
|
||||
Alternatively, you can use the @command{tar-edit-snapshot} script's
|
||||
Alternatively, you can use the @command{tar-edit-snapshot} script's
|
||||
@option{-r} option to update all occurrences of the given device
|
||||
number in the snapshot file(s). It takes a single argument
|
||||
of the form
|
||||
|
||||
@ -158,7 +158,7 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
|
||||
if ! $MT_BEGIN "${TAPE_FILE}"; then
|
||||
echo >&2 "$0: tape initialization failed"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
rm -f "${VOLNO_FILE}"
|
||||
|
||||
message 1 "processing backup directories"
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
# * when printing the list of device ids found in the snapshot file
|
||||
# (when run in the default mode), print the raw device id values
|
||||
# instead of the hex-string version in those cases where they
|
||||
# can't be converted successfully.
|
||||
# can't be converted successfully.
|
||||
|
||||
use Getopt::Std;
|
||||
use Config;
|
||||
@ -236,13 +236,13 @@ sub show_device_counts ($) {
|
||||
# negative. (If it's negative, the conversion to an unsigned
|
||||
# integer for the "%x" specifier will mean the result will
|
||||
# always trigger hex()'s warning on a 64-bit machine.)
|
||||
#
|
||||
#
|
||||
# These situations don't seem to occur very often, so for now
|
||||
# when they do occur, we simply print the original text value
|
||||
# that was read from the snapshot file; it will look a bit
|
||||
# funny next to the values that do print in hex, but that's
|
||||
# preferable to printing values that aren't actually correct.
|
||||
$devstr = $dev;
|
||||
$devstr = $dev;
|
||||
}
|
||||
printf " Device %s occurs $devices{$dev} times.\n", $devstr;
|
||||
}
|
||||
@ -263,7 +263,7 @@ sub show_device_counts ($) {
|
||||
# array defined below should match those calculations. (For tar v1.27
|
||||
# and later, the valid ranges for a particular tar binary can easily
|
||||
# be determined using the "tar --show-snapshot-field-ranges" command.)
|
||||
|
||||
|
||||
sub choose_architecture ($) {
|
||||
my $opt_a = shift;
|
||||
|
||||
@ -307,7 +307,7 @@ sub choose_architecture ($) {
|
||||
print "Unrecognized architecture \"$arch\"; defaulting to \"iX86-linux\".\n";
|
||||
print "(Use -a option to override.)\n" unless $opt_a;
|
||||
print "\n";
|
||||
}
|
||||
}
|
||||
|
||||
if ( ref(1) ne "" ) {
|
||||
print "(\"bignum\" mode is in effect; skipping 64-bit-integer check.)\n\n"
|
||||
@ -317,10 +317,10 @@ sub choose_architecture ($) {
|
||||
for $v (values %snapshot_field_ranges ) {
|
||||
$maxmax = $v->[1] if ($v->[1] > $maxmax);
|
||||
}
|
||||
|
||||
|
||||
# "~0" translates into a platform-native integer with all bits turned
|
||||
# on -- that is, the largest value that can be represented as
|
||||
# an integer. We print a warning if our $maxmax value is greater
|
||||
# an integer. We print a warning if our $maxmax value is greater
|
||||
# than that largest integer, since in that case Perl will switch
|
||||
# to using floats for those large max values. The wording of
|
||||
# the message assumes that the only way this situation can exist
|
||||
@ -342,11 +342,11 @@ Note: this version of Perl uses 32-bit integers, which means that it
|
||||
EOF
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
# returns a warning message if $field_value isn't a valid string
|
||||
# returns a warning message if $field_value isn't a valid string
|
||||
# representation of an integer, or if the resulting integer is out of range
|
||||
# defined by the two-element array retrieved using up the $field_name key in
|
||||
# the global %snapshot_field_ranges hash.
|
||||
@ -382,8 +382,8 @@ sub validate_integer_field ($$) {
|
||||
# other two were introduced in v1.27.)
|
||||
#
|
||||
# The checks here are intended to match those found in the incremen.c
|
||||
# source file. See the choose_architecture() function (above) for more
|
||||
# information on how to configure the range of values considered valid
|
||||
# source file. See the choose_architecture() function (above) for more
|
||||
# information on how to configure the range of values considered valid
|
||||
# by this script.
|
||||
#
|
||||
# (Note: the checks here are taken from the code that processes
|
||||
@ -602,16 +602,16 @@ Usage:
|
||||
that would cause \"tar\" to abort with an error message such as
|
||||
Unexpected field value in snapshot file
|
||||
Numerical result out of range
|
||||
or
|
||||
or
|
||||
Invalid argument
|
||||
as it processed the snapshot file.)
|
||||
|
||||
Normally the program automatically chooses the valid ranges for
|
||||
the fields based on the current system's architecture, but the
|
||||
-a option can be used to override the selection, e.g. in order
|
||||
Normally the program automatically chooses the valid ranges for
|
||||
the fields based on the current system's architecture, but the
|
||||
-a option can be used to override the selection, e.g. in order
|
||||
to validate a snapshot file generated on a some other system.
|
||||
(Currently only three architectures are supported, "iX86-linux",
|
||||
"x86_64-linux", and "IA64.ARCHREV_0" [HP/UX running on Itanium/ia64],
|
||||
"x86_64-linux", and "IA64.ARCHREV_0" [HP/UX running on Itanium/ia64],
|
||||
and if the current system isn't recognized, then the iX86-linux
|
||||
values are used by default.)
|
||||
|
||||
|
||||
@ -43,4 +43,3 @@ dir/file1
|
||||
dir/file2
|
||||
])
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -43,4 +43,3 @@ dir/file1
|
||||
dir/file2
|
||||
])
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -43,4 +43,3 @@ file4
|
||||
],[],[],[],[ustar])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@ b
|
||||
tar cf archive -T empty -T valid
|
||||
tar tf archive
|
||||
echo "=="
|
||||
tar cf archive -T valid -T empty
|
||||
tar cf archive -T valid -T empty
|
||||
tar tf archive
|
||||
],
|
||||
[0],
|
||||
|
||||
@ -92,5 +92,3 @@ resulting archive
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
|
||||
@ -61,4 +61,3 @@ mkexcltest() {
|
||||
genfile --file=$1/subdir/excludeme
|
||||
genfile --file=$1/subdir/subdir-file
|
||||
}
|
||||
|
||||
|
||||
@ -21,4 +21,3 @@ tar --checkpoint-action=dot --checkpoint=2 -c -f ../a.tar .
|
||||
[],
|
||||
[.....])
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -21,4 +21,3 @@ tar --checkpoint-action=dot -c -f ../a.tar .
|
||||
[],
|
||||
[.])
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -36,4 +36,3 @@ exit $rc
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -32,4 +32,3 @@ tar df a.tar
|
||||
[],
|
||||
[],[],[ustar]) # Testing one format is enough
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -64,4 +64,3 @@ tar: dir/sub: File removed before we read it
|
||||
],[],[],[gnu,posix])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -58,4 +58,3 @@ tar: Exiting with failure status due to previous errors
|
||||
],[],[],[gnu,posix])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -51,4 +51,3 @@ etest/top-level-file
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
# References: <20120528140419.GT2654@shire.ontko.com>,
|
||||
# <20130311210006.GA3732@shire.ontko.com>,
|
||||
# http://lists.gnu.org/archive/html/bug-tar/2012-06/msg00013.html
|
||||
|
||||
|
||||
AT_SETUP([--exclude-tag option and --listed-incremental])
|
||||
AT_KEYWORDS([exclude exclude-tag listed incremental exclude09])
|
||||
|
||||
@ -54,4 +54,3 @@ tar: etest/subdir: contains a cache directory tag excludeme; contents not dumped
|
||||
],[],[],[gnu])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -70,4 +70,3 @@ tar: etest/subdir: contains a cache directory tag excludeme; contents not dumped
|
||||
],[],[],[gnu])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -50,4 +50,3 @@ etest/top-level-file
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -53,4 +53,3 @@ tar: etest/subdir: contains a cache directory tag excludeme; contents not dumped
|
||||
],[],[],[gnu])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -70,4 +70,3 @@ tar: etest/subdir: contains a cache directory tag excludeme; contents not dumped
|
||||
],[],[],[gnu])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -49,4 +49,3 @@ etest/top-level-file
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -51,4 +51,3 @@ tar: etest/subdir: contains a cache directory tag excludeme; directory not dumpe
|
||||
],[],[],[gnu])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -68,4 +68,3 @@ tar: etest/subdir: contains a cache directory tag excludeme; directory not dumpe
|
||||
],[],[],[gnu])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -43,5 +43,3 @@ dir/subdir/file2.ext
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
|
||||
@ -39,5 +39,3 @@ dir/subdir/
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
|
||||
@ -74,7 +74,7 @@ done
|
||||
|
||||
# Test if it is possible to limit the number of file descriptors to 10.
|
||||
( ulimit -n 10 ) >/dev/null 2>&1 || AT_SKIP_TEST
|
||||
|
||||
|
||||
# Tar should work when there are few, but enough, file descriptors.
|
||||
( (exec 3<&- 4<&- 5<&- 6<&- 7<&- 8<&- 9<&- &&
|
||||
ulimit -n 10 &&
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
# Reported by: Doug McLaren <dougmc@frenzied.us>,
|
||||
# Gary Partis <gary@partis.co.uk>,
|
||||
# Jim Meyering <jim@meyering.net>
|
||||
#
|
||||
#
|
||||
# References: <20111117045433.GA8245@algol.frenzied.us>,
|
||||
# <4F3D824717847C4487F77228F83329A3514CBB@server.Partis.local>,
|
||||
# <87wrar6zzz.fsf@rho.meyering.net>
|
||||
@ -59,4 +59,3 @@ tar: Exiting with failure status due to previous errors
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -43,4 +43,3 @@ File a
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -148,4 +148,3 @@ tar: Exiting with failure status due to previous errors
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -55,5 +55,3 @@ a/c/A
|
||||
[],[],[],[ustar]) # Testing one format is enough
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
|
||||
@ -40,7 +40,3 @@ tar xv --keep-newer-files -f a.tar -C ext
|
||||
./file
|
||||
])
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -42,5 +42,3 @@ dir/two
|
||||
700
|
||||
])
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
|
||||
@ -31,10 +31,10 @@ mkdir in
|
||||
mkdir in/dir
|
||||
decho Level 0
|
||||
tar -cvf 1.tar -g snap -C in .
|
||||
rmdir in/dir
|
||||
rmdir in/dir
|
||||
decho Level 1
|
||||
tar -cvf 2.tar -g snap -C in .
|
||||
cp 1.tar full.tar
|
||||
cp 1.tar full.tar
|
||||
decho Concat
|
||||
tar -A 2.tar -f full.tar -g /dev/null
|
||||
decho Extract
|
||||
|
||||
@ -45,7 +45,7 @@ tar --owner-map=uid.map\
|
||||
|
||||
tar -tvf 1.tar
|
||||
tar --numeric-owner -tvf 1.tar
|
||||
|
||||
|
||||
> uid.map
|
||||
> gid.map
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
#
|
||||
# This test case also checks that GNUFileParts headers are not displayed in
|
||||
# verbose mode.
|
||||
#
|
||||
#
|
||||
# Reported by: <russiangolem@gmail.com>
|
||||
# References:
|
||||
# <CAE7Kiz_0oMqGdzkoh0FbOd=hUoPhtHHYhjZveM_4hEku081QFQ@mail.gmail.com>,
|
||||
|
||||
@ -31,4 +31,3 @@ Try 'tar --help' or 'tar --usage' for more information.
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -31,4 +31,3 @@ Try 'tar --help' or 'tar --usage' for more information.
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -31,4 +31,3 @@ Try 'tar --help' or 'tar --usage' for more information.
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -35,4 +35,3 @@ Try 'tar --help' or 'tar --usage' for more information.
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -31,4 +31,3 @@ Try 'tar --help' or 'tar --usage' for more information.
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -33,4 +33,3 @@ Try 'tar --help' or 'tar --usage' for more information.
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -51,4 +51,3 @@ tar: Exiting with failure status due to previous errors
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -44,4 +44,3 @@ tar: Exiting with failure status due to previous errors
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#
|
||||
# (This specific case failed during development of tar 1.26.90:
|
||||
# There was a leftover call to chdir in name_next_elt() in
|
||||
# tar 1.26. After commit e3d28d84 this call would confuse the
|
||||
# tar 1.26. After commit e3d28d84 this call would confuse the
|
||||
# tar_getcwd function.
|
||||
#
|
||||
# Reported by: Nathan Stratton Treadway <nathanst@ontko.com>
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#
|
||||
# The bug has been assigned id CVE-2018-20482 (on the grounds that it is a
|
||||
# denial of service possibility).
|
||||
#
|
||||
#
|
||||
# Reported by: Chris Siebenmann <cks.gnutar-01@cs.toronto.edu>
|
||||
# References: <20181226223948.781EB32008E@apps1.cs.toronto.edu>,
|
||||
# <http://lists.gnu.org/archive/html/bug-tar/2018-12/msg00023.html>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# While fixing CVE-2018-20482 (see sptrcreat.at) it has been discovered
|
||||
# that similar bug exists in file checking code (tar d).
|
||||
# that similar bug exists in file checking code (tar d).
|
||||
# This test case checks if tar correctly handles a short read condition
|
||||
# appearing in check_sparse_region.
|
||||
|
||||
@ -35,7 +35,7 @@ echo creating
|
||||
tar --sparse -vcf bar foo baz
|
||||
echo comparing
|
||||
genfile --run --checkpoint 3 --length 200m --truncate foo -- \
|
||||
tar --sparse -vdf bar
|
||||
tar --sparse -vdf bar
|
||||
],
|
||||
[1],
|
||||
[creating
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# While fixing CVE-2018-20482 (see sptrcreat.at) it has been discovered
|
||||
# that similar bug exists in file checking code (tar d).
|
||||
# that similar bug exists in file checking code (tar d).
|
||||
# This test case checks if tar correctly handles a short read condition
|
||||
# appearing in check_data_region.
|
||||
|
||||
@ -35,7 +35,7 @@ echo creating
|
||||
tar --sparse -vcf bar foo baz
|
||||
echo comparing
|
||||
genfile --run --checkpoint 5 --length 221278210 --truncate foo -- \
|
||||
tar --sparse -vdf bar
|
||||
tar --sparse -vdf bar
|
||||
],
|
||||
[1],
|
||||
[creating
|
||||
|
||||
@ -51,6 +51,3 @@ tar: Exiting with failure status due to previous errors
|
||||
])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
|
||||
|
||||
@ -38,6 +38,3 @@ file
|
||||
[],[],[],[gnu])
|
||||
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
|
||||
|
||||
@ -38,4 +38,3 @@ find t -type f
|
||||
],
|
||||
[stderr])])
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user