*
* Copyright (C) 2007 Denys Vlasenko
*
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
*/
#include "libbb.h"
-void FAST_FUNC parse_datestr(const char *date_str, struct tm *tm_time)
+void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
{
char end = '\0';
const char *last_colon = strrchr(date_str, ':');
if (last_colon != NULL) {
- /* Parse input and assign appropriately to tm_time */
+ /* Parse input and assign appropriately to ptm */
+#if ENABLE_DESKTOP
+ const char *endp;
+#endif
/* HH:MM */
if (sscanf(date_str, "%u:%u%c",
- &tm_time->tm_hour,
- &tm_time->tm_min,
+ &ptm->tm_hour,
+ &ptm->tm_min,
&end) >= 2) {
/* no adjustments needed */
} else
/* mm.dd-HH:MM */
if (sscanf(date_str, "%u.%u-%u:%u%c",
- &tm_time->tm_mon, &tm_time->tm_mday,
- &tm_time->tm_hour, &tm_time->tm_min,
+ &ptm->tm_mon, &ptm->tm_mday,
+ &ptm->tm_hour, &ptm->tm_min,
&end) >= 4) {
/* Adjust month from 1-12 to 0-11 */
- tm_time->tm_mon -= 1;
+ ptm->tm_mon -= 1;
} else
/* yyyy.mm.dd-HH:MM */
- if (sscanf(date_str, "%u.%u.%u-%u:%u%c", &tm_time->tm_year,
- &tm_time->tm_mon, &tm_time->tm_mday,
- &tm_time->tm_hour, &tm_time->tm_min,
+ if (sscanf(date_str, "%u.%u.%u-%u:%u%c", &ptm->tm_year,
+ &ptm->tm_mon, &ptm->tm_mday,
+ &ptm->tm_hour, &ptm->tm_min,
&end) >= 5) {
- tm_time->tm_year -= 1900; /* Adjust years */
- tm_time->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
+ ptm->tm_year -= 1900; /* Adjust years */
+ ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
} else
/* yyyy-mm-dd HH:MM */
- if (sscanf(date_str, "%u-%u-%u %u:%u%c", &tm_time->tm_year,
- &tm_time->tm_mon, &tm_time->tm_mday,
- &tm_time->tm_hour, &tm_time->tm_min,
+ if (sscanf(date_str, "%u-%u-%u %u:%u%c", &ptm->tm_year,
+ &ptm->tm_mon, &ptm->tm_mday,
+ &ptm->tm_hour, &ptm->tm_min,
&end) >= 5) {
- tm_time->tm_year -= 1900; /* Adjust years */
- tm_time->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
+ ptm->tm_year -= 1900; /* Adjust years */
+ ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
+ } else
+#if ENABLE_DESKTOP /* strptime is BIG: ~1k in uclibc, ~10k in glibc */
+ /* month_name d HH:MM:SS YYYY. Supported by GNU date */
+ if ((endp = strptime(date_str, "%b %d %T %Y", ptm)) != NULL
+ && *endp == '\0'
+ ) {
+ return; /* don't fall through to end == ":" check */
+ } else
+#endif
//TODO: coreutils 6.9 also accepts "yyyy-mm-dd HH" (no minutes)
- } else {
+ {
bb_error_msg_and_die(bb_msg_invalid_date, date_str);
}
if (end == ':') {
/* xxx:SS */
- if (sscanf(last_colon + 1, "%u%c", &tm_time->tm_sec, &end) == 1)
+ if (sscanf(last_colon + 1, "%u%c", &ptm->tm_sec, &end) == 1)
end = '\0';
/* else end != NUL and we error out */
}
+ } else if (date_str[0] == '@') {
+ time_t t = bb_strtol(date_str + 1, NULL, 10);
+ if (!errno) {
+ struct tm *lt = localtime(&t);
+ if (lt) {
+ *ptm = *lt;
+ return;
+ }
+ }
+ end = '1';
} else {
/* Googled the following on an old date manpage:
*
/* MM[.SS] */
if (len == 2 && sscanf(date_str, "%2u%2u%2u%2u""%2u%c" + 12,
- &tm_time->tm_min,
+ &ptm->tm_min,
&end) >= 1) {
} else
/* HHMM[.SS] */
if (len == 4 && sscanf(date_str, "%2u%2u%2u""%2u%2u%c" + 9,
- &tm_time->tm_hour,
- &tm_time->tm_min,
+ &ptm->tm_hour,
+ &ptm->tm_min,
&end) >= 2) {
} else
/* ddHHMM[.SS] */
if (len == 6 && sscanf(date_str, "%2u%2u""%2u%2u%2u%c" + 6,
- &tm_time->tm_mday,
- &tm_time->tm_hour,
- &tm_time->tm_min,
+ &ptm->tm_mday,
+ &ptm->tm_hour,
+ &ptm->tm_min,
&end) >= 3) {
} else
/* mmddHHMM[.SS] */
if (len == 8 && sscanf(date_str, "%2u""%2u%2u%2u%2u%c" + 3,
- &tm_time->tm_mon,
- &tm_time->tm_mday,
- &tm_time->tm_hour,
- &tm_time->tm_min,
+ &ptm->tm_mon,
+ &ptm->tm_mday,
+ &ptm->tm_hour,
+ &ptm->tm_min,
&end) >= 4) {
/* Adjust month from 1-12 to 0-11 */
- tm_time->tm_mon -= 1;
+ ptm->tm_mon -= 1;
} else
/* yymmddHHMM[.SS] */
if (len == 10 && sscanf(date_str, "%2u%2u%2u%2u%2u%c",
- &tm_time->tm_year,
- &tm_time->tm_mon,
- &tm_time->tm_mday,
- &tm_time->tm_hour,
- &tm_time->tm_min,
+ &ptm->tm_year,
+ &ptm->tm_mon,
+ &ptm->tm_mday,
+ &ptm->tm_hour,
+ &ptm->tm_min,
&end) >= 5) {
/* Adjust month from 1-12 to 0-11 */
- tm_time->tm_mon -= 1;
+ ptm->tm_mon -= 1;
} else
/* ccyymmddHHMM[.SS] */
if (len == 12 && sscanf(date_str, "%4u%2u%2u%2u%2u%c",
- &tm_time->tm_year,
- &tm_time->tm_mon,
- &tm_time->tm_mday,
- &tm_time->tm_hour,
- &tm_time->tm_min,
+ &ptm->tm_year,
+ &ptm->tm_mon,
+ &ptm->tm_mday,
+ &ptm->tm_hour,
+ &ptm->tm_min,
&end) >= 5) {
- tm_time->tm_year -= 1900; /* Adjust years */
- tm_time->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
+ ptm->tm_year -= 1900; /* Adjust years */
+ ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
} else {
bb_error_msg_and_die(bb_msg_invalid_date, date_str);
}
if (end == '.') {
/* xxx.SS */
if (sscanf(strchr(date_str, '.') + 1, "%u%c",
- &tm_time->tm_sec, &end) == 1)
+ &ptm->tm_sec, &end) == 1)
end = '\0';
/* else end != NUL and we error out */
}
}
}
-time_t FAST_FUNC validate_tm_time(const char *date_str, struct tm *tm_time)
+time_t FAST_FUNC validate_tm_time(const char *date_str, struct tm *ptm)
{
- time_t t = mktime(tm_time);
+ time_t t = mktime(ptm);
if (t == (time_t) -1L) {
bb_error_msg_and_die(bb_msg_invalid_date, date_str);
}
get_mono(&ts);
return ts.tv_sec * 1000000ULL + ts.tv_nsec/1000;
}
+unsigned long long FAST_FUNC monotonic_ms(void)
+{
+ struct timespec ts;
+ get_mono(&ts);
+ return ts.tv_sec * 1000ULL + ts.tv_nsec/1000000;
+}
unsigned FAST_FUNC monotonic_sec(void)
{
struct timespec ts;
gettimeofday(&tv, NULL);
return tv.tv_sec * 1000000ULL + tv.tv_usec;
}
+unsigned long long FAST_FUNC monotonic_ms(void)
+{
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ return tv.tv_sec * 1000ULL + tv.tv_usec / 1000;
+}
unsigned FAST_FUNC monotonic_sec(void)
{
return time(NULL);
projects / oweals / busybox.git / blobdiff