From 3a70500a4b11623651d1ffd779592a521e5c738b Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Wed, 30 Dec 2015 12:01:42 -0600
Subject: make "ls -m | cat" assume 80 columns.

---
 toys/posix/ls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toys/posix/ls.c')

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;
-- 
cgit v1.2.3