emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Glenn L McGrath 2004-01-18 05:41:30 +00:00
parent 792cae5f2a
commit 65b6d8bdb6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
coreutils/ls.c
View File

@ -717,21 +717,21 @@ static int list_single(struct dnode *dn)
break; break;
#ifdef CONFIG_FEATURE_LS_TIMESTAMPS #ifdef CONFIG_FEATURE_LS_TIMESTAMPS
case LIST_FULLTIME: case LIST_FULLTIME:
printf("%24.24s ", filetime);
column += 25;
break;
case LIST_DATE_TIME: case LIST_DATE_TIME:
if (all_fmt & LIST_FULLTIME) { if ((all_fmt & LIST_FULLTIME) == 0) {
printf("%24.24s ", filetime); age = time(NULL) - ttime;
column += 25; printf("%6.6s ", filetime + 4);
break; 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;
} }
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;
break; break;
#endif #endif
#ifdef CONFIG_SELINUX #ifdef CONFIG_SELINUX