From nobody Wed May 29 12:35:03 2024 X-Original-To: dev-commits-src-main@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 4Vq83W5C9lz5MRns; Wed, 29 May 2024 12:35:03 +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 4Vq83W4ZMGz4D60; Wed, 29 May 2024 12:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716986103; 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=GlKi+u9b1BKqsRMWoqhHDKrRVrmH/475hnDN1Mcoowc=; b=OpnkRPjur1Fd50zfWhkctHspgw27Fx618xztAl9unbxBsFlaXPxBIIfIGw4O/HZhPq+hhe IgNvT5bEHHKjg/VwcOIazskwsLz54qY315u9oPLNguw51XoRK1rLLmLDHyatrJacxo+lN/ dKLyFZuHuGanZ116ax6GLWy4HCyCzksZSaYaAU3cbxQiXPwKwx2JJyKxLCTQ2dWFCsO6k7 0fR7pKKqpX6sErNvkBbmNez9EcLpncbN4h1SmuAADQgmCqS6x9BmED9tm1dxXzU2dpDkye UVafmHjK0OHgN5I5iBl6gkyE1B/qHXIr9v8KwIRC+kK04EeGYOdCHVQSfUtZvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716986103; a=rsa-sha256; cv=none; b=WHodN8l2CINXupBnexBOOgZiQJtufTywibZ5w0zsS+PySmYdt6Y5x/1yjxfOzABKRz4W8x GELCOWBcQ4iuKI59LYGqA79Q78XJioK2UA03jXdsZK9y6RgwJPR5TI5ut1QpTvJrCfqqGp GapN9M9GR8566MgymTAvDQqKjBsYVGCB9e3+nukeQoo6VnHJJRLTx41zvaXrLqeam7BoLd cqK6RGRxwzqQo+Kg8HSjmUGvCdgdQKeii2cesZUJxVkoJUjml0K9DPUhAgTY8oRPp1l7Mi TbAEK5xsYNa2VTQoXa5/ozXqT2RuHqYDOgngkPwFYMMjocqt4PSzhWcDN/c0lQ== 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=1716986103; 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=GlKi+u9b1BKqsRMWoqhHDKrRVrmH/475hnDN1Mcoowc=; b=fiRuWOzaxo2V8U/VMNYlkbUTfUy6ab0vgf/CxQjOsSHzFt+JWHE8v3vfSVnL4RfuPknAx3 27LuMnmGB9dNOcItdCj2HFlXFTIh3CB8tQQd3AEbZoP26AIRoR5/Y/KOFh8ih+V6EYF8QK oK4IpwvLEOTeNhwlwjEHaPf6qxQoINjhJ4aKwlGE8Nra9KQQruKgr9feYFPOYA5hKzyNF0 N906Y8GcZofWZtHblsxy+yLVUOk5lV6Q0DDfeTcMB1xEQZ7cHigBTYa66X3/s8c5cxbB7t LB03u3XgHGLjWj3sLvromFQhXre6dvbAM7acXyf6/X/EyuUAQEubgeaylqkDlA== 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 4Vq83W49Vbzw3g; Wed, 29 May 2024 12:35:03 +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 44TCZ3ri093722; Wed, 29 May 2024 12:35:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TCZ3WW093719; Wed, 29 May 2024 12:35:03 GMT (envelope-from git) Date: Wed, 29 May 2024 12:35:03 GMT Message-Id: <202405291235.44TCZ3WW093719@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: bb421be6c117 - main - libutil: move ftime to libutil List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: bb421be6c1174fad837973acc5e4a7bade4489db Auto-Submitted: auto-generated The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=bb421be6c1174fad837973acc5e4a7bade4489db commit bb421be6c1174fad837973acc5e4a7bade4489db Author: Mariusz Zaborski AuthorDate: 2024-05-29 12:32:16 +0000 Commit: Mariusz Zaborski CommitDate: 2024-05-29 12:36:09 +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 --- 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 c1be9243e27c..884941b3a139 100644 --- a/lib/libcompat/Makefile +++ b/lib/libcompat/Makefile @@ -6,12 +6,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 a0a2bef8e2ce..eb5907ac183a 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -11,7 +11,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 \ @@ -29,8 +29,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 d0e3712701ff..043bbe2ed2c3 100644 --- a/lib/libcompat/4.1/ftime.3 +++ b/lib/libutil/ftime.3 @@ -25,14 +25,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.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 98% rename from lib/libcompat/4.1/ftime.c rename to lib/libutil/ftime.c index cb832e6c2526..2e72b5ef30f3 100644 --- a/lib/libcompat/4.1/ftime.c +++ b/lib/libutil/ftime.c @@ -32,6 +32,8 @@ #include #include + +#define _IN_LIBUITL #include int diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h index 09fe3a2584a5..d8aeeab83426 100644 --- a/sys/sys/timeb.h +++ b/sys/sys/timeb.h @@ -37,7 +37,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