Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Apr 2026 20:08:49 +0000
From:      Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 76f642310d55 - main - tzcode: Update to 2026b
Message-ID:  <69ebcdd1.333a1.33bfe666@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=76f642310d55b1d3892c1b1626c427d12f97de3a

commit 76f642310d55b1d3892c1b1626c427d12f97de3a
Merge: b40205855e10 b17ccc1f4591
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-04-24 20:07:20 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-04-24 20:07:20 +0000

    tzcode: Update to 2026b
    
    MFC after:      1 week

 contrib/tzcode/NEWS         |  53 ++++++++++++---
 contrib/tzcode/tz-art.html  |   2 +-
 contrib/tzcode/tz-link.html |  22 +++++--
 contrib/tzcode/version      |   2 +-
 contrib/tzcode/zic.c        | 156 +++++++++++++++++++++++++++++---------------
 5 files changed, 166 insertions(+), 69 deletions(-)

diff --cc contrib/tzcode/zic.c
index d1084b4a25e9,7ecf3b9115f3..f4c1aa6d54e6
--- a/contrib/tzcode/zic.c
+++ b/contrib/tzcode/zic.c
@@@ -1486,14 -1491,13 +1491,16 @@@ get_rand_u64(void
    static int nwords;
    if (!nwords) {
      ssize_t s;
-     do
+     for (;; check_for_signal()) {
        s = getrandom(entropy_buffer, sizeof entropy_buffer, 0);
-     while (s < 0 && errno == EINTR);
+       if (! (s < 0 && errno == EINTR))
+ 	break;
+     }
  
 -    nwords = s < 0 ? -1 : s / sizeof *entropy_buffer;
 +    if (s < 0)
 +      nwords = -1;
 +    else
 +      nwords = s / sizeof *entropy_buffer;
    }
    if (0 < nwords)
      return entropy_buffer[--nwords];
@@@ -1614,15 -1622,7 +1625,15 @@@ open_outfile(char const **outname, cha
    if (!*tempname)
      random_dirent(outname, tempname);
  
 +  /*
 +   * Remove old file, if any, to snap links.
 +   */
 +  if (remove(*outname) != 0 && errno != ENOENT && errno != EISDIR) {
 +    fprintf(stderr, _("can't remove %s"), *outname);
 +    exit(EXIT_FAILURE);
 +  }
 +
-   while (true) {
+   for (;; check_for_signal()) {
      int oflags = O_WRONLY | O_BINARY | O_CREAT | O_EXCL;
      int fd = open(*outname, oflags, creat_perms);
      int err;


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ebcdd1.333a1.33bfe666>