SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

time-util: extract parse_calendar_date() from sysupdate

Browse Source 
Move the YYYY-MM-DD date parsing and validation logic from
sysupdate-resource.c into a shared parse_calendar_date() function
in time-util, so it can be reused by other subsystems.
This commit is contained in:
Dylan M. Taylor
2026-03-18 09:39:06 -04:00
parent fb2cf9f557
commit 770958e24a
4 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sysupdate/sysupdate-resource.c
+3 -17
View File
@@ -433,24 +433,10 @@ static int process_magic_file(
if (iovec_memcmp(&IOVEC_MAKE(expected_hash, sizeof(expected_hash)), hash) != 0)
log_warning("Hash of best before marker file '%s' has unexpected value, proceeding anyway.", fn);
struct tm parsed_tm = {};
const char *n = strptime(e, "%Y-%m-%d", &parsed_tm);
if (!n || *n != 0) {
/* Doesn't parse? Then it's not a best-before date */
log_warning("Found best before marker with an invalid date, ignoring: %s", fn);
return 0;
}
struct tm copy_tm = parsed_tm;
usec_t best_before;
r = mktime_or_timegm_usec(&copy_tm, /* utc= */ true, &best_before);
if (r < 0)
return log_error_errno(r, "Failed to convert best before time: %m");
if (copy_tm.tm_mday != parsed_tm.tm_mday ||
copy_tm.tm_mon != parsed_tm.tm_mon ||
copy_tm.tm_year != parsed_tm.tm_year) {
/* date was not normalized? (e.g. "30th of feb") */
log_warning("Found best before marker with a non-normalized data, ignoring: %s", fn);
r = parse_calendar_date(e, &best_before);
if (r < 0) {
log_warning_errno(r, "Found best before marker with an invalid date, ignoring: %s", fn);
return 0;
}