diff options
| -rw-r--r-- | coreutils/date.c | 1 | ||||
| -rw-r--r-- | libbb/time.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/coreutils/date.c b/coreutils/date.c index dfc1c7663..7061f1719 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -111,6 +111,7 @@ //usage: ) //usage: "\n" //usage: "\nRecognized TIME formats:" +//usage: "\n @seconds_since_1970" //usage: "\n hh:mm[:ss]" //usage: "\n [YYYY.]MM.DD-hh:mm[:ss]" //usage: "\n YYYY-MM-DD hh:mm[:ss]" diff --git a/libbb/time.c b/libbb/time.c index e66a9cba8..86b88a414 100644 --- a/libbb/time.c +++ b/libbb/time.c @@ -90,7 +90,11 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm) ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */ } else if (date_str[0] == '@') { - time_t t = bb_strtol(date_str + 1, NULL, 10); + time_t t; + if (sizeof(t) <= sizeof(long)) + t = bb_strtol(date_str + 1, NULL, 10); + else /* time_t is 64 bits but longs are smaller */ + t = bb_strtoll(date_str + 1, NULL, 10); if (!errno) { struct tm *lt = localtime(&t); if (lt) { |