Skip to content

Commit

Permalink
ls: default to --quoting=shell-escape for output to terminal
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
pixelb committed Nov 4, 2015
1 parent 5ef0886 commit 109b922
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
3 changes: 3 additions & 0 deletions NEWS
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions doc/coreutils.texi
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/ls.c
Expand Up @@ -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;
}
Expand Down

0 comments on commit 109b922

Please sign in to comment.