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

libbb: code shrink parse_datestr (again)

Browse Source 
Commit 9fe1548bb (date,touch: allow timezone offsets in dates)
mentioned the similarity between '@' format dates and those with
timezone offsets.  It didn't notice that as a result there's
common code which can be shared.

function                                             old     new   delta
parse_datestr                                        730     687     -43
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-43)             Total: -43 bytes

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston 2021-09-18 08:40:44 +01:00 committed by Denys Vlasenko
parent 6d2463ac01
commit f27a6a94a7
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libbb/time.c
View File

@ -13,6 +13,7 @@
int FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm) int FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
{ {
char end = '\0'; char end = '\0';
time_t t;
#if ENABLE_DESKTOP #if ENABLE_DESKTOP
/* /*
* strptime is BIG: ~1k in uclibc, ~10k in glibc * strptime is BIG: ~1k in uclibc, ~10k in glibc
@ -29,10 +30,10 @@ int FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
"%b %d %T %Y" "\0" /* month_name d HH:MM:SS YYYY */ "%b %d %T %Y" "\0" /* month_name d HH:MM:SS YYYY */
"%Y-%m-%d %R" "\0" /* yyyy-mm-dd HH:MM */ "%Y-%m-%d %R" "\0" /* yyyy-mm-dd HH:MM */
"%Y-%m-%d %T" "\0" /* yyyy-mm-dd HH:MM:SS */ "%Y-%m-%d %T" "\0" /* yyyy-mm-dd HH:MM:SS */
#if ENABLE_FEATURE_TIMEZONE # if ENABLE_FEATURE_TIMEZONE
"%Y-%m-%d %R %z" "\0" /* yyyy-mm-dd HH:MM TZ */ "%Y-%m-%d %R %z" "\0" /* yyyy-mm-dd HH:MM TZ */
"%Y-%m-%d %T %z" "\0" /* yyyy-mm-dd HH:MM:SS TZ */ "%Y-%m-%d %T %z" "\0" /* yyyy-mm-dd HH:MM:SS TZ */
#endif # endif
"%Y-%m-%d %H" "\0" /* yyyy-mm-dd HH */ "%Y-%m-%d %H" "\0" /* yyyy-mm-dd HH */
"%Y-%m-%d" "\0" /* yyyy-mm-dd */ "%Y-%m-%d" "\0" /* yyyy-mm-dd */
/* extra NUL */; /* extra NUL */;
@ -45,11 +46,8 @@ int FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
while (*fmt) { while (*fmt) {
endp = strptime(date_str, fmt, ptm); endp = strptime(date_str, fmt, ptm);
if (endp && *endp == '\0') { if (endp && *endp == '\0') {
#if ENABLE_FEATURE_TIMEZONE # if ENABLE_FEATURE_TIMEZONE
if (strchr(fmt, 'z')) { if (strchr(fmt, 'z')) {
time_t t;
struct tm *utm;
/* we have timezone offset: obtain Unix time_t */ /* we have timezone offset: obtain Unix time_t */
ptm->tm_sec -= ptm->tm_gmtoff; ptm->tm_sec -= ptm->tm_gmtoff;
ptm->tm_isdst = 0; ptm->tm_isdst = 0;
@ -57,13 +55,9 @@ int FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
if (t == (time_t)-1) if (t == (time_t)-1)
break; break;
/* convert Unix time_t to struct tm in user's locale */ /* convert Unix time_t to struct tm in user's locale */
utm = localtime(&t); goto localise;
if (!utm)
break;
*ptm = *utm;
return 0;
} }
#endif # endif
return 1; return 1;
} }
*ptm = save; *ptm = save;
@ -141,13 +135,14 @@ int FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
} else } else
#endif /* ENABLE_DESKTOP */ #endif /* ENABLE_DESKTOP */
if (date_str[0] == '@') { if (date_str[0] == '@') {
time_t t;
if (sizeof(t) <= sizeof(long)) if (sizeof(t) <= sizeof(long))
t = bb_strtol(date_str + 1, NULL, 10); t = bb_strtol(date_str + 1, NULL, 10);
else /* time_t is 64 bits but longs are smaller */ else /* time_t is 64 bits but longs are smaller */
t = bb_strtoll(date_str + 1, NULL, 10); t = bb_strtoll(date_str + 1, NULL, 10);
if (!errno) { if (!errno) {
struct tm *lt = localtime(&t); struct tm *lt;
IF_FEATURE_TIMEZONE(localise:)
lt = localtime(&t);
if (lt) { if (lt) {
*ptm = *lt; *ptm = *lt;
return 0; return 0;