From aec5d774379fff1c60bf08209e59ed1f40fb1d43 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 13 Nov 2025 17:13:35 -0800 Subject: [PATCH] Omit trailing white space and empty lines --- ChangeLog.amend | 12 ------------ doc/README.manual | 6 +++--- doc/recipes.texi | 2 +- doc/snapshot.texi | 4 ++-- doc/tar-snapshot-edit.texi | 6 +++--- scripts/backup.in | 2 +- scripts/tar-snapshot-edit | 32 ++++++++++++++++---------------- tests/T-dir00.at | 1 - tests/T-dir01.at | 1 - tests/T-mult.at | 1 - tests/T-zfile.at | 2 +- tests/append05.at | 2 -- tests/atlocal.in | 1 - tests/checkpoint/dot-int.at | 1 - tests/checkpoint/dot.at | 1 - tests/comperr.at | 1 - tests/difflink.at | 1 - tests/dirrem01.at | 1 - tests/dirrem02.at | 1 - tests/exclude08.at | 1 - tests/exclude09.at | 3 +-- tests/exclude10.at | 1 - tests/exclude11.at | 1 - tests/exclude12.at | 1 - tests/exclude13.at | 1 - tests/exclude14.at | 1 - tests/exclude15.at | 1 - tests/exclude16.at | 1 - tests/exclude19.at | 2 -- tests/exclude20.at | 2 -- tests/extrac11.at | 2 +- tests/extrac18.at | 3 +-- tests/extrac19.at | 1 - tests/extrac20.at | 1 - tests/extrac21.at | 2 -- tests/extrac27.at | 4 ---- tests/extrac28.at | 2 -- tests/incr10.at | 4 ++-- tests/map.at | 2 +- tests/multiv10.at | 2 +- tests/opcomp01.at | 1 - tests/opcomp02.at | 1 - tests/opcomp03.at | 1 - tests/opcomp04.at | 1 - tests/opcomp05.at | 1 - tests/opcomp06.at | 1 - tests/positional01.at | 1 - tests/positional03.at | 1 - tests/remfiles05a.at | 2 +- tests/sptrcreat.at | 2 +- tests/sptrdiff00.at | 4 ++-- tests/sptrdiff01.at | 4 ++-- tests/update04.at | 3 --- tests/xform01.at | 3 --- tests/xform03.at | 1 - 55 files changed, 40 insertions(+), 103 deletions(-) diff --git a/ChangeLog.amend b/ChangeLog.amend index b3c84d96..51982615 100644 --- a/ChangeLog.amend +++ b/ChangeLog.amend @@ -56,15 +56,3 @@ s/inadvertantly/inadvertently/ 4dfcd6c054a5e9e1a371c822a3be90564dd9b690 s/succesfully/successfully/ - - - - - - - - - - - - diff --git a/doc/README.manual b/doc/README.manual index b75e9134..319a185b 100644 --- a/doc/README.manual +++ b/doc/README.manual @@ -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 diff --git a/doc/recipes.texi b/doc/recipes.texi index a9ea10a5..38196767 100644 --- a/doc/recipes.texi +++ b/doc/recipes.texi @@ -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} diff --git a/doc/snapshot.texi b/doc/snapshot.texi index 525083c7..a18e947f 100644 --- a/doc/snapshot.texi +++ b/doc/snapshot.texi @@ -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.) diff --git a/doc/tar-snapshot-edit.texi b/doc/tar-snapshot-edit.texi index d8295087..1210ecb0 100644 --- a/doc/tar-snapshot-edit.texi +++ b/doc/tar-snapshot-edit.texi @@ -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 diff --git a/scripts/backup.in b/scripts/backup.in index 027e82dd..5503b5be 100644 --- a/scripts/backup.in +++ b/scripts/backup.in @@ -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" diff --git a/scripts/tar-snapshot-edit b/scripts/tar-snapshot-edit index 533e84b0..c20ccaeb 100755 --- a/scripts/tar-snapshot-edit +++ b/scripts/tar-snapshot-edit @@ -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.) diff --git a/tests/T-dir00.at b/tests/T-dir00.at index 49a94a07..ee9b179e 100644 --- a/tests/T-dir00.at +++ b/tests/T-dir00.at @@ -43,4 +43,3 @@ dir/file1 dir/file2 ]) AT_CLEANUP - diff --git a/tests/T-dir01.at b/tests/T-dir01.at index 008af7d3..634bf7a1 100644 --- a/tests/T-dir01.at +++ b/tests/T-dir01.at @@ -43,4 +43,3 @@ dir/file1 dir/file2 ]) AT_CLEANUP - diff --git a/tests/T-mult.at b/tests/T-mult.at index a9de38c7..dfb09554 100644 --- a/tests/T-mult.at +++ b/tests/T-mult.at @@ -43,4 +43,3 @@ file4 ],[],[],[],[ustar]) AT_CLEANUP - diff --git a/tests/T-zfile.at b/tests/T-zfile.at index 77b18d9d..f1c2528f 100644 --- a/tests/T-zfile.at +++ b/tests/T-zfile.at @@ -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], diff --git a/tests/append05.at b/tests/append05.at index f8d2262e..63d1edca 100644 --- a/tests/append05.at +++ b/tests/append05.at @@ -92,5 +92,3 @@ resulting archive ]) AT_CLEANUP - - diff --git a/tests/atlocal.in b/tests/atlocal.in index ca5db754..2db9f1e8 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -61,4 +61,3 @@ mkexcltest() { genfile --file=$1/subdir/excludeme genfile --file=$1/subdir/subdir-file } - diff --git a/tests/checkpoint/dot-int.at b/tests/checkpoint/dot-int.at index 5b346b66..ee13240b 100644 --- a/tests/checkpoint/dot-int.at +++ b/tests/checkpoint/dot-int.at @@ -21,4 +21,3 @@ tar --checkpoint-action=dot --checkpoint=2 -c -f ../a.tar . [], [.....]) AT_CLEANUP - diff --git a/tests/checkpoint/dot.at b/tests/checkpoint/dot.at index 6cfffd00..81cc3bd0 100644 --- a/tests/checkpoint/dot.at +++ b/tests/checkpoint/dot.at @@ -21,4 +21,3 @@ tar --checkpoint-action=dot -c -f ../a.tar . [], [.]) AT_CLEANUP - diff --git a/tests/comperr.at b/tests/comperr.at index 690d02c3..63b32baf 100644 --- a/tests/comperr.at +++ b/tests/comperr.at @@ -36,4 +36,3 @@ exit $rc ]) AT_CLEANUP - diff --git a/tests/difflink.at b/tests/difflink.at index 2d41a7b0..7a9805f9 100644 --- a/tests/difflink.at +++ b/tests/difflink.at @@ -32,4 +32,3 @@ tar df a.tar [], [],[],[ustar]) # Testing one format is enough AT_CLEANUP - diff --git a/tests/dirrem01.at b/tests/dirrem01.at index 69ab9237..531b0dfa 100644 --- a/tests/dirrem01.at +++ b/tests/dirrem01.at @@ -64,4 +64,3 @@ tar: dir/sub: File removed before we read it ],[],[],[gnu,posix]) AT_CLEANUP - diff --git a/tests/dirrem02.at b/tests/dirrem02.at index 0a4565e3..891b0fe8 100644 --- a/tests/dirrem02.at +++ b/tests/dirrem02.at @@ -58,4 +58,3 @@ tar: Exiting with failure status due to previous errors ],[],[],[gnu,posix]) AT_CLEANUP - diff --git a/tests/exclude08.at b/tests/exclude08.at index ee04dda0..f598cdb2 100644 --- a/tests/exclude08.at +++ b/tests/exclude08.at @@ -51,4 +51,3 @@ etest/top-level-file ]) AT_CLEANUP - diff --git a/tests/exclude09.at b/tests/exclude09.at index 0b7eb81d..9a9c5d63 100644 --- a/tests/exclude09.at +++ b/tests/exclude09.at @@ -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 - diff --git a/tests/exclude10.at b/tests/exclude10.at index d7bdec64..619dc965 100644 --- a/tests/exclude10.at +++ b/tests/exclude10.at @@ -70,4 +70,3 @@ tar: etest/subdir: contains a cache directory tag excludeme; contents not dumped ],[],[],[gnu]) AT_CLEANUP - diff --git a/tests/exclude11.at b/tests/exclude11.at index 00eb6868..92a66d1e 100644 --- a/tests/exclude11.at +++ b/tests/exclude11.at @@ -50,4 +50,3 @@ etest/top-level-file ]) AT_CLEANUP - diff --git a/tests/exclude12.at b/tests/exclude12.at index 21d49b7f..197e22ef 100644 --- a/tests/exclude12.at +++ b/tests/exclude12.at @@ -53,4 +53,3 @@ tar: etest/subdir: contains a cache directory tag excludeme; contents not dumped ],[],[],[gnu]) AT_CLEANUP - diff --git a/tests/exclude13.at b/tests/exclude13.at index 4e29a488..b25e3d55 100644 --- a/tests/exclude13.at +++ b/tests/exclude13.at @@ -70,4 +70,3 @@ tar: etest/subdir: contains a cache directory tag excludeme; contents not dumped ],[],[],[gnu]) AT_CLEANUP - diff --git a/tests/exclude14.at b/tests/exclude14.at index 447dee2a..ad742e4a 100644 --- a/tests/exclude14.at +++ b/tests/exclude14.at @@ -49,4 +49,3 @@ etest/top-level-file ]) AT_CLEANUP - diff --git a/tests/exclude15.at b/tests/exclude15.at index c571a50d..0726cd38 100644 --- a/tests/exclude15.at +++ b/tests/exclude15.at @@ -51,4 +51,3 @@ tar: etest/subdir: contains a cache directory tag excludeme; directory not dumpe ],[],[],[gnu]) AT_CLEANUP - diff --git a/tests/exclude16.at b/tests/exclude16.at index 4e83fb56..26732b81 100644 --- a/tests/exclude16.at +++ b/tests/exclude16.at @@ -68,4 +68,3 @@ tar: etest/subdir: contains a cache directory tag excludeme; directory not dumpe ],[],[],[gnu]) AT_CLEANUP - diff --git a/tests/exclude19.at b/tests/exclude19.at index e2812312..58d05457 100644 --- a/tests/exclude19.at +++ b/tests/exclude19.at @@ -43,5 +43,3 @@ dir/subdir/file2.ext ]) AT_CLEANUP - - diff --git a/tests/exclude20.at b/tests/exclude20.at index 4a3ea6d0..5d109fc9 100644 --- a/tests/exclude20.at +++ b/tests/exclude20.at @@ -39,5 +39,3 @@ dir/subdir/ ]) AT_CLEANUP - - diff --git a/tests/extrac11.at b/tests/extrac11.at index dbd594ea..82a0c7eb 100644 --- a/tests/extrac11.at +++ b/tests/extrac11.at @@ -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 && diff --git a/tests/extrac18.at b/tests/extrac18.at index 1b818bbb..9eed9555 100644 --- a/tests/extrac18.at +++ b/tests/extrac18.at @@ -26,7 +26,7 @@ # Reported by: Doug McLaren , # Gary Partis , # Jim Meyering -# +# # 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 - diff --git a/tests/extrac19.at b/tests/extrac19.at index 8c17414b..194d49bf 100644 --- a/tests/extrac19.at +++ b/tests/extrac19.at @@ -43,4 +43,3 @@ File a ]) AT_CLEANUP - diff --git a/tests/extrac20.at b/tests/extrac20.at index a2b44ac9..91ccf3d0 100644 --- a/tests/extrac20.at +++ b/tests/extrac20.at @@ -148,4 +148,3 @@ tar: Exiting with failure status due to previous errors ]) AT_CLEANUP - diff --git a/tests/extrac21.at b/tests/extrac21.at index c7565912..0d993888 100644 --- a/tests/extrac21.at +++ b/tests/extrac21.at @@ -55,5 +55,3 @@ a/c/A [],[],[],[ustar]) # Testing one format is enough AT_CLEANUP - - diff --git a/tests/extrac27.at b/tests/extrac27.at index 8a73cd27..4ac0f72d 100644 --- a/tests/extrac27.at +++ b/tests/extrac27.at @@ -40,7 +40,3 @@ tar xv --keep-newer-files -f a.tar -C ext ./file ]) AT_CLEANUP - - - - diff --git a/tests/extrac28.at b/tests/extrac28.at index cecbd355..014ca806 100644 --- a/tests/extrac28.at +++ b/tests/extrac28.at @@ -42,5 +42,3 @@ dir/two 700 ]) AT_CLEANUP - - diff --git a/tests/incr10.at b/tests/incr10.at index 9ef3feca..0c2c7413 100644 --- a/tests/incr10.at +++ b/tests/incr10.at @@ -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 diff --git a/tests/map.at b/tests/map.at index 59370a0a..eaae0b5f 100644 --- a/tests/map.at +++ b/tests/map.at @@ -45,7 +45,7 @@ tar --owner-map=uid.map\ tar -tvf 1.tar tar --numeric-owner -tvf 1.tar - + > uid.map > gid.map diff --git a/tests/multiv10.at b/tests/multiv10.at index 8c7cd1ff..9a6279a4 100644 --- a/tests/multiv10.at +++ b/tests/multiv10.at @@ -27,7 +27,7 @@ # # This test case also checks that GNUFileParts headers are not displayed in # verbose mode. -# +# # Reported by: # References: # , diff --git a/tests/opcomp01.at b/tests/opcomp01.at index dfb899ed..3f0c0e19 100644 --- a/tests/opcomp01.at +++ b/tests/opcomp01.at @@ -31,4 +31,3 @@ Try 'tar --help' or 'tar --usage' for more information. ]) AT_CLEANUP - diff --git a/tests/opcomp02.at b/tests/opcomp02.at index 20e492d5..5c181a53 100644 --- a/tests/opcomp02.at +++ b/tests/opcomp02.at @@ -31,4 +31,3 @@ Try 'tar --help' or 'tar --usage' for more information. ]) AT_CLEANUP - diff --git a/tests/opcomp03.at b/tests/opcomp03.at index 09723728..8aad28ff 100644 --- a/tests/opcomp03.at +++ b/tests/opcomp03.at @@ -31,4 +31,3 @@ Try 'tar --help' or 'tar --usage' for more information. ]) AT_CLEANUP - diff --git a/tests/opcomp04.at b/tests/opcomp04.at index 0cfd7163..5541fdc7 100644 --- a/tests/opcomp04.at +++ b/tests/opcomp04.at @@ -35,4 +35,3 @@ Try 'tar --help' or 'tar --usage' for more information. ]) AT_CLEANUP - diff --git a/tests/opcomp05.at b/tests/opcomp05.at index bf679493..cbf1d8c9 100644 --- a/tests/opcomp05.at +++ b/tests/opcomp05.at @@ -31,4 +31,3 @@ Try 'tar --help' or 'tar --usage' for more information. ]) AT_CLEANUP - diff --git a/tests/opcomp06.at b/tests/opcomp06.at index 8624f09d..6608157b 100644 --- a/tests/opcomp06.at +++ b/tests/opcomp06.at @@ -33,4 +33,3 @@ Try 'tar --help' or 'tar --usage' for more information. ]) AT_CLEANUP - diff --git a/tests/positional01.at b/tests/positional01.at index a86ac137..9e505bf2 100644 --- a/tests/positional01.at +++ b/tests/positional01.at @@ -51,4 +51,3 @@ tar: Exiting with failure status due to previous errors ]) AT_CLEANUP - diff --git a/tests/positional03.at b/tests/positional03.at index 9d4cef3a..1df402d5 100644 --- a/tests/positional03.at +++ b/tests/positional03.at @@ -44,4 +44,3 @@ tar: Exiting with failure status due to previous errors ]) AT_CLEANUP - diff --git a/tests/remfiles05a.at b/tests/remfiles05a.at index cc4c6c52..9a1b68a1 100644 --- a/tests/remfiles05a.at +++ b/tests/remfiles05a.at @@ -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 diff --git a/tests/sptrcreat.at b/tests/sptrcreat.at index 246b17ea..f204f220 100644 --- a/tests/sptrcreat.at +++ b/tests/sptrcreat.at @@ -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 # References: <20181226223948.781EB32008E@apps1.cs.toronto.edu>, # diff --git a/tests/sptrdiff00.at b/tests/sptrdiff00.at index b0281cd5..7cb77a71 100644 --- a/tests/sptrdiff00.at +++ b/tests/sptrdiff00.at @@ -19,7 +19,7 @@ # along with this program. If not, see . # 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 diff --git a/tests/sptrdiff01.at b/tests/sptrdiff01.at index ff248384..d8c70890 100644 --- a/tests/sptrdiff01.at +++ b/tests/sptrdiff01.at @@ -19,7 +19,7 @@ # along with this program. If not, see . # 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 diff --git a/tests/update04.at b/tests/update04.at index d0c85935..7862926f 100644 --- a/tests/update04.at +++ b/tests/update04.at @@ -51,6 +51,3 @@ tar: Exiting with failure status due to previous errors ]) AT_CLEANUP - - - diff --git a/tests/xform01.at b/tests/xform01.at index dcadf0a9..15a8b9e4 100644 --- a/tests/xform01.at +++ b/tests/xform01.at @@ -38,6 +38,3 @@ file [],[],[],[gnu]) AT_CLEANUP - - - diff --git a/tests/xform03.at b/tests/xform03.at index 0512ad95..801b57f9 100644 --- a/tests/xform03.at +++ b/tests/xform03.at @@ -38,4 +38,3 @@ find t -type f ], [stderr])]) AT_CLEANUP - -- 2.47.3