* src/csplit.c (parse_repeat_count, extract_regexp): As above.
* src/date.c (main): Likewise.
* src/ls.c (decode_switches): Likewise.
* src/od.c (decode_one_format, main): Likewise.
* src/pathchk.c (no_leading_hyphen): Likewise.
* src/pr.c (main, getoptarg): Likewise.
* src/rm.c (diagnose_leading_hyphen): Likewise.
* src/sort.c (key_warnings, incompatible_options, main): Likewise.
* src/stat.c (print_esc_char): Print '\x', not `\x' in diagnostic.
* src/test.c (main): Likewise.
* src/touch.c (main): Likewise.
* src/tr.c (build_spec_list, validate, append_range): Likewise.
* tests/misc/mktemp: This is an unusual case, since the affected
string contains only the ` of an `...' string. So we change
the long ` to a lone '.
* tests/pr/pr-tests: Manual quote adapting fix-up.
* tests/ln/hard-to-sym: Likewise.
* tests/split/suffix-length: Likewise.
* tests/mv/part-fail: Likewise.
* tests/misc/chcon: Likewise.
* tests/misc/stat-printf: Likewise.
end = str + strlen (str) - 1;
if (*end != '}')
- error (EXIT_FAILURE, 0, _("%s: `}' is required in repeat count"), str);
+ error (EXIT_FAILURE, 0, _("%s: '}' is required in repeat count"), str);
*end = '\0';
if (str+1 == end-1 && *(str+1) == '*')
if (xstrtoumax (str + 1, NULL, 10, &val, "") != LONGINT_OK)
{
error (EXIT_FAILURE, 0,
- _("%s}: integer required between `{' and `}'"),
+ _("%s}: integer required between '{' and '}'"),
global_argv[argnum]);
}
p->repeat = val;
closing_delim = strrchr (str + 1, delim);
if (closing_delim == NULL)
error (EXIT_FAILURE, 0,
- _("%s: closing delimiter `%c' missing"), str, delim);
+ _("%s: closing delimiter '%c' missing"), str, delim);
len = closing_delim - str - 1;
p = new_control_record ();
else if (set_date || option_specified_date)
{
error (0, 0,
- _("the argument %s lacks a leading `+';\n"
+ _("the argument %s lacks a leading '+';\n"
"when using an option to specify date(s), any non-option\n"
- "argument must be a format string beginning with `+'"),
+ "argument must be a format string beginning with '+'"),
quote (argv[optind]));
usage (EXIT_FAILURE);
}
char const *const *p = time_style_args;
while (*p)
fprintf (stderr, " - [posix-]%s\n", *p++);
- fputs (_(" - +FORMAT (e.g., +%H:%M) for a `date'-style"
+ fputs (_(" - +FORMAT (e.g., +%H:%M) for a 'date'-style"
" format\n"), stderr);
usage (LS_FAILURE);
}
break;
default:
- error (0, 0, _("invalid character `%c' in type string %s"),
+ error (0, 0, _("invalid character '%c' in type string %s"),
*s, quote (s_orig));
return false;
}
break;
default:
error (EXIT_FAILURE, 0,
- _("invalid output address radix `%c'; \
+ _("invalid output address radix '%c'; \
it must be one character from [doxn]"),
optarg[0]);
break;
for (p = file; (p = strchr (p, '-')); p++)
if (p == file || p[-1] == '/')
{
- error (0, 0, _("leading `-' in a component of file name %s"),
+ error (0, 0, _("leading '-' in a component of file name %s"),
quote (file));
return false;
}
{ /* dominates old opt +... */
if (! optarg)
error (EXIT_FAILURE, 0,
- _("`--pages=FIRST_PAGE[:LAST_PAGE]' missing argument"));
+ _("'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument"));
else if (! first_last_page (oi, 0, optarg))
error (EXIT_FAILURE, 0, _("invalid page range %s"),
quote (optarg));
|| tmp_long <= 0 || tmp_long > INT_MAX)
{
error (EXIT_FAILURE, 0,
- _("`-l PAGE_LENGTH' invalid number of lines: %s"),
+ _("'-l PAGE_LENGTH' invalid number of lines: %s"),
quote (optarg));
}
lines_per_page = tmp_long;
|| tmp_long > INT_MAX)
{
error (EXIT_FAILURE, 0,
- _("`-N NUMBER' invalid starting line number: %s"),
+ _("'-N NUMBER' invalid starting line number: %s"),
quote (optarg));
}
start_line_num = tmp_long;
if (xstrtol (optarg, NULL, 10, &tmp_long, "") != LONGINT_OK
|| tmp_long < 0 || tmp_long > INT_MAX)
error (EXIT_FAILURE, 0,
- _("`-o MARGIN' invalid line offset: %s"), quote (optarg));
+ _("'-o MARGIN' invalid line offset: %s"), quote (optarg));
chars_per_margin = tmp_long;
break;
}
if (xstrtol (optarg, NULL, 10, &tmp_long, "") != LONGINT_OK
|| tmp_long <= 0 || tmp_long > INT_MAX)
error (EXIT_FAILURE, 0,
- _("`-w PAGE_WIDTH' invalid number of characters: %s"),
+ _("'-w PAGE_WIDTH' invalid number of characters: %s"),
quote (optarg));
if (!truncate_lines)
chars_per_line = tmp_long;
if (xstrtol (optarg, NULL, 10, &tmp_long, "") != LONGINT_OK
|| tmp_long <= 0 || tmp_long > INT_MAX)
error (EXIT_FAILURE, 0,
- _("`-W PAGE_WIDTH' invalid number of characters: %s"),
+ _("'-W PAGE_WIDTH' invalid number of characters: %s"),
quote (optarg));
chars_per_line = tmp_long;
break;
|| tmp_long <= 0 || tmp_long > INT_MAX)
{
error (0, 0,
- _("`-%c' extra characters or invalid number in the argument: %s"),
+ _("'-%c' extra characters or invalid number in the argument: %s"),
switch_char, quote (arg));
usage (EXIT_FAILURE);
}
if (arg[0] == '-' && arg[1] && lstat (arg, &st) == 0)
{
fprintf (stderr,
- _("Try `%s ./%s' to remove the file %s.\n"),
+ _("Try '%s ./%s' to remove the file %s.\n"),
argv[0],
quotearg_n_style (1, shell_quoting_style, arg),
quote (arg));
umaxtostr (eword + 1
+ (key->echar == SIZE_MAX), tmp));
}
- error (0, 0, _("obsolescent key `%s' used; consider `%s' instead"),
+ error (0, 0, _("obsolescent key '%s' used; consider '%s' instead"),
obuf, nbuf);
}
|| (!key->skipsblanks && key->schar)
|| (!key->skipeblanks && key->echar)))
error (0, 0, _("leading blanks are significant in key %lu; "
- "consider also specifying `b'"), keynum);
+ "consider also specifying 'b'"), keynum);
/* Warn about numeric comparisons spanning fields,
as field delimiters could be interpreted as part
char opts[sizeof short_options];
key_to_opts (&ugkey, opts);
error (0, 0,
- ngettext ("option `-%s' is ignored",
- "options `-%s' are ignored",
+ ngettext ("option '-%s' is ignored",
+ "options '-%s' are ignored",
select_plural (strlen (opts))), opts);
ugkey.reverse = ugkey_reverse;
}
if (ugkey.reverse && !(stable || unique) && keylist)
- error (0, 0, _("option `-r' only applies to last-resort comparison"));
+ error (0, 0, _("option '-r' only applies to last-resort comparison"));
}
/* Compare two lines A and B trying every key in sequence until there
static void
incompatible_options (char const *opts)
{
- error (SORT_FAILURE, 0, _("options `-%s' are incompatible"), opts);
+ error (SORT_FAILURE, 0, _("options '-%s' are incompatible"), opts);
abort ();
}
{
char const *optarg1 = argv[optind++];
s = parse_field_count (optarg1 + 1, &key->eword,
- N_("invalid number after `-'"));
+ N_("invalid number after '-'"));
if (*s == '.')
s = parse_field_count (s + 1, &key->echar,
- N_("invalid number after `.'"));
+ N_("invalid number after '.'"));
if (!key->echar && key->eword)
{
/* obsolescent syntax +A.x -B.y is equivalent to:
if (*s == '.')
{
s = parse_field_count (s + 1, &key->schar,
- N_("invalid number after `.'"));
+ N_("invalid number after '.'"));
if (! key->schar--)
{
/* Provoke with `sort -k1.0' */
{
/* Get POS2. */
s = parse_field_count (s + 1, &key->eword,
- N_("invalid number after `,'"));
+ N_("invalid number after ','"));
if (! key->eword--)
{
/* Provoke with `sort -k1,0' */
if (*s == '.')
{
s = parse_field_count (s + 1, &key->echar,
- N_("invalid number after `.'"));
+ N_("invalid number after '.'"));
}
s = set_ordering (s, key, bl_end);
}
case '\\':
break;
default:
- error (0, 0, _("warning: unrecognized escape `\\%c'"), c);
+ error (0, 0, _("warning: unrecognized escape '\\%c'"), c);
break;
}
putchar (c);
}
}
if (margc < 2 || !STREQ (margv[margc - 1], "]"))
- test_syntax_error (_("missing `]'"), NULL);
+ test_syntax_error (_("missing ']'"), NULL);
--margc;
}
would fail. However, skip the warning if it ever fails. */
if (tm)
error (0, 0,
- _("warning: `touch %s' is obsolete; use "
- "`touch -t %04ld%02d%02d%02d%02d.%02d'"),
+ _("warning: 'touch %s' is obsolete; use "
+ "'touch -t %04ld%02d%02d%02d%02d.%02d'"),
argv[optind],
tm->tm_year + 1900L, tm->tm_mon + 1, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
char *tmp2 = make_printable_char (last);
error (0, 0,
- _("range-endpoints of `%s-%s' are in reverse collating sequence order"),
+ _("range-endpoints of '%s-%s' are in reverse collating sequence order"),
tmp1, tmp2);
free (tmp1);
free (tmp2);
if (opnd_str_len == 0)
{
if (p[i + 1] == ':')
- error (0, 0, _("missing character class name `[::]'"));
+ error (0, 0, _("missing character class name '[::]'"));
else
error (0, 0,
- _("missing equivalence class character `[==]'"));
+ _("missing equivalence class character '[==]'"));
return false;
}
{
error (EXIT_FAILURE, 0,
_("when translating, the only character classes that may \
-appear in\nstring2 are `upper' and `lower'"));
+appear in\nstring2 are 'upper' and 'lower'"));
}
validate_case_classes (s1, s2);
ln -s /no-such-dir || framework_failure_
ln -L no-such-dir hard-to-dangle 2>err && fail=1
case `cat err` in
- *' accessing 'no-such-dir'\':*) ;;
+ *" accessing 'no-such-dir'":*) ;;
*) fail=1 ;;
esac
ln -P no-such-dir hard-to-dangle || fail=1
ln -s d link-to-dir || framework_failure_
ln -L link-to-dir hard-to-dir-link 2>err && fail=1
case `cat err` in
- *': 'link-to-dir'\'': hard link not allowed for directory'*) ;;
+ *": 'link-to-dir': hard link not allowed for directory"*) ;;
*) fail=1 ;;
esac
ln -P link-to-dir/ hard-to-dir-link 2>err && fail=1
case `cat err` in
- *': 'link-to-dir/'\'': hard link not allowed for directory'*) ;;
+ *": 'link-to-dir/': hard link not allowed for directory"*) ;;
*) fail=1 ;;
esac
ln -P link-to-dir hard-to-dir-link || fail=1
compare exp out || fail=1
chcon --verbose -u$u1 f > out || fail=1
-echo 'changing security context of 'f'\' > exp
+echo "changing security context of 'f'" > exp
compare exp out || fail=1
Exit $fail
['pipe-bad-tmpdir',
{ENV => "TMPDIR=$bad_dir"},
{ERR_SUBST => "s,($bad_dir/)[^']+': .*,\$1...,"},
- {ERR => "$prog: failed to create file via template `$bad_dir/...\n"},
+ {ERR => "$prog: failed to create file via template '$bad_dir/...\n"},
{EXIT => 1}],
['pipe-bad-tmpdir-u', '-u', {OUT => "$bad_dir/tmp.ZZZZZZZZZZ\n"},
{ENV => "TMPDIR=$bad_dir"},
['hex-1', q!--printf='\x34\xf' .!, {OUT=>"\x34\xf"}],
['hex-2', q!--printf='.\x18p\xfq' .!, {OUT=>".\x18p\x0fq"}],
['hex-3', q!--printf='\x' .!, {OUT=>'x'},
- {ERR=>"$prog: warning: unrecognized escape `\\x'\n"}],
+ {ERR=>"$prog: warning: unrecognized escape '\\x'\n"}],
# With --format, there *is* a trailing newline.
['f-nl', "--format=%n .", {OUT=>".\n"}],
mv -f k "$other_partition_tmpdir" 2> out && fail=1
printf \
-'mv: inter-device move failed: '%s'\'' to '%s'\'';'\
+"mv: inter-device move failed: '%s' to '%s';"\
' unable to remove target: Permission denied\n' \
k "$other_partition_tmpdir/k" >exp
['col-0', '-0', '', '', 1,
"$prog: invalid number of columns: '0'\n"],
['col-inval', '-'.'9'x100, '', '', 1,
- "$prog: invalid number of columns: `". ('9'x100) ."'\n"],
+ "$prog: invalid number of columns: '". ('9'x100) ."'\n"],
# Before coreutils-5.3.1, --pages=1:-1 would be treated like
# --pages=1:18446744073709551615.
files="${files}xba"
for f in $files; do
- printf 'creating file `%s'\''\n' $f
+ printf "creating file '%s'"'\n' $f
done > exp || framework_failure_
echo split: output file suffixes exhausted \