From nobody Fri Jun 28 10:17:15 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 4W9WZg4FnNz5FCx8; Fri, 28 Jun 2024 10:17:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9WZg3FFDz4nFJ; Fri, 28 Jun 2024 10:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719569835; 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=0XD6vnSF1znq/D6NTOfs2O2bIxq4szlWaVtR5vKF084=; b=PX22MA3Z+RXeq+9Wme72DscdowDx95mqJVHhR8WKz94tAVJbIJle93q5M3bqGJFbV32+5x O+mMI9FmPzi0IA+Qn47/1jTl0jka21YPIpM4kza354rIRvtRpwVuu4tP6/Kjv/7FymAx6t CnUoFT21nFh75u/AOUCUbjgS1Dd7ngvjbkqGWufaTinMRfMMpqAu0PT8SdM2NTUDCbRLXl HbzZlIlWZ+PpRsoQljdTmkG3m3SqDrV+gMciWFQCsDzbtOB5X0Mz+l1CLk3SGmgtXygEGX Xldlu+EbhSqn2kx20LO3mWv5/3CGUVlVI10N0GLj3Ltd4XEmYRcsKpA3Cc5gkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719569835; a=rsa-sha256; cv=none; b=sHpVuNizJvQ8kqAUsCz42AV3oNOoYODxbINlWRe0zx+UIIDXJLaMpp8ixTNs0FpijnZ6uY wmbmkCBSsH0YfbuML9Dor2LtNhTK78VPtu+MO8Mrnne3a/nKZxUKDBbw45WDzIjHFC+mpR ZxGKhr9PXiHAu2N1vdkjYJ93xi2V/Un9f59INVYBzxZrgTuc/Grx0Ym7X7p0TBpuU9LetG Meid9dIEZY7hGP9+knf2TmqirdAES+y09twKVysw4HpeJBQmO7bgmFEvucHz0fAbWbgMV7 qoJ1oKmyRJlrLh6njqyHBivXofhLCD30lRVxF0RKFUbvk0XTIHnjVefBfWzrng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719569835; 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=0XD6vnSF1znq/D6NTOfs2O2bIxq4szlWaVtR5vKF084=; b=JvLDONKd8zaNbQkQ8YpVexG1HkGlX0brIDBRHzhXvNT93tZ1+1yCp5rqi6V5MzYQs8K69F Bya2VzOXlxGru/YksGctsOB+R511F4Fj8Sy9KWTgPyL2CdsXqsBjoZ0YduCg6uk4+jwTRn X9YSAE6URBc8s5xGBxCEP+xJnxAOaPIosU2XSK6Y5/SO7nnUYfkMaQQnH81I490+7dgV7+ jJvwBkxAluZlSGQcD6H26MExa1hrTpW74BI2eeqJBC3RMUIfkx27vuZsZwyjIDPH3bSqMx dFlIbdg/I4krHlDPbEN4CwrIZhIVUFKldar8/q2XqyFcN2Pz3dR5E2a5fovAjg== 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 4W9WZg2rlgzrbm; Fri, 28 Jun 2024 10:17:15 +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 45SAHF3B075532; Fri, 28 Jun 2024 10:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SAHFH5075529; Fri, 28 Jun 2024 10:17:15 GMT (envelope-from git) Date: Fri, 28 Jun 2024 10:17:15 GMT Message-Id: <202406281017.45SAHFH5075529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: c5e0b035d9eb - stable/14 - libutil: move ftime to libutil 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c5e0b035d9eb14e73fc17899cd007a31e0d1edc8 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=c5e0b035d9eb14e73fc17899cd007a31e0d1edc8 commit c5e0b035d9eb14e73fc17899cd007a31e0d1edc8 Author: Mariusz Zaborski AuthorDate: 2024-05-29 12:32:16 +0000 Commit: Mariusz Zaborski CommitDate: 2024-06-28 10:17:52 +0000 libutil: move ftime to libutil It seems that there are still some applications that use ftime(3) (for example, science/siconos and sysutils/lcdproc). The issue is that we don't build libcompat as a shared library anymore. The easiest solution is to move it to libutil, until we deprecate it for good. This solution was proposed by kib@ in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257789. PR: 257789 MFC after: 1 month Reviewed by: kib (ages ago) Differential Revision: https://reviews.freebsd.org/D39994 (cherry picked from commit bb421be6c1174fad837973acc5e4a7bade4489db) --- lib/libcompat/Makefile | 7 +------ lib/libutil/Makefile | 6 +++--- lib/{libcompat/4.1 => libutil}/ftime.3 | 4 ++-- lib/{libcompat/4.1 => libutil}/ftime.c | 2 ++ sys/sys/timeb.h | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile index 7c99556e7513..e30e120c3d41 100644 --- a/lib/libcompat/Makefile +++ b/lib/libcompat/Makefile @@ -7,12 +7,7 @@ NO_PIC= WARNS?= 0 -.PATH: ${.CURDIR}/4.1 ${.CURDIR}/4.3 ${.CURDIR}/4.4 - -# compat 4.1 sources -SRCS+= ftime.c - -MAN+= 4.1/ftime.3 +.PATH: ${.CURDIR}/4.3 ${.CURDIR}/4.4 # compat 4.3 sources SRCS+= re_comp.c rexec.c diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index 889a81747c82..5bce5c158958 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -12,7 +12,7 @@ LIB= util SHLIB_MAJOR= 9 SRCS= _secure_path.c auth.c cpuset.c expand_number.c flopen.c fparseln.c \ - getlocalbase.c gr_util.c \ + ftime.c getlocalbase.c gr_util.c \ hexdump.c humanize_number.c kinfo_getfile.c \ kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c \ kinfo_getvmobject.c kld.c \ @@ -30,8 +30,8 @@ CFLAGS+= -DINET6 CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libc/gen/ -MAN+= cpuset.3 expand_number.3 flopen.3 fparseln.3 getlocalbase.3 hexdump.3 \ - humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \ +MAN+= cpuset.3 expand_number.3 flopen.3 fparseln.3 ftime.3 getlocalbase.3 \ + hexdump.3 humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \ kinfo_getproc.3 kinfo_getvmmap.3 kinfo_getvmobject.3 kld.3 \ login_auth.3 login_cap.3 \ login_class.3 login_ok.3 login_times.3 login_tty.3 pidfile.3 \ diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libutil/ftime.3 similarity index 98% rename from lib/libcompat/4.1/ftime.3 rename to lib/libutil/ftime.3 index 48eb465aed31..dbed25317115 100644 --- a/lib/libcompat/4.1/ftime.3 +++ b/lib/libutil/ftime.3 @@ -27,14 +27,14 @@ .\" .\" @(#)ftime.3 8.1 (Berkeley) 6/4/93 .\" -.Dd August 4, 2018 +.Dd May 28, 2024 .Dt FTIME 3 .Os .Sh NAME .Nm ftime .Nd get date and time .Sh LIBRARY -.Lb libcompat +.Lb libuitl .Sh SYNOPSIS .In sys/types.h .In sys/timeb.h diff --git a/lib/libcompat/4.1/ftime.c b/lib/libutil/ftime.c similarity index 99% rename from lib/libcompat/4.1/ftime.c rename to lib/libutil/ftime.c index 5ea57bca40fd..b31fca907883 100644 --- a/lib/libcompat/4.1/ftime.c +++ b/lib/libutil/ftime.c @@ -33,6 +33,8 @@ #include #include #include + +#define _IN_LIBUITL #include int diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h index 952a5e83b8a7..853541e27ae6 100644 --- a/sys/sys/timeb.h +++ b/sys/sys/timeb.h @@ -39,7 +39,7 @@ #ifndef _SYS_TIMEB_H_ #define _SYS_TIMEB_H_ -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(_IN_LIBUITL) #warning "this file includes which is deprecated" #endif