1 files changed, 11 insertions, 41 deletions
diff --git a/source/a/coreutils/no_ls_quoting.patch b/source/a/coreutils/no_ls_quoting.patch
index bfc9d0187..b8643c40f 100644
--- a/source/a/coreutils/no_ls_quoting.patch
+++ b/source/a/coreutils/no_ls_quoting.patch
@@ -1,41 +1,11 @@
-Description: revert inconsistent ls quoting
- This is a revert of upstream commit 109b9220cead6e979d22d16327c4d9f8350431cc.
- Info changed to reflect current upstream intentions.
-
-Bug-Debian: https://bugs.debian.org/813164
-
---- coreutils-8.25.orig/NEWS
-+++ coreutils-8.25/NEWS
-@@ -71,9 +71,6 @@ GNU coreutils NEWS
-   df now prefers sources towards the root of a device when
-   eliding duplicate bind mounted entries.
- 
--  ls now quotes file names unambiguously and appropriate for use in a shell,
--  when outputting to a terminal.
--
-   join, sort, uniq with --zero-terminated, now treat '\n' as a field delimiter.
- 
- ** Improvements
---- coreutils-8.25.orig/doc/coreutils.texi
-+++ coreutils-8.25/doc/coreutils.texi
-@@ -7750,8 +7750,8 @@ this"} in the default C locale.  This lo
- 
- You can specify the default value of the @option{--quoting-style} option
- with the environment variable @env{QUOTING_STYLE}@.  If that environment
--variable is not set, the default value is @samp{shell-escape} when the
--output is a terminal, and @samp{literal} otherwise.
-+variable is not set, the default value is @samp{literal}, but this
-+default may change to @samp{shell-escape} in a future version of this package.
- 
- @item --show-control-chars
- @opindex --show-control-chars
---- coreutils-8.25.orig/src/ls.c
-+++ coreutils-8.25/src/ls.c
-@@ -1581,7 +1581,6 @@ decode_switches (int argc, char **argv)
-       if (isatty (STDOUT_FILENO))
-         {
-           format = many_per_line;
--          set_quoting_style (NULL, shell_escape_quoting_style);
-           /* See description of qmark_funny_chars, above.  */
-           qmark_funny_chars = true;
-         }
+--- ./src/ls.c.orig	2021-09-24 06:31:05.000000000 -0500
++++ ./src/ls.c	2021-09-24 19:47:32.230001419 -0500
+@@ -2342,7 +2342,7 @@
+     qs = getenv_quoting_style ();
+   if (qs < 0)
+     qs = (ls_mode == LS_LS
+-          ? (stdout_isatty () ? shell_escape_quoting_style : -1)
++          ? (stdout_isatty () ? escape_quoting_style : -1)
+           : escape_quoting_style);
+   if (0 <= qs)
+     set_quoting_style (NULL, qs);