diff options
| author | Rob Landley <rob@landley.net> | 2015-12-30 12:01:42 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2015-12-30 12:01:42 -0600 |
| commit | 3a70500a4b11623651d1ffd779592a521e5c738b (patch) | |
| tree | 15bdef8f2d3548e7b6f90f8a32676bee5f0494d5 /toys | |
| parent | 1b7c02a6bf83a5e2ed618b824caf33804bf8373d (diff) | |
| download | toybox-3a70500a4b11623651d1ffd779592a521e5c738b.tar.gz | |
make "ls -m | cat" assume 80 columns.
Diffstat (limited to 'toys')
| -rw-r--r-- | toys/posix/ls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toys/posix/ls.c b/toys/posix/ls.c index 7dc85ac9..d313457a 100644 --- a/toys/posix/ls.c +++ b/toys/posix/ls.c @@ -528,7 +528,7 @@ void ls_main(void) // Do we have an implied -1 if (!isatty(1)) { - toys.optflags |= FLAG_1; + if (!(toys.optflags & FLAG_m)) toys.optflags |= FLAG_1; if (TT.color) toys.optflags ^= FLAG_color; } else if (toys.optflags&(FLAG_l|FLAG_o|FLAG_n|FLAG_g)) toys.optflags |= FLAG_1; |