summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2015-11-03 16:32:08 +0000
committerPádraig Brady <P@draigBrady.com>2015-11-04 23:30:15 +0000
commit109b9220cead6e979d22d16327c4d9f8350431cc (patch)
tree048d336b23d02068fe926224da83c06415b0a3fd
parent5ef08864113505c6392158c9fac9a6cb1b3ac0e6 (diff)
downloadcoreutils-109b9220cead6e979d22d16327c4d9f8350431cc.tar.xz
ls: default to --quoting=shell-escape for output to terminal
* src/ls.c (decode_switches): Set "shell-escape" if isatty(). * doc/coreutils.texi (ls invocation): Update the defaults description. * NEWS: Mention the change in behavior. It should not have backwards compat issues, but mentioning here just in case.
-rw-r--r--NEWS3
-rw-r--r--doc/coreutils.texi4
-rw-r--r--src/ls.c1
3 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 38b466465..08cb1388f 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,9 @@ GNU coreutils NEWS -*- outline -*-
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.
+
** Improvements
All utilities now quote user supplied arguments in error strings,
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 8618a6457..8034807a4 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -7704,8 +7704,8 @@ this"} in the default C locale. This looks nicer on many displays.
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{literal}, but this
-default may change to @samp{shell} in a future version of this package.
+variable is not set, the default value is @samp{shell-escape} when the
+output is a terminal, and @samp{literal} otherwise.
@item --show-control-chars
@opindex --show-control-chars
diff --git a/src/ls.c b/src/ls.c
index c22c536c0..2ae548d99 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -1581,6 +1581,7 @@ 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;
}