- tz - lists.iana.org

[PROPOSED 1/2] Refactor duplicate duplicate-option code
by Paul Eggert Oct. 24, 2025

Oct. 24, 2025

* zic.c (duplicate_options): New function. (main): Use it. --- zic.c | 73 +++++++++++++++++++---------------------------------------- 1 file changed, 23 insertions(+), 50 deletions(-) diff --git a/zic.c b/zic.c index 67bcaa43..34e7d91c 100644 --- a/zic.c +++ b/zic.c @@ -708,6 +708,13 @@ close_file(FILE *stream, char const *dir, char const *name, } } +ATTRIBUTE_NORETURN static void +duplicate_options(char const *opt) +{ + fprintf(stderr, _("%s: More than one %s option specified\n"), progname, opt); + exit(EXIT_FAILURE); +} + ATTRIBUTE_NORETURN static void usage(FILE *stream, int status) { @@ -1063,73 +1070,39 @@ main(int argc, char **argv) error(_("invalid option: -b '%s'"), optarg); break; case 'd': - if (directory == NULL) - directory = optarg; - else { - fprintf(stderr, - _("%s: More than one -d option" - " specified\n"), - progname); - return EXIT_FAILURE; - } + if (directory) + duplicate_options("-d"); + directory = optarg; break; case 'l': - if (lcltime == NULL) - lcltime = optarg; - else { - fprintf(stderr, - _("%s: More than one -l option" - " specified\n"), - progname); - return EXIT_FAILURE; - } + if (lcltime) + duplicate_options("-l"); + lcltime = optarg; break; case 'p': - if (psxrules == NULL) - psxrules = optarg; - else { - fprintf(stderr, - _("%s: More than one -p option" - " specified\n"), - progname); - return EXIT_FAILURE; - } + if (psxrules) + duplicate_options("-p"); + psxrules = optarg; break; case 't': - if (tzdefault != NULL) { - fprintf(stderr, - _("%s: More than one -t option" - " specified\n"), - progname); - return EXIT_FAILURE; - } + if (tzdefault) + duplicate_options("-t"); tzdefault = optarg; break; case 'y': warning(_("-y ignored")); break; case 'L': - if (leapsec == NULL) - leapsec = optarg; - else { - fprintf(stderr, - _("%s: More than one -L option" - " specified\n"), - progname); - return EXIT_FAILURE; - } + if (leapsec) + duplicate_options("-L"); + leapsec = optarg; break; case 'v': noise = true; break; case 'r': - if (timerange_given) { - fprintf(stderr, - _("%s: More than one -r option" - " specified\n"), - progname); - return EXIT_FAILURE; - } + if (timerange_given) + duplicate_options("-r"); if (! timerange_option(optarg)) { fprintf(stderr, _("%s: invalid time range: %s\n"), -- 2.48.1

1 1

South Africa Daylight Saving Time
by Saras Sing Oct. 21, 2025

Oct. 21, 2025

https://www.timeanddate.com/time/change/south-africa?year=1942 https://www.timeanddate.com/time/change/south-africa?year=1944 https://www.timeanddate.com/time/change/south-africa Hello South Africa has Daylight Saving Time every year from September to March South African Daylight Saving Time starts at every first Sunday of September from GMT/UTC+02:00 00:00 to 01:00 to GMT/UTC+03:00 South African Daylight Saving Time ends at every last Sunday of March from GMT/UTC+03:00 01:00 to 00:00 back to South Africa Standard Time GMT/UTC+02:00 Thank you

5 4

[PROPOSED 1/3] zic now uses is_digit
by Paul Eggert Oct. 18, 2025

Oct. 18, 2025

Refactor zic.c to use is_digit like others use. * zic.c (is_digit): New static function, copied from localtime.c and from zdump.c. It’s too bad we can’t avoid duplication by putting this into private.h, because gcc -Wunused-function would then complain about it. Perhaps ‘inline’ would pacify gcc but then we’d have to port ‘inline’ to ancient compilers and anyway ‘inline’ is supposed to be just a performance hint which is not needed here. --- zic.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/zic.c b/zic.c index 39e1e2bc..30426621 100644 --- a/zic.c +++ b/zic.c @@ -229,6 +229,13 @@ static bool rulesub(struct rule * rp, const char * dayp, const char * timep); static zic_t tadd(zic_t t1, zic_t t2); +/* Is C an ASCII digit? */ +static bool +is_digit(char c) +{ + return '0' <= c && c <= '9'; +} + /* Bound on length of what %z can expand to. */ enum { PERCENT_Z_LEN_BOUND = sizeof "+995959" - 1 }; @@ -1852,7 +1859,7 @@ gethms(char const *string, char const *errstring) &hh, &hhx, &mm, &mmx, &ss, &ssx, &tenths, &xr, &xs)) { default: ok = false; break; case 8: - ok = '0' <= xr && xr <= '9'; + ok = is_digit(xr); ATTRIBUTE_FALLTHROUGH; case 7: ok &= ssx == '.'; @@ -3952,7 +3959,7 @@ newabbr(const char *string) cp = string; mp = NULL; - while (is_alpha(*cp) || ('0' <= *cp && *cp <= '9') + while (is_alpha(*cp) || is_digit(*cp) || *cp == '-' || *cp == '+') ++cp; if (noise && cp - string < 3) -- 2.51.0

1 2

[PROPOSED] New compile-time option THREAD_TM_MULTI
by Paul Eggert Oct. 14, 2025

Oct. 14, 2025

* Makefile, NEWS: Mention it. * localtime.c (THREAD_TM_MULTI): Default to 0. The remaining changes affect only the THREAD_TM_MULTI case. (enum tm_multi): New enum. (N_TM_MULTI): New constant. (tm_multi_key, tm_multi_key_err): New static vars. (tm_multi): New static function. (localtime, gmtime, offtime): Use it. --- Makefile | 8 ++++++++ NEWS | 9 +++++++++ localtime.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 70 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8939869a..b172542a 100644 --- a/Makefile +++ b/Makefile @@ -316,6 +316,14 @@ LDLIBS= # This can improve paralellism and thus save real time # if many threads call tzcode functions simultaneously. # It also costs CPU time and thus energy. +# -DTHREAD_TM_MULTI to have gmtime, localtime, and offtime +# return different struct tm * addresses in different threads. +# This supports unportable programs that call +# gmtime/localtime/offtime when they should call +# gmtime_r/localtime_r/offtime_r to avoid races. +# Because the corresponding storage is freed on thread exit, +# this option is incompatible with POSIX.1-2024 and earlier. +# It also costs CPU time and memory. # -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t # This is intended for internal use only; it mangles external names. # -DTZ_CHANGE_INTERVAL=N if functions depending on TZ should check diff --git a/NEWS b/NEWS index 5bfb7bb4..46bf48ed 100644 --- a/NEWS +++ b/NEWS @@ -80,6 +80,15 @@ Unreleased, experimental changes rarely changing and many threads call tzcode simultaneously. It costs more CPU time and energy. + The new CFLAGS option -TTHREAD_TM_MULTI causes localtime to return + a pointer to thread-specific memory, as FreeBSD does, instead of + to the same memory in all threads. This supports unportable + programs that incorrectly use localtime instead of localtime_r. + This option affects gmtime and offtime similarly to localtime. + Because the corresponding storage is freed on thread exit, this + option is incompatible with POSIX.1-2024 and earlier. It also + costs CPU time and memory. + tzcode now uses mempcpy if available, guessing its availability. Compile with -DHAVE_MEMPCPY=1 or 0 to override the guess. diff --git a/localtime.c b/localtime.c index 1191f810..709b954c 100644 --- a/localtime.c +++ b/localtime.c @@ -52,6 +52,10 @@ struct stat { char st_ctime, st_dev, st_ino; } # define THREAD_RWLOCK 0 #endif +#ifndef THREAD_TM_MULTI +# define THREAD_TM_MULTI 0 +#endif + #if THREAD_SAFE # include <pthread.h> @@ -171,6 +175,52 @@ once(once_t *once_control, void (*init_routine)(void)) #endif } +enum tm_multi { LOCALTIME_TM_MULTI, GMTIME_TM_MULTI, OFFTIME_TM_MULTI }; + +#if THREAD_SAFE && THREAD_TM_MULTI + +enum { N_TM_MULTI = OFFTIME_TM_MULTI + 1 }; +static pthread_key_t tm_multi_key; +static int tm_multi_key_err; + +static void +tm_multi_key_init(void) +{ + tm_multi_key_err = pthread_key_create(&tm_multi_key, free); +} + +#endif + +/* Return TMP, or a thread-specific struct tm * selected by WHICH. */ +static struct tm * +tm_multi(struct tm *tmp, ATTRIBUTE_MAYBE_UNUSED enum tm_multi which) +{ +#if THREAD_SAFE && THREAD_TM_MULTI + /* It is OK to check is_threaded() separately here; even if it + returns a different value in other places in the caller, + this function's behavior is still valid. */ + if (is_threaded()) { + /* Try to get a thread-specific struct tm *. + Fall back on TMP if this fails. */ + static pthread_once_t tm_multi_once = PTHREAD_ONCE_INIT; + pthread_once(&tm_multi_once, tm_multi_key_init); + if (!tm_multi_key_err) { + struct tm *p = pthread_getspecific(tm_multi_key); + if (!p) { + p = malloc(N_TM_MULTI * sizeof *p); + if (p && pthread_setspecific(tm_multi_key, p) != 0) { + free(p); + p = NULL; + } + } + if (p) + return &p[which]; + } + } +#endif + return tmp; +} + /* Unless intptr_t is missing, pacify gcc -Wcast-qual on char const * exprs. Use this carefully, as the casts disable type checking. This is a macro so that it can be used in static initializers. */ @@ -2156,7 +2206,7 @@ localtime(const time_t *timep) # if !SUPPORT_C89 static struct tm tm; # endif - return localtime_tzset(timep, &tm, true); + return localtime_tzset(timep, tm_multi(&tm, LOCALTIME_TM_MULTI), true); } struct tm * @@ -2208,7 +2258,7 @@ gmtime(const time_t *timep) # if !SUPPORT_C89 static struct tm tm; # endif - return gmtime_r(timep, &tm); + return gmtime_r(timep, tm_multi(&tm, GMTIME_TM_MULTI)); } # if STD_INSPIRED @@ -2229,7 +2279,7 @@ offtime(time_t const *timep, long offset) # if !SUPPORT_C89 static struct tm tm; # endif - return offtime_r(timep, offset, &tm); + return offtime_r(timep, offset, tm_multi(&tm, OFFTIME_TM_MULTI)); } # endif -- 2.48.1

1 0

[PROPOSED 1/3] Define fullname only if needed
by Paul Eggert Oct. 14, 2025

Oct. 14, 2025

* localtime.c (union local_storage): Define fullname member only if needed. This saves space on unlikely platforms where sizeof (struct file_analysis) < PATH_MAX, and is closer to FreeBSD. (tzloadbody): Mention fullname only if declared. --- localtime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/localtime.c b/localtime.c index a78962a6..c9836b2d 100644 --- a/localtime.c +++ b/localtime.c @@ -771,7 +771,7 @@ union local_storage { struct state st; } u; -#ifdef PATH_MAX +#if defined PATH_MAX && !OPENAT_TZDIR && !SUPPRESS_TZDIR /* The name of the file to be opened. */ char fullname[PATH_MAX]; #endif @@ -890,7 +890,7 @@ tzloadbody(char const *name, struct state *sp, char tzloadflags, cp = mempcpy(lsp, tzdirslash, tzdirslashlen); cp = mempcpy(cp, name, namelen); *cp = '\0'; -#ifdef PATH_MAX +#if defined PATH_MAX && !OPENAT_TZDIR && !SUPPRESS_TZDIR name = lsp->fullname; #else name = (char *) lsp; -- 2.48.1

1 2

[PROPOSED 1/2] Simplify function parameter decl style
by Paul Eggert Oct. 14, 2025

Oct. 14, 2025

* localtime.c (time2sub, time2, time1): Use simpler style for declaring function parameters. Although this style has worked since C89, I didn’t know about it until reading Jens Gustedt’s book Modern C. Switching to this style now can simplify future future changes that also use a functional programming style. --- localtime.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/localtime.c b/localtime.c index 63b8ea0a..24972b20 100644 --- a/localtime.c +++ b/localtime.c @@ -2442,8 +2442,8 @@ mktmcpy(struct tm *dest, struct tm const *src) static time_t time2sub(struct tm *const tmp, - struct tm *(*funcp)(struct state const *, time_t const *, - int_fast32_t, struct tm *), + struct tm *funcp(struct state const *, time_t const *, + int_fast32_t, struct tm *), struct state const *sp, const int_fast32_t offset, bool *okayp, @@ -2661,8 +2661,8 @@ label: static time_t time2(struct tm * const tmp, - struct tm *(*funcp)(struct state const *, time_t const *, - int_fast32_t, struct tm *), + struct tm *funcp(struct state const *, time_t const *, + int_fast32_t, struct tm *), struct state const *sp, const int_fast32_t offset, bool *okayp) @@ -2680,8 +2680,8 @@ time2(struct tm * const tmp, static time_t time1(struct tm *const tmp, - struct tm *(*funcp)(struct state const *, time_t const *, - int_fast32_t, struct tm *), + struct tm *funcp(struct state const *, time_t const *, + int_fast32_t, struct tm *), struct state const *sp, const int_fast32_t offset) { -- 2.48.1

1 1

[PROPOSED] Port recent PATH_MAX change to strict C23
by Paul Eggert Oct. 13, 2025

Oct. 13, 2025

* localtime.c (tzdirslashlen): Now an enum, not a const size_t, as strict C23 requires this for the static_assert that uses tzdirslashlen when PATH_MAX is defined. --- localtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localtime.c b/localtime.c index 3f3bdce5..ec13ed71 100644 --- a/localtime.c +++ b/localtime.c @@ -676,7 +676,7 @@ union input_buffer { ATTRIBUTE_NONSTRING #endif static char const tzdirslash[sizeof TZDIR + OPENAT_TZDIR] = TZDIR "/"; -static size_t const tzdirslashlen = sizeof TZDIR; +enum { tzdirslashlen = sizeof TZDIR }; /* Local storage needed for 'tzloadbody'. */ union local_storage { -- 2.48.1

3 5

[PROPOSED 1/2] Optionally use read-write locks instead of mutexes
by Paul Eggert Oct. 12, 2025

Oct. 12, 2025

This avoids bottlenecks when many threads access local time but no thread is changing TZ. It costs CPU time and energy. * Makefile, NEWS: Mention this. * localtime.c (THREAD_RWLOCK): New macro, defaulting to 0. (locallock) [THREAD_RWLOCK]: Now of type pthread_rwlock_t, not pthread_mutex_t. All uses changed. (rd2wrlock): New function. (tzset_unlocked): If THREAD_RWLOCK, upgrade the read lock to a write lock if needed. (tzset_unlocked, gmtcheck): Upgrade the read to a write lock in the unlikely case where writing is needed. --- Makefile | 5 +++ NEWS | 5 +++ localtime.c | 100 +++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 82 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 85c2c50b..c2c82c3a 100644 --- a/Makefile +++ b/Makefile @@ -304,6 +304,11 @@ LDLIBS= # -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; # not needed by the main-program tz code, which is single-threaded. # Append other compiler flags as needed, e.g., -pthread on GNU/Linux. +# The following option can also be used: +# -DTHREAD_RWLOCK to use read-write locks intead of mutexes. +# This can improve paralellism and thus save real time +# if many threads call tzcode functions simultaneously. +# It also costs CPU time and thus energy. # -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t # This is intended for internal use only; it mangles external names. # -DTZ_CHANGE_INTERVAL=N if functions depending on TZ should check diff --git a/NEWS b/NEWS index 64d9336d..8ba97ab4 100644 --- a/NEWS +++ b/NEWS @@ -68,6 +68,11 @@ Unreleased, experimental changes transition begun in release 96k, which removed spaces in tzdata because the spaces break time string parsers. + The new CFLAGS option -DTHREAD_RWLOCK uses read-write locks, as + macOS does, instead of mutexes. This saves real time when TZ is + rarely changing and many threads call tzcode simultaneously. + It costs more CPU time and energy. + tzcode now uses mempcpy if available, guessing its availability. Compile with -DHAVE_MEMPCPY=1 or 0 to override the guess. diff --git a/localtime.c b/localtime.c index ec13ed71..3a38ef04 100644 --- a/localtime.c +++ b/localtime.c @@ -44,16 +44,39 @@ struct stat { char st_ctime, st_dev, st_ino; } # define st_ctim st_ctimespec #endif +#ifndef THREAD_RWLOCK +# define THREAD_RWLOCK 0 +#endif + #if defined THREAD_SAFE && THREAD_SAFE # include <pthread.h> +# if THREAD_RWLOCK +static pthread_rwlock_t locallock = PTHREAD_RWLOCK_INITIALIZER; +static int lock(void) { return pthread_rwlock_rdlock(&locallock); } +static void unlock(void) { pthread_rwlock_unlock(&locallock); } +# else static pthread_mutex_t locallock = PTHREAD_MUTEX_INITIALIZER; static int lock(void) { return pthread_mutex_lock(&locallock); } static void unlock(void) { pthread_mutex_unlock(&locallock); } +# endif #else static int lock(void) { return 0; } static void unlock(void) { } #endif +/* Upgrade a read lock to a write lock. + Return 0 on success, an errno value otherwise. */ +static int +rd2wrlock(void) +{ +# if THREAD_RWLOCK + unlock(); + return pthread_rwlock_wrlock(&locallock); +# else + return 0; +# endif +} + /* Unless intptr_t is missing, pacify gcc -Wcast-qual on char const * exprs. Use this carefully, as the casts disable type checking. This is a macro so that it can be used in static initializers. */ @@ -1733,38 +1756,55 @@ zoneinit(struct state *sp, char const *name, char tzloadflags) } /* Like tzset(), but in a critical section. + If THREAD_RWLOCK the caller has a read lock, + and this function might ugrade it to a write lock. If tz_change_interval is positive the time is NOW; otherwise ignore NOW. */ static void tzset_unlocked(monotime_t now) { - char const *name = getenv("TZ"); - struct state *sp = lclptr; - char tzloadflags = TZLOAD_FROMENV | TZLOAD_TZSTRING; - size_t namelen = sizeof lcl_TZname + 1; /* placeholder for no name */ - - if (name) { - namelen = strnlen(name, sizeof lcl_TZname); - - /* Abbreviate a string like "/usr/share/zoneinfo/America/Los_Angeles" - to its shorter equivalent "America/Los_Angeles". */ - if (!SUPPRESS_TZDIR && tzdirslashlen < namelen - && memcmp(name, tzdirslash, tzdirslashlen) == 0) { - char const *p = name + tzdirslashlen; - while (*p == '/') - p++; - if (*p && *p != ':') { - name = p; - namelen = strnlen(name, sizeof lcl_TZname); - tzloadflags |= TZLOAD_TZDIR_SUB; + char const *name; + struct state *sp; + char tzloadflags; + size_t namelen; + bool writing = false; + + for (;;) { + name = getenv("TZ"); + sp = lclptr; + tzloadflags = TZLOAD_FROMENV | TZLOAD_TZSTRING; + namelen = sizeof lcl_TZname + 1; /* placeholder for no name */ + + if (name) { + namelen = strnlen(name, sizeof lcl_TZname); + + /* Abbreviate a string like "/usr/share/zoneinfo/America/Los_Angeles" + to its shorter equivalent "America/Los_Angeles". */ + if (!SUPPRESS_TZDIR && tzdirslashlen < namelen + && memcmp(name, tzdirslash, tzdirslashlen) == 0) { + char const *p = name + tzdirslashlen; + while (*p == '/') + p++; + if (*p && *p != ':') { + name = p; + namelen = strnlen(name, sizeof lcl_TZname); + tzloadflags |= TZLOAD_TZDIR_SUB; + } } } + + if ((tz_change_interval <= 0 ? tz_change_interval < 0 : fresh_tzdata(now)) + && (name + ? 0 < lcl_is_set && strcmp(lcl_TZname, name) == 0 + : lcl_is_set < 0)) + return; + + if (!THREAD_RWLOCK || writing) + break; + if (rd2wrlock() != 0) + return; + writing = true; } - if ((tz_change_interval <= 0 ? tz_change_interval < 0 : fresh_tzdata(now)) - && (name - ? 0 < lcl_is_set && strcmp(lcl_TZname, name) == 0 - : lcl_is_set < 0)) - return; # if ALL_STATE if (! sp) lclptr = sp = malloc(sizeof *lclptr); @@ -1829,12 +1869,16 @@ gmtcheck(void) if (lock() != 0) return; if (! gmt_is_set) { + if (rd2wrlock() != 0) + return; + if (!THREAD_RWLOCK || !gmt_is_set) { #if ALL_STATE - gmtptr = malloc(sizeof *gmtptr); + gmtptr = malloc(sizeof *gmtptr); #endif - if (gmtptr) - gmtload(gmtptr); - gmt_is_set = true; + if (gmtptr) + gmtload(gmtptr); + gmt_is_set = true; + } } unlock(); } -- 2.51.0

1 1

[PROPOSED] Port better to platforms lacking mempcpy
by Paul Eggert Oct. 12, 2025

Oct. 12, 2025

* private.h (mempcpy) [!HAVE_MEMPCPY]: Args are pointer to void, not pointer to char, for compatibility with glibc. --- private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/private.h b/private.h index f6f12aa2..befa6db1 100644 --- a/private.h +++ b/private.h @@ -844,7 +844,7 @@ extern char **environ; #endif #if !HAVE_MEMPCPY static void * -mempcpy(char *restrict s1, char const *restrict s2, size_t n) +mempcpy(void *restrict s1, void const *restrict s2, size_t n) { char *p = memcpy(s1, s2, n); return p + n; -- 2.51.0

1 0

[PROPOSED 1/3] tzset sets errno if lock fails
by Paul Eggert Oct. 10, 2025

Oct. 10, 2025

* localtime.c (tzset): Set errno if the lock fails. This should never happen, but if it does the least we can do is set errno, as other functions do. --- localtime.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/localtime.c b/localtime.c index 54db0ab7..ef094560 100644 --- a/localtime.c +++ b/localtime.c @@ -1788,8 +1788,11 @@ void tzset(void) { monotime_t now = get_monotonic_time(); - if (lock() != 0) + int err = lock(); + if (err != 0) { + errno = err; return; + } tzset_unlocked(now); unlock(); } -- 2.51.0

1 3