diff options
| author | Pádraig Brady <P@draigBrady.com> | 2015-11-01 18:53:26 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-11-04 23:30:14 +0000 |
| commit | 08e8fd7e38f2dae7c69c54eb22d508b6517e66e5 (patch) | |
| tree | 63d021e305cd93bea445f9484fe8b3446dda2c3d /tests/misc/sort.pl | |
| parent | 1e8f9afac53a628dbc64e62bea53eb2da29c47fa (diff) | |
| download | coreutils-08e8fd7e38f2dae7c69c54eb22d508b6517e66e5.tar.xz | |
all: avoid quoting file names when possible
Quote file names using the "shell-escape" or "shell-escape-always"
methods, which quote as appropriate for most shells,
and better support copy and paste of presented names.
The "always" variant is used when the file name is
embedded in an error message with surrounding spaces.
* cfg.mk (sc_error_shell_quotes): A new syntax check rule
to suggest quotef() where appropriate.
(sc_error_shell_always_quotes): Likewise for quoteaf().
* src/system.h (quotef): A new define to apply shell quoting
when needed. I.E. when shell character or ':' is present.
(quoteaf): Likewise, but always quote.
* src/*.c: Use quotef() and quoteaf() rather than quote()
where appropriate.
* tests/: Adjust accordingly.
Diffstat (limited to 'tests/misc/sort.pl')
| -rwxr-xr-x | tests/misc/sort.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/misc/sort.pl b/tests/misc/sort.pl index 012d8b94e..f6a222c2c 100755 --- a/tests/misc/sort.pl +++ b/tests/misc/sort.pl @@ -33,7 +33,7 @@ my $mb_locale = $ENV{LOCALE_FR_UTF8}; # Normalize each diagnostic to use '-'. my $normalize_filename = {ERR_SUBST => 's/^$prog: .*?:/$prog: -:/'}; -my $no_file = "$prog: cannot read: 'no-file': No such file or directory\n"; +my $no_file = "$prog: cannot read: no-file: No such file or directory\n"; my @Tests = ( @@ -327,7 +327,7 @@ my @Tests = ["o-no-file1", qw(-o no-file no-file), {EXIT=>2}, {ERR=>$no_file}], ["create-empty", qw(-o no/such/file /dev/null), {EXIT=>2}, - {ERR=>"$prog: open failed: 'no/such/file': No such file or directory\n"}], + {ERR=>"$prog: open failed: no/such/file: No such file or directory\n"}], # From Paul Eggert. This was fixed in textutils-1.22k. ["neg-nls", '-n', {IN=>"-1\n-9\n"}, {OUT=>"-9\n-1\n"}], |