From: Jim Meyering <jim@meyering.net>
Date: Sun, 22 Apr 2001 21:34:20 +0000 (+0000)
Subject: (decode_switches): Ensure that -1 has no effect when it follows -l.
X-Git-Tag: FILEUTILS-4_0_45~6
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=b17fce4fa413a1b98dd0c9aa1b87ece850844e9f;p=thirdparty%2Fcoreutils.git

(decode_switches): Ensure that -1 has no effect when it follows -l.
---

diff --git a/src/ls.c b/src/ls.c
index 45ab5cb254..230ae7e904 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: