summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-01-18 00:14:40 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2012-01-18 00:25:23 -0800
commitdebc485626c0c143731b0ca229d18b48085bb2ef (patch)
tree6b50ccbcb28fcb16e5a0756c134ad8c9d8c47d4e /scripts
parent6689e8db4f53f6a0bed3d1bc4ed12d31eaa3bf51 (diff)
downloadtar-debc485626c0c143731b0ca229d18b48085bb2ef.tar.gz
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.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/backup.in4
-rw-r--r--scripts/backup.sh.in8
-rw-r--r--scripts/dump-remind.in6
-rw-r--r--scripts/xsparse.c12
4 files changed, 15 insertions, 15 deletions
diff --git a/scripts/backup.in b/scripts/backup.in
index 37bfed36..6bbd47c3 100644
--- a/scripts/backup.in
+++ b/scripts/backup.in
@@ -149,7 +149,7 @@ message 20 "BACKUP_DIRS=$BACKUP_DIRS"
message 20 "BACKUP_FILES=$BACKUP_FILES"
# The buch of commands below is run in a subshell for which all output is
-# piped through `tee' to the logfile. Doing this, instead of having
+# piped through 'tee' to the logfile. Doing this, instead of having
# multiple pipelines all over the place, is cleaner and allows access to
# the exit value from various commands more easily.
(
@@ -187,7 +187,7 @@ message 20 "BACKUP_FILES=$BACKUP_FILES"
"--label='`print_level` backup of ${fs} on ${remotehost} at ${NOW}'" \
-C ${fs} .
- # `rsh' doesn't exit with the exit status of the remote command. What
+ # 'rsh' doesn't exit with the exit status of the remote command. What
# stupid lossage. TODO: think of a reliable workaround.
if [ $? -ne 0 ] ; then
echo "Backup of ${1} failed." 1>&2
diff --git a/scripts/backup.sh.in b/scripts/backup.sh.in
index adcdfe2d..cd056269 100644
--- a/scripts/backup.sh.in
+++ b/scripts/backup.sh.in
@@ -48,7 +48,7 @@ MT_REWIND=mt_rewind
MT_OFFLINE=mt_offline
MT_STATUS=mt_status
-# Insure `mail' is in PATH.
+# Insure 'mail' is in PATH.
PATH="/usr/ucb:${PATH}"
export PATH
# Put startdate in the subject line of mailed report, since if it happens
@@ -211,8 +211,8 @@ init_backup() {
TAR_PART1="${TAR_PART1} --info-script='${DUMP_REMIND_SCRIPT}'"
fi
# Set logfile name
- # Logfile name should be in the form ``log-1993-03-18-level-0''
- # They go in the directory `@sysconfdir@/log'.
+ # Logfile name should be in the form 'log-1993-03-18-level-0'
+ # They go in the directory '@sysconfdir@/log'.
# i.e. year-month-date. This format is useful for sorting by name, since
# logfiles are intentionally kept online for future reference.
LOGFILE="${LOGPATH}/log-`now`-level-${DUMP_LEVEL}"
@@ -305,7 +305,7 @@ backup_host() {
if [ "z${localhost}" != "z$rhost" ] ; then
$RSH "$rhost" ${TAR_PART1} -f "${localhost}:${TAPE_FILE}" $@
else
- # Using `sh -c exec' causes nested quoting and shell substitution
+ # Using 'sh -c exec' causes nested quoting and shell substitution
# to be handled here in the same way rsh handles it.
CMD="exec ${TAR_PART1} -f \"${TAPE_FILE}\" $@"
message 10 "CMD: $CMD"
diff --git a/scripts/dump-remind.in b/scripts/dump-remind.in
index a3f013fe..f66271aa 100644
--- a/scripts/dump-remind.in
+++ b/scripts/dump-remind.in
@@ -9,7 +9,7 @@
# be put in the tape drive.
#
-# Include location of `sendmail' and GNU finger.
+# Include location of 'sendmail' and GNU finger.
PATH="/usr/lib:/usr/local/gnubin:${PATH}"
export PATH
@@ -25,8 +25,8 @@ MT_OFFLINE
# which users are logged into consoles (and thus in the office and capable
# of changing tapes).
#
-# Certain users (like `root') aren't real users, and shouldn't be notified.
-# Neither should `zippy', `elvis', etc. (on the GNU machines) since they're
+# Certain users (like 'root') aren't real users, and shouldn't be notified.
+# Neither should 'zippy', 'elvis', etc. (on the GNU machines) since they're
# just test accounts.
recipients="`
finger .clients 2> /dev/null \
diff --git a/scripts/xsparse.c b/scripts/xsparse.c
index 14d5658c..8f42c37b 100644
--- a/scripts/xsparse.c
+++ b/scripts/xsparse.c
@@ -164,7 +164,7 @@ get_var (FILE *fp, char **name, char **value)
p += 11;
q = strchr (p, '=');
if (!q)
- die (1, "malformed header: expected `=' not found");
+ die (1, "malformed header: expected '=' not found");
*q++ = 0;
q[strlen (q) - 1] = 0;
*name = p;
@@ -194,7 +194,7 @@ read_xheader (char *name)
printf ("Found variable GNU.sparse.%s = %s\n", kw, val);
if (expect && strcmp (kw, expect))
- die (1, "bad keyword sequence: expected `%s' but found `%s'",
+ die (1, "bad keyword sequence: expected '%s' but found '%s'",
expect, kw);
expect = NULL;
if (strcmp (kw, "name") == 0)
@@ -235,13 +235,13 @@ read_xheader (char *name)
{
sparse_map[i].offset = string_to_off (val, &val);
if (*val != ',')
- die (1, "bad GNU.sparse.map: expected `,' but found `%c'",
+ die (1, "bad GNU.sparse.map: expected ',' but found '%c'",
*val);
sparse_map[i].numbytes = string_to_off (val+1, &val);
if (*val != ',')
{
if (!(*val == 0 && i == sparse_map_size-1))
- die (1, "bad GNU.sparse.map: expected `,' but found `%c'",
+ die (1, "bad GNU.sparse.map: expected ',' but found '%c'",
*val);
}
else
@@ -252,7 +252,7 @@ read_xheader (char *name)
}
}
if (expect)
- die (1, "bad keyword sequence: expected `%s' not found", expect);
+ die (1, "bad keyword sequence: expected '%s' not found", expect);
if (version_major == 0 && sparse_map_size == 0)
die (1, "size of the sparse map unknown");
if (i != sparse_map_size)
@@ -449,7 +449,7 @@ main (int argc, char **argv)
die (1, "cannot open file %s (%d)", outname, errno);
if (verbose)
- printf ("Expanding file `%s' to `%s'\n", inname, outname);
+ printf ("Expanding file '%s' to '%s'\n", inname, outname);
if (dry_run)
{