From nobody Mon Feb 5 20:38:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TTJB94hf8z58xSp; Mon, 5 Feb 2024 20:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TTJB91T2Dz4q1n; Mon, 5 Feb 2024 20:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707165521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ng73KUuFJUeMGEbDOgv39eNj91v4Q2hqlM8glYFQujs=; b=qPVNq1oiANayZt6rPZNqDREokTvA1orNqaVeGHXc0f92XZXK6qvlA1dkGlwcvhY0YsvUfo 8xzPe9USKLSc+j+MF2lCfm0qy3bT4JerMadb24SG2bFsE4Av+LviVh3k1GmSvqjQ8yMkrj /9Hf1wutHmG/TNwGepM3ujyOl3Rn4Oa/N1Qc3fpYuu5kKhYVZgXOp5eYz1HFD2z9mb9O41 xUsPF3CoHhxJePglRTYSP+G0l6SypwPRga0hMaBMw5ubHKL1KiA7H/tHSBx47ipkGVEFVZ YV2hi2APEhS4K/o1SsTJm0YDTQhGAl3x6OtR8F/vEUVXO2HWXH8ZGsFDcHZQQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707165521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ng73KUuFJUeMGEbDOgv39eNj91v4Q2hqlM8glYFQujs=; b=RW5mrlQIcBe/Zj6m1U1+KJXVTJRkbjGhu3Pc72UUCflMYhJILFlxzXwpfHdlo28qpQzQsv fy70DxJpZ+TjDMMHrGtWHM8+IyzcgcJXMXormJugaSjybnAg9Qh39yv6V4jj2Rm6nRx8pb wCUyUSTIsjsFjlsnJyrm/UKJEz05q0l98MXp4FGWp/ypHom7H3uTEkZroAOPAHVK0uk7lF ls3ER8EUT2JkoHIKg95lKmyiqEXQWsREPdypZKi+yxEWclxrDMWGXbkXhOUwoTZcdX2O+M B+Tjp3memzuyPjKWVYH+A1sglUw1DUBZTRODoCQmsBfoH4zrJ/W1OQUswIklRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707165521; a=rsa-sha256; cv=none; b=evKZrniD/dNZffg6xPC5Vmy+3pCCcWJSXiW8bjemfyG89iOJmthDZnLxGJQgldHH+Mic6D cSSin2u98tOsT4j2fQOIzlLAvpMyiEApwly4sJH3Trcmo/KoF1uOFP2WoO6xi4vi+UWSAT FxYYcpr7ZrLprOhfXLF0oCCKsnCpPh9oFuQXzKCujjA7UbIYqrFqppDjJJND6FxAhmIP3n /Fa0uR5j9EhQgp93Uv7A4cdAE6ChWwwVUhLKm439Yme86YuVMfK5cPE5fijXNfxjeKri77 Zf/mOGcH/O8BdGkq37U4SRO8O1x2k+1zmjFy0Hz9Nsvy1jPM21pUx69MpH2SNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TTJB90ZfCzvXY; Mon, 5 Feb 2024 20:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 415Kcepi069492; Mon, 5 Feb 2024 20:38:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 415KcebP069489; Mon, 5 Feb 2024 20:38:40 GMT (envelope-from git) Date: Mon, 5 Feb 2024 20:38:40 GMT Message-Id: <202402052038.415KcebP069489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 10f1b536ad71 - main - libc: move __getosreldate to libsys List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10f1b536ad71fddc725da58d9e30a42fa66d183c Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=10f1b536ad71fddc725da58d9e30a42fa66d183c commit 10f1b536ad71fddc725da58d9e30a42fa66d183c Author: Brooks Davis AuthorDate: 2023-11-17 20:13:40 +0000 Commit: Brooks Davis CommitDate: 2024-02-05 20:34:56 +0000 libc: move __getosreldate to libsys Reviewed by: kib, emaste, imp Pull Request: https://github.com/freebsd/freebsd-src/pull/908 --- lib/libc/gen/Makefile.inc | 2 +- lib/libsys/Makefile.sys | 1 + lib/{libc/gen => libsys}/__getosreldate.c | 15 +-------------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 6d1f98c241d4..bbd090e46b27 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -6,7 +6,7 @@ CONFS+= group master.passwd shells CONFSMODE_master.passwd= 600 CONFSPACKAGE= runtime -SRCS+= __getosreldate.c \ +SRCS+= \ __pthread_mutex_init_calloc_cb_stub.c \ __xuname.c \ _pthread_stubs.c \ diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index e299396585b9..f7fd08f1702d 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -32,6 +32,7 @@ PSEUDO+= _clock_gettime.o _gettimeofday.o # Sources common to both syscall interfaces: SRCS+= \ __error.c \ + __getosreldate.c \ _once_stub.c \ getpagesize.c \ getpagesizes.c \ diff --git a/lib/libc/gen/__getosreldate.c b/lib/libsys/__getosreldate.c similarity index 83% rename from lib/libc/gen/__getosreldate.c rename to lib/libsys/__getosreldate.c index 053ec4c94a9b..0bb2efd2ba6a 100644 --- a/lib/libc/gen/__getosreldate.c +++ b/lib/libsys/__getosreldate.c @@ -44,23 +44,10 @@ int __getosreldate(void) { static int osreldate; - size_t len; - int oid[2]; - int error, osrel; if (osreldate != 0) return (osreldate); - error = _elf_aux_info(AT_OSRELDATE, &osreldate, sizeof(osreldate)); - if (error == 0 && osreldate != 0) - return (osreldate); - - oid[0] = CTL_KERN; - oid[1] = KERN_OSRELDATE; - osrel = 0; - len = sizeof(osrel); - error = sysctl(oid, 2, &osrel, &len, NULL, 0); - if (error == 0 && osrel > 0 && len == sizeof(osrel)) - osreldate = osrel; + (void)_elf_aux_info(AT_OSRELDATE, &osreldate, sizeof(osreldate)); return (osreldate); }