From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Sun, 18 Jan 2004 05:41:30 +0000 (-0000)
Subject: Fix a bug where `ls -le` would print the time twice.
X-Git-Tag: 1_00_pre6~38
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=65b6d8bdb6375c010d70f7aad399dae7c3ec15f6;p=oweals%2Fbusybox.git

Fix a bug where `ls -le` would print the time twice.
---

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 18cffb13e..2f81ee05a 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -717,21 +717,21 @@ static int list_single(struct dnode *dn)
 			break;
 #ifdef CONFIG_FEATURE_LS_TIMESTAMPS
 		case LIST_FULLTIME:
+			printf("%24.24s ", filetime);
+			column += 25;
+			break;
 		case LIST_DATE_TIME:
-			if (all_fmt & LIST_FULLTIME) {
-				printf("%24.24s ", filetime);
-				column += 25;
-				break;
-			}
-			age = time(NULL) - ttime;
-			printf("%6.6s ", filetime + 4);
-			if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) {
-				/* hh:mm if less than 6 months old */
-				printf("%5.5s ", filetime + 11);
-			} else {
-				printf(" %4.4s ", filetime + 20);
+			if ((all_fmt & LIST_FULLTIME) == 0) {
+				age = time(NULL) - ttime;
+				printf("%6.6s ", filetime + 4);
+				if (age < 3600L * 24 * 365 / 2 && age > -15 * 60) {
+					/* hh:mm if less than 6 months old */
+					printf("%5.5s ", filetime + 11);
+				} else {
+					printf(" %4.4s ", filetime + 20);
+				}
+				column += 13;
 			}
-			column += 13;
 			break;
 #endif
 #ifdef CONFIG_SELINUX