From owner-svn-ports-head@freebsd.org Thu Sep 24 19:02:03 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D6F00425434; Thu, 24 Sep 2020 19:02:03 +0000 (UTC) (envelope-from naddy@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4By4Cv5Nfvz42sH; Thu, 24 Sep 2020 19:02:03 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9C59326CA4; Thu, 24 Sep 2020 19:02:03 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08OJ23dd028900; Thu, 24 Sep 2020 19:02:03 GMT (envelope-from naddy@FreeBSD.org) Received: (from naddy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08OJ22eT028894; Thu, 24 Sep 2020 19:02:02 GMT (envelope-from naddy@FreeBSD.org) Message-Id: <202009241902.08OJ22eT028894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: naddy set sender to naddy@FreeBSD.org using -f From: Christian Weisgerber Date: Thu, 24 Sep 2020 19:02:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549940 - in head/devel/got: . files/openbsd-compat files/openbsd-compat/sys X-SVN-Group: ports-head X-SVN-Commit-Author: naddy X-SVN-Commit-Paths: in head/devel/got: . files/openbsd-compat files/openbsd-compat/sys X-SVN-Commit-Revision: 549940 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2020 19:02:03 -0000 Author: naddy Date: Thu Sep 24 19:02:01 2020 New Revision: 549940 URL: https://svnweb.freebsd.org/changeset/ports/549940 Log: Switch mostly to a single compat header file that provides compatibility mappings for system headers and prototypes of functions in libopenbsd-compat. Added: head/devel/got/files/openbsd-compat/openbsd-compat.h (contents, props changed) Deleted: head/devel/got/files/openbsd-compat/libgen.h head/devel/got/files/openbsd-compat/stdlib.h head/devel/got/files/openbsd-compat/sys/ head/devel/got/files/openbsd-compat/unistd.h Modified: head/devel/got/Makefile head/devel/got/files/openbsd-compat/basename.c head/devel/got/files/openbsd-compat/dirname.c head/devel/got/files/openbsd-compat/imsg-buffer.c head/devel/got/files/openbsd-compat/imsg.c Modified: head/devel/got/Makefile ============================================================================== --- head/devel/got/Makefile Thu Sep 24 18:56:13 2020 (r549939) +++ head/devel/got/Makefile Thu Sep 24 19:02:01 2020 (r549940) @@ -13,7 +13,12 @@ LICENSE_FILE= ${WRKSRC}/LICENCE USES= uidfix +n= ${.newline} post-extract: + @${FIND} ${WRKSRC} -name '*.[cy]' -exec \ + ${REINPLACE_CMD} '1,/^#include "/{ \ + /^#include "/i\$n#include "openbsd-compat.h"\$n$n}' \ + {} + ${CP} -R ${FILESDIR}/openbsd-compat ${WRKSRC} # The regression test suite requires: Modified: head/devel/got/files/openbsd-compat/basename.c ============================================================================== --- head/devel/got/files/openbsd-compat/basename.c Thu Sep 24 18:56:13 2020 (r549939) +++ head/devel/got/files/openbsd-compat/basename.c Thu Sep 24 19:02:01 2020 (r549940) @@ -21,6 +21,8 @@ #include #include +#include + char * basename(const char *path) { Modified: head/devel/got/files/openbsd-compat/dirname.c ============================================================================== --- head/devel/got/files/openbsd-compat/dirname.c Thu Sep 24 18:56:13 2020 (r549939) +++ head/devel/got/files/openbsd-compat/dirname.c Thu Sep 24 19:02:01 2020 (r549940) @@ -21,6 +21,8 @@ #include #include +#include + /* A slightly modified copy of this file exists in libexec/ld.so */ char * Modified: head/devel/got/files/openbsd-compat/imsg-buffer.c ============================================================================== --- head/devel/got/files/openbsd-compat/imsg-buffer.c Thu Sep 24 18:56:13 2020 (r549939) +++ head/devel/got/files/openbsd-compat/imsg-buffer.c Thu Sep 24 19:02:01 2020 (r549940) @@ -27,6 +27,8 @@ #include #include +#include + #include "imsg.h" static int ibuf_realloc(struct ibuf *, size_t); Modified: head/devel/got/files/openbsd-compat/imsg.c ============================================================================== --- head/devel/got/files/openbsd-compat/imsg.c Thu Sep 24 18:56:13 2020 (r549939) +++ head/devel/got/files/openbsd-compat/imsg.c Thu Sep 24 19:02:01 2020 (r549940) @@ -26,6 +26,8 @@ #include #include +#include + #include "imsg.h" int imsg_fd_overhead = 0; Added: head/devel/got/files/openbsd-compat/openbsd-compat.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/got/files/openbsd-compat/openbsd-compat.h Thu Sep 24 19:02:01 2020 (r549940) @@ -0,0 +1,78 @@ +/* + * Compatibility mappings for system headers and + * prototypes for functions in libopenbsd-compat. + */ + +#ifndef _OPENBSD_COMPAT_H_ +#define _OPENBSD_COMPAT_H_ + +/* + * + */ +#define __dead __dead2 + +/* + * + */ +#define SIMPLEQ_HEAD(name, type) \ + STAILQ_HEAD(name, type) +#define SIMPLEQ_HEAD_INITIALIZER(head) \ + STAILQ_HEAD_INITIALIZER(head) +#define SIMPLEQ_ENTRY(type) \ + STAILQ_ENTRY(type) +#define SIMPLEQ_FIRST(head) \ + STAILQ_FIRST(head) +#define SIMPLEQ_END(head) \ + NULL +#define SIMPLEQ_EMPTY(head) \ + STAILQ_EMPTY(head) +#define SIMPLEQ_NEXT(elm, field) \ + STAILQ_NEXT(elm, field) +#define SIMPLEQ_FOREACH(var, head, field) \ + STAILQ_FOREACH(var, head, field) +#define SIMPLEQ_FOREACH_SAFE(var, head, field, tvar) \ + STAILQ_FOREACH_SAFE(var, head, field, tvar) +#define SIMPLEQ_INIT(head) \ + STAILQ_INIT(head) +#define SIMPLEQ_INSERT_HEAD(head, elm, field) \ + STAILQ_INSERT_HEAD(head, elm, field) +#define SIMPLEQ_INSERT_TAIL(head, elm, field) \ + STAILQ_INSERT_TAIL(head, elm, field) +#define SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) \ + STAILQ_INSERT_AFTER(head, listelm, elm, field) +#define SIMPLEQ_REMOVE_HEAD(head, field) \ + STAILQ_REMOVE_HEAD(head, field) +#define SIMPLEQ_REMOVE_AFTER(head, elm, field) \ + STAILQ_REMOVE_AFTER(head, elm, field) +#define SIMPLEQ_CONCAT(head1, head2) \ + STAILQ_CONCAT(head1, head2) + +/* + * + */ +#undef basename +#undef dirname +#define basename(path) basename_const(path) +#define dirname(path) dirname_const(path) + +char *basename(const char *); +char *dirname(const char *); + +/* + * + */ +void freezero(void *, size_t); +void *recallocarray(void *, size_t, size_t, size_t); + +/* + * + */ +int getdtablecount(void); + +/* void -> int */ +#define closefrom(fd) (closefrom(fd), 0) + +#define pledge(promises, execpromises) 0 +#define unveil(path, permissions) 0 + +#endif /* _OPENBSD_COMPAT_H_ */