diff options
| author | Ron Yorston <rmy@pobox.com> | 2013-04-03 13:02:14 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2013-04-03 13:02:14 +0100 |
| commit | 667d5dd0a428a790df5a73d044cf9a8882ee92f8 (patch) | |
| tree | 76291debc380e8d31991c3d2eddcf0add131c7a3 /coreutils | |
| parent | 8782950636f76faa8db0ed8c5d698ab0bd1fbf45 (diff) | |
| parent | d35cbad0efaa57bf7c5280e62825966f7757906a (diff) | |
| download | busybox-w32-667d5dd0a428a790df5a73d044cf9a8882ee92f8.tar.gz busybox-w32-667d5dd0a428a790df5a73d044cf9a8882ee92f8.tar.bz2 busybox-w32-667d5dd0a428a790df5a73d044cf9a8882ee92f8.zip | |
Merge branch 'busybox' into merge
Conflicts:
libbb/lineedit.c
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/stat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/stat.c b/coreutils/stat.c index 69a8a1a36..0d13fdf65 100644 --- a/coreutils/stat.c +++ b/coreutils/stat.c | |||
| @@ -131,7 +131,7 @@ static const char *human_time(time_t t) | |||
| 131 | /*static char buf[sizeof("YYYY-MM-DD HH:MM:SS.000000000")] ALIGN1;*/ | 131 | /*static char buf[sizeof("YYYY-MM-DD HH:MM:SS.000000000")] ALIGN1;*/ |
| 132 | #define buf bb_common_bufsiz1 | 132 | #define buf bb_common_bufsiz1 |
| 133 | 133 | ||
| 134 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S.000000000", localtime(&t)); | 134 | strcpy(strftime_YYYYMMDDHHMMSS(buf, sizeof(buf), &t), ".000000000"); |
| 135 | return buf; | 135 | return buf; |
| 136 | #undef buf | 136 | #undef buf |
| 137 | } | 137 | } |