summaryrefslogtreecommitdiff
path: root/src/ls.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2001-04-22 21:34:20 +0000
committerJim Meyering <jim@meyering.net>2001-04-22 21:34:20 +0000
commitb17fce4fa413a1b98dd0c9aa1b87ece850844e9f (patch)
tree4503417b1706e9d01f3e482bc456230d5f63ea2b /src/ls.c
parentc582df59bf507fdfd346999242d95f5b56b900a7 (diff)
downloadcoreutils-b17fce4fa413a1b98dd0c9aa1b87ece850844e9f.tar.xz
(decode_switches): Ensure that -1 has no effect when it follows -l.
Diffstat (limited to 'src/ls.c')
-rw-r--r--src/ls.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ls.c b/src/ls.c
index 45ab5cb25..230ae7e90 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -1269,7 +1269,9 @@ Use `--si' for the old meaning."));
break;
case '1':
- format = one_per_line;
+ /* -1 has no effect after --l. */
+ if (format != long_format)
+ format = one_per_line;
break;
case SORT_OPTION: