blob: e68c21355060581ebb318ce0d08b2a781f1689b6 [file] [log] [blame]
Patrick Williamsc0f7c042017-02-23 20:41:17 -06001Subject: revert inconsistent ls quoting
2
3This is a revert of upstream commit 109b9220cead6e979d22d16327c4d9f8350431cc.
4
5Bug-Debian: https://bugs.debian.org/813164
6
7Upstream-Status: Submitted
8
9Originally-by: Adam Borowski <kilobyte@angband.pl>
10[PG: patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813164#78 ]
11Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
12
13---
14
15--- coreutils-8.25.orig/NEWS
16+++ coreutils-8.25/NEWS
17@@ -71,9 +71,6 @@ GNU coreutils NEWS
18 df now prefers sources towards the root of a device when
19 eliding duplicate bind mounted entries.
20
21- ls now quotes file names unambiguously and appropriate for use in a shell,
22- when outputting to a terminal.
23-
24 join, sort, uniq with --zero-terminated, now treat '\n' as a field delimiter.
25
26 ** Improvements
27--- coreutils-8.25.orig/doc/coreutils.texi
28+++ coreutils-8.25/doc/coreutils.texi
29@@ -7750,8 +7750,8 @@ this"} in the default C locale. This lo
30
31 You can specify the default value of the @option{--quoting-style} option
32 with the environment variable @env{QUOTING_STYLE}@. If that environment
33-variable is not set, the default value is @samp{shell-escape} when the
34-output is a terminal, and @samp{literal} otherwise.
35+variable is not set, the default value is @samp{literal}, but this
36+default may change to @samp{shell} in a future version of this package.
37
38 @item --show-control-chars
39 @opindex --show-control-chars
40--- coreutils-8.25.orig/src/ls.c
41+++ coreutils-8.25/src/ls.c
42@@ -1581,7 +1581,6 @@ decode_switches (int argc, char **argv)
43 if (isatty (STDOUT_FILENO))
44 {
45 format = many_per_line;
46- set_quoting_style (NULL, shell_escape_quoting_style);
47 /* See description of qmark_funny_chars, above. */
48 qmark_funny_chars = true;
49 }