tar: quote 'like this', not `like this'

This fixes some test failures recently introduced by gnulib updates
prompted by recent changes to the GNU coding standards,
which now advise to use quotes 'like this' or "like this"
rather than `like this'.
* NEWS: Document this.
* README, README-hacking, doc/Makefile.am, scripts/backup.in:
* scripts/backup.sh.in, scripts/dump-remind.in:
* src/buffer.c, src/checkpoint.c, src/create.c, src/incremen.c:
* src/misc.c, src/names.c, src/sparse.c, src/transform.c:
* tests/incr02.at, tests/incremental.at, tests/multiv08.at:
* tests/sparse04.at, tests/star/README, tests/update01.at:
Quote 'like this' in comments.
* src/tar.h:
Quote "like this" in comments, when quoting English phrases rather
than code.
* configure.ac:
* scripts/xsparse.c (get_var, read_xheader, main):
* src/compare.c (diff_archive):
* src/extract.c (prepare_to_extract):
* src/tar.c (request_stdin, tar_set_quoting_style, doc, options)
(set_subcommand_option, report_textual_dates, parse_opt)
(decode_options, main):
* src/xheader.c (decx):
Quote 'like this' in diagnostics.
* doc/tar.texi (list, warnings, override)
(Selecting Archive Members, quoting styles, after, hard links)
(Sparse Recovery, Multi-Volume Archives, label):
Adjust documentation to match new output.
* tests/backup01.at, tests/incr01.at, tests/incr04.at:
* tests/label04.at, tests/label05.at, tests/link03.at:
* tests/listed02.at, tests/multiv03.at, tests/multiv05.at:
* tests/rename01.at, tests/rename02.at, tests/rename03.at:
* tests/volume.at:
Adjust tests to match new quoting behavior.
This commit is contained in:
Paul Eggert
2012-01-18 00:14:40 -08:00
parent 6689e8db4f
commit debc485626
42 changed files with 267 additions and 260 deletions

View File

@@ -43,7 +43,7 @@ tar xfv test.tar --backup --warning=no-timestamp
[0],
[dir1/
dir1/file1
Renaming `dir1/file1' to `dir1/file1~'
Renaming 'dir1/file1' to 'dir1/file1~'
dir2/
])

View File

@@ -46,7 +46,7 @@ tar xvfg archive.1 /dev/null --warning=no-timestamp
directory/bar
separator
directory/
tar: Deleting `directory/bar'
tar: Deleting 'directory/bar'
],
[],[],[],[gnu, oldgnu, posix])

View File

@@ -50,9 +50,9 @@ genfile --stat=mtime dir/subdir1 > ts
# dir/subdir2/
# dir/subdir1/foofile
#
# When restoring from this directory structure, `dir/subdir2/' used to
# When restoring from this directory structure, 'dir/subdir2/' used to
# trigger apply_nonancestor_delayed_set_stat() which restored stats for
# `subdir1' prior to restoring `dir/subdir1/foofile'. Then, restoring the
# 'subdir1' prior to restoring 'dir/subdir1/foofile'. Then, restoring the
# latter clobbered the directory timestamp.
tar -cf archive -g db dir

View File

@@ -58,7 +58,7 @@ a/c/
],
[tar: a: Directory is new
tar: a/b: Directory is new
tar: a/c: Directory has been renamed from `a/b'
tar: a/c: Directory has been renamed from 'a/b'
],[],[],[gnu, oldgnu, posix])
AT_CLEANUP

View File

@@ -35,7 +35,7 @@ ls -l structure/file >/dev/null
# If the time of an initial backup and the creation time of a file contained
# in that backup are the same, the file will be backed up again when an
# incremental backup is done, because the incremental backup backs up
# files created `on or after' the initial backup time. Without the sleep
# files created "on or after" the initial backup time. Without the sleep
# command, behaviour of tar becomes variable, depending whether the system
# clock ticked over to the next second between creating the file and
# backing it up.

View File

@@ -43,7 +43,7 @@ tar -rf archive --label='New volume' file
],
[# Create volume
# Update: wrong label
tar: Volume `New volume' does not match `My volume'
tar: Volume 'New volume' does not match 'My volume'
tar: Error is not recoverable: exiting now
# Update: right label
],[],[],[gnu,oldgnu,posix])

View File

@@ -40,7 +40,7 @@ tar -rf archive file
],
[# Create volume
# Update: wrong label
tar: Archive not labeled to match `My volume'
tar: Archive not labeled to match 'My volume'
tar: Error is not recoverable: exiting now
# Update: right label
],[],[],[gnu,oldgnu,posix])

View File

@@ -48,7 +48,7 @@ testing archive.2
file1
file1
],
[tar: Missing links to `file1'.
[tar: Missing links to 'file1'.
])
AT_CLEANUP

View File

@@ -126,8 +126,8 @@ tart/c0/cq2
tart/c1/ca1
tart/c1/ca2
Extracting incremental archive
tar: Deleting `tart/a1'
tar: Deleting `tart/b1'
tar: Deleting 'tart/a1'
tar: Deleting 'tart/b1'
tart/
tart/b2
tart/c0/
@@ -149,7 +149,7 @@ tar: tart/c0: Directory is new
tar: tart/c1: Directory is new
tar: tart: Directory is new
Creating incremental archive
tar: tart/c2: Directory has been renamed from `tart/c1'
tar: tart/c2: Directory has been renamed from 'tart/c1'
Extracting main archive
],
[],[],[gnu, oldgnu])

View File

@@ -36,7 +36,7 @@ BFILE=`awk 'BEGIN { for (i = 0; i < 101; i++) printf "b"; exit; }'`
cat > ../experr <<EOF
tar: $BFILE: file name too long to be stored in a GNU multivolume header, truncated
tar: \`$BFILE' is possibly continued on this volume: header contains truncated name
tar: '$BFILE' is possibly continued on this volume: header contains truncated name
EOF
cat > ../expout <<EOF

View File

@@ -58,7 +58,7 @@ m4_foreach([file],
[Diffing file
])dnl
,
[tar: `trzy' is not continued on this volume
[tar: 'trzy' is not continued on this volume
],[],[], [gnu])
AT_CLEANUP

View File

@@ -17,7 +17,7 @@
# Description: Tar 1.23 would in some cases silently fail to create
# a continuation header in multivolume archives.
#
# In this testcase, the file `a' is 18.5 blocks long and the file `b'
# In this testcase, the file 'a' is 18.5 blocks long and the file 'b'
# is 19.5 blocks long.
AT_SETUP([multivolume header creation])

View File

@@ -81,7 +81,7 @@ End directory listing 2
],
[tar: foo: Directory is new
tar: foo/bar: Directory is new
tar: foo/baz: Directory has been renamed from `foo/bar'
tar: foo/baz: Directory has been renamed from 'foo/bar'
],
[],[],[gnu, oldgnu, posix])

View File

@@ -96,7 +96,7 @@ End directory listing 2
[tar: foo: Directory is new
tar: foo/bar: Directory is new
tar: foo/bar/baz: Directory is new
tar: foo/baz: Directory has been renamed from `foo/bar/baz'
tar: foo/baz: Directory has been renamed from 'foo/bar/baz'
],
[],[],[gnu, oldgnu, posix])

View File

@@ -118,9 +118,9 @@ tar: foo/b: Directory is new
tar: foo/c: Directory is new
tar: foo: Directory is new
Second dump
tar: foo/a: Directory has been renamed from `foo/c'
tar: foo/b: Directory has been renamed from `foo/a'
tar: foo/c: Directory has been renamed from `foo/b'
tar: foo/a: Directory has been renamed from 'foo/c'
tar: foo/b: Directory has been renamed from 'foo/a'
tar: foo/c: Directory has been renamed from 'foo/b'
],
[],[],[gnu, oldgnu, posix])

View File

@@ -23,7 +23,7 @@ AT_KEYWORDS([sparse sparse04])
# Description: Tar versions from 1.15.92 to 1.25 would incorrectly
# store sparse file names longer than 100 characters in pax mode.
# Namely, the `path' keyword of the produced PAX header would contain the
# Namely, the 'path' keyword of the produced PAX header would contain the
# crafted name of the header itself, instead of that of the file.
# Reported by: Kamil Dudka <kdudka@redhat.com>
# References: <201011250026.44908.kdudka@redhat.com>,

View File

@@ -3,7 +3,7 @@ star "test archives". The archives themselves can be obtained
from ftp://ftp.berlios.de/pub/star/testscripts.
These tests are disabled by default. There are two ways to run
them. The simplest is by `make check-full' command. It requires wget
them. The simplest is by 'make check-full' command. It requires wget
and GNU md5sum to be installed. If you don't have these utilities,
download the test archives manually and set the environment variable
STAR_TESTSCRIPTS to point to the directory where they reside, for
@@ -13,9 +13,9 @@ example:
or
make TESTS_ENVIRONMENT='STAR_TESTSCRIPTS=testdir' check
The file `quicktest.sh' is a separate test. It is never executed
within `make check' command, you will need to run it manually.
Please, carefully read section `quicktest.sh' below before running
The file 'quicktest.sh' is a separate test. It is never executed
within 'make check' command, you will need to run it manually.
Please, carefully read section 'quicktest.sh' below before running
it.
Following is a short description of the tests:
@@ -52,12 +52,12 @@ containing very large files (in this case -- 10 GB).
This is a test for compliance to POSIX.1-1990 tar specification. It
requires two files: ustar-all-quicktest.tar and quicktest.filelist,
(they usually reside in star/testscripts directory), and `tartest' program
(they usually reside in star/testscripts directory), and 'tartest' program
(also part of star distribution). The test must be run only with root
privileges, so it is a good idea to verify the contents of
ustar-all-quicktest.tar before running it.
If `tartest' is not in your PATH, use TARTEST variable to specify its
If 'tartest' is not in your PATH, use TARTEST variable to specify its
full file name. You may pass both STAR_TESTSCRIPTS and TARTEST
variables as command line arguments to quicktest.sh, as shown in
the example below:

View File

@@ -20,7 +20,7 @@
# Description: If dir is a directory and arc is a tar archive which
# contains that directory, and dir contains some modifications added
# after adding it to the archive, then `tar -u dir' would add dir/ to
# after adding it to the archive, then 'tar -u dir' would add dir/ to
# the archive.
# Last-Affected-Version: 1.22.90
# References: <4AD4E703.80500@teclabs.eu>

View File

@@ -43,13 +43,13 @@ test $? = 2
[0],
[],
[-----
tar: Volume `label' does not match `lab'
tar: Volume 'label' does not match 'lab'
tar: Error is not recoverable: exiting now
-----
tar: Volume `label' does not match `bel'
tar: Volume 'label' does not match 'bel'
tar: Error is not recoverable: exiting now
-----
tar: Volume `label' does not match `babel'
tar: Volume 'label' does not match 'babel'
tar: Error is not recoverable: exiting now
],
[],[],[gnu, oldgnu])