Date: Fri, 26 Apr 2024 15:08:01 GMT From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5a32a7777a06 - main - devel/got: switch to got-portable 0.98.2 Message-ID: <202404261508.43QF81Bc012574@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a32a7777a068f073c4c3de5a353533939306643 commit 5a32a7777a068f073c4c3de5a353533939306643 Author: Christian Weisgerber <naddy@FreeBSD.org> AuthorDate: 2024-04-26 15:07:20 +0000 Commit: Christian Weisgerber <naddy@FreeBSD.org> CommitDate: 2024-04-26 15:07:20 +0000 devel/got: switch to got-portable 0.98.2 This is a long overdue change from a homegrown compatibility layer to the got-portable release. No functional changes are expected. --- devel/got/Makefile | 25 +- devel/got/distinfo | 6 +- devel/got/files/openbsd-compat/Makefile | 13 - devel/got/files/openbsd-compat/endian.h | 6 - devel/got/files/openbsd-compat/freezero.c | 27 - devel/got/files/openbsd-compat/getdtablecount.c | 57 -- devel/got/files/openbsd-compat/imsg-buffer.c | 699 --------------------- devel/got/files/openbsd-compat/imsg.c | 450 ------------- devel/got/files/openbsd-compat/imsg.h | 158 ----- devel/got/files/openbsd-compat/openbsd-compat.h | 28 - devel/got/files/openbsd-compat/recallocarray.c | 82 --- devel/got/files/openbsd-compat/sha1.h | 14 - devel/got/files/openbsd-compat/sha2.h | 11 - devel/got/files/openbsd-compat/siphash.c | 181 ------ devel/got/files/openbsd-compat/siphash.h | 83 --- devel/got/files/openbsd-compat/util.h | 19 - devel/got/files/patch-Makefile | 8 - devel/got/files/patch-Makefile.in | 11 + devel/got/files/patch-Makefile.inc | 28 - devel/got/files/patch-configure | 15 + devel/got/files/patch-got_Makefile | 11 - devel/got/files/patch-gotadmin_Makefile | 11 - devel/got/files/patch-libexec_Makefile.inc | 12 - .../patch-libexec_got-fetch-pack_got-fetch-pack.c | 22 - .../patch-libexec_got-index-pack_got-index-pack.c | 22 - .../patch-libexec_got-read-blob_got-read-blob.c | 22 - ...patch-libexec_got-read-commit_got-read-commit.c | 22 - ...libexec_got-read-gitconfig_got-read-gitconfig.c | 22 - ...libexec_got-read-gotconfig_got-read-gotconfig.c | 22 - ...patch-libexec_got-read-object_got-read-object.c | 22 - .../patch-libexec_got-read-pack_got-read-pack.c | 22 - .../patch-libexec_got-read-patch_got-read-patch.c | 22 - .../patch-libexec_got-read-tag_got-read-tag.c | 22 - .../patch-libexec_got-read-tree_got-read-tree.c | 22 - .../patch-libexec_got-send-pack_got-send-pack.c | 22 - devel/got/files/patch-regress_Makefile | 9 - devel/got/files/patch-regress_cmdline_Makefile | 10 - devel/got/files/patch-regress_delta_Makefile | 12 - devel/got/files/patch-regress_deltify_Makefile | 12 - devel/got/files/patch-regress_fetch_Makefile | 12 - devel/got/files/patch-regress_idset_Makefile | 12 - devel/got/files/patch-regress_path_Makefile | 12 - devel/got/files/patch-regress_tog_Makefile | 10 - devel/got/files/patch-tog_Makefile | 11 - 44 files changed, 34 insertions(+), 2285 deletions(-) diff --git a/devel/got/Makefile b/devel/got/Makefile index 3ea370244689..93cd039e5e42 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,7 +1,8 @@ PORTNAME= got -DISTVERSION= 0.98 +DISTVERSION= 0.98.2 CATEGORIES= devel -MASTER_SITES= https://gameoftrees.org/releases/ +MASTER_SITES= https://gameoftrees.org/releases/portable/ +DISTNAME= got-portable-${DISTVERSION} MAINTAINER= naddy@FreeBSD.org COMMENT= Game of Trees version control system @@ -10,27 +11,11 @@ WWW= https://gameoftrees.org LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENCE -USES= localbase:ldflags uidfix +USES= localbase ssl CONFLICTS_INSTALL= p5-App-GitGot -# Insert #include "openbsd-compat.h" into each source file, -# after the <...> includes and before the "..." ones. -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: -# installed got -# installed git -# installed perl and HTTP::Daemon -# ssh to 127.0.0.1 -regress: - @(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} regress) +GNU_CONFIGURE= Yes .include <bsd.port.pre.mk> diff --git a/devel/got/distinfo b/devel/got/distinfo index b9e3f9a5be79..3be8904d6fb5 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713879270 -SHA256 (got-0.98.tar.gz) = 1ff7ec010b62413afb3e88d57ea52e67788b2ccbd2078ad0156df73c099759da -SIZE (got-0.98.tar.gz) = 971797 +TIMESTAMP = 1714082661 +SHA256 (got-portable-0.98.2.tar.gz) = ff5d4ad9922edf1c8055b2398650972fd463c809590dbe78e2eab1bf78a150c8 +SIZE (got-portable-0.98.2.tar.gz) = 1351206 diff --git a/devel/got/files/openbsd-compat/Makefile b/devel/got/files/openbsd-compat/Makefile deleted file mode 100644 index ab835f0c4285..000000000000 --- a/devel/got/files/openbsd-compat/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -LIB= openbsd-compat -INTERNALLIB= - -SRCS= freezero.c \ - getdtablecount.c \ - imsg.c \ - imsg-buffer.c \ - recallocarray.c \ - siphash.c - -CFLAGS+= -I${.CURDIR} - -.include <bsd.lib.mk> diff --git a/devel/got/files/openbsd-compat/endian.h b/devel/got/files/openbsd-compat/endian.h deleted file mode 100644 index 4da84f324eb7..000000000000 --- a/devel/got/files/openbsd-compat/endian.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _OPENBSD_COMPAT_ENDIAN_H_ -#define _OPENBSD_COMPAT_ENDIAN_H_ - -#include <sys/endian.h> - -#endif diff --git a/devel/got/files/openbsd-compat/freezero.c b/devel/got/files/openbsd-compat/freezero.c deleted file mode 100644 index d2938666c4f0..000000000000 --- a/devel/got/files/openbsd-compat/freezero.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include <stdlib.h> -#include <string.h> - -void freezero(void *, size_t); - -void -freezero(void *ptr, size_t sz) -{ - explicit_bzero(ptr, sz); - free(ptr); -} diff --git a/devel/got/files/openbsd-compat/getdtablecount.c b/devel/got/files/openbsd-compat/getdtablecount.c deleted file mode 100644 index 0d1f158ffa3d..000000000000 --- a/devel/got/files/openbsd-compat/getdtablecount.c +++ /dev/null @@ -1,57 +0,0 @@ -/*- - * Copyright (c) 2015 Craig Rodrigues - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <sys/cdefs.h> - -#include <sys/types.h> -#include <sys/sysctl.h> -#include <stddef.h> - -int getdtablecount(void); - -/* - * Return the count of open file descriptors for this process. - * - */ -int -getdtablecount(void) -{ - int mib[4]; - int error; - int nfds; - size_t len; - - len = sizeof(nfds); - mib[0] = CTL_KERN; - mib[1] = KERN_PROC; - mib[2] = KERN_PROC_NFDS; - mib[3] = 0; - - error = sysctl(mib, 4, &nfds, &len, NULL, 0); - if (error) - return (-1); - return (nfds); -} diff --git a/devel/got/files/openbsd-compat/imsg-buffer.c b/devel/got/files/openbsd-compat/imsg-buffer.c deleted file mode 100644 index 5c874fc56002..000000000000 --- a/devel/got/files/openbsd-compat/imsg-buffer.c +++ /dev/null @@ -1,699 +0,0 @@ -/* $OpenBSD: imsg-buffer.c,v 1.18 2023/12/12 15:47:41 claudio Exp $ */ - -/* - * Copyright (c) 2023 Claudio Jeker <claudio@openbsd.org> - * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include <sys/types.h> -#include <sys/queue.h> -#include <sys/socket.h> -#include <sys/uio.h> - -#include <limits.h> -#include <errno.h> -#include <endian.h> -#include <stdint.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#include <openbsd-compat.h> - -#include "imsg.h" - -static int ibuf_realloc(struct ibuf *, size_t); -static void ibuf_enqueue(struct msgbuf *, struct ibuf *); -static void ibuf_dequeue(struct msgbuf *, struct ibuf *); -static void msgbuf_drain(struct msgbuf *, size_t); - -struct ibuf * -ibuf_open(size_t len) -{ - struct ibuf *buf; - - if (len == 0) { - errno = EINVAL; - return (NULL); - } - if ((buf = calloc(1, sizeof(struct ibuf))) == NULL) - return (NULL); - if ((buf->buf = calloc(len, 1)) == NULL) { - free(buf); - return (NULL); - } - buf->size = buf->max = len; - buf->fd = -1; - - return (buf); -} - -struct ibuf * -ibuf_dynamic(size_t len, size_t max) -{ - struct ibuf *buf; - - if (max == 0 || max < len) { - errno = EINVAL; - return (NULL); - } - - if ((buf = calloc(1, sizeof(struct ibuf))) == NULL) - return (NULL); - if (len > 0) { - if ((buf->buf = calloc(len, 1)) == NULL) { - free(buf); - return (NULL); - } - } - buf->size = len; - buf->max = max; - buf->fd = -1; - - return (buf); -} - -static int -ibuf_realloc(struct ibuf *buf, size_t len) -{ - unsigned char *b; - - /* on static buffers max is eq size and so the following fails */ - if (len > SIZE_MAX - buf->wpos || buf->wpos + len > buf->max) { - errno = ERANGE; - return (-1); - } - - b = recallocarray(buf->buf, buf->size, buf->wpos + len, 1); - if (b == NULL) - return (-1); - buf->buf = b; - buf->size = buf->wpos + len; - - return (0); -} - -void * -ibuf_reserve(struct ibuf *buf, size_t len) -{ - void *b; - - if (len > SIZE_MAX - buf->wpos || buf->max == 0) { - errno = ERANGE; - return (NULL); - } - - if (buf->wpos + len > buf->size) - if (ibuf_realloc(buf, len) == -1) - return (NULL); - - b = buf->buf + buf->wpos; - buf->wpos += len; - return (b); -} - -int -ibuf_add(struct ibuf *buf, const void *data, size_t len) -{ - void *b; - - if ((b = ibuf_reserve(buf, len)) == NULL) - return (-1); - - memcpy(b, data, len); - return (0); -} - -int -ibuf_add_ibuf(struct ibuf *buf, const struct ibuf *from) -{ - return ibuf_add(buf, ibuf_data(from), ibuf_size(from)); -} - -/* remove after tree is converted */ -int -ibuf_add_buf(struct ibuf *buf, const struct ibuf *from) -{ - return ibuf_add_ibuf(buf, from); -} - -int -ibuf_add_n8(struct ibuf *buf, uint64_t value) -{ - uint8_t v; - - if (value > UINT8_MAX) { - errno = EINVAL; - return (-1); - } - v = value; - return ibuf_add(buf, &v, sizeof(v)); -} - -int -ibuf_add_n16(struct ibuf *buf, uint64_t value) -{ - uint16_t v; - - if (value > UINT16_MAX) { - errno = EINVAL; - return (-1); - } - v = htobe16(value); - return ibuf_add(buf, &v, sizeof(v)); -} - -int -ibuf_add_n32(struct ibuf *buf, uint64_t value) -{ - uint32_t v; - - if (value > UINT32_MAX) { - errno = EINVAL; - return (-1); - } - v = htobe32(value); - return ibuf_add(buf, &v, sizeof(v)); -} - -int -ibuf_add_n64(struct ibuf *buf, uint64_t value) -{ - value = htobe64(value); - return ibuf_add(buf, &value, sizeof(value)); -} - -int -ibuf_add_h16(struct ibuf *buf, uint64_t value) -{ - uint16_t v; - - if (value > UINT16_MAX) { - errno = EINVAL; - return (-1); - } - v = value; - return ibuf_add(buf, &v, sizeof(v)); -} - -int -ibuf_add_h32(struct ibuf *buf, uint64_t value) -{ - uint32_t v; - - if (value > UINT32_MAX) { - errno = EINVAL; - return (-1); - } - v = value; - return ibuf_add(buf, &v, sizeof(v)); -} - -int -ibuf_add_h64(struct ibuf *buf, uint64_t value) -{ - return ibuf_add(buf, &value, sizeof(value)); -} - -int -ibuf_add_zero(struct ibuf *buf, size_t len) -{ - void *b; - - if ((b = ibuf_reserve(buf, len)) == NULL) - return (-1); - memset(b, 0, len); - return (0); -} - -void * -ibuf_seek(struct ibuf *buf, size_t pos, size_t len) -{ - /* only allow seeking between rpos and wpos */ - if (ibuf_size(buf) < pos || SIZE_MAX - pos < len || - ibuf_size(buf) < pos + len) { - errno = ERANGE; - return (NULL); - } - - return (buf->buf + buf->rpos + pos); -} - -int -ibuf_set(struct ibuf *buf, size_t pos, const void *data, size_t len) -{ - void *b; - - if ((b = ibuf_seek(buf, pos, len)) == NULL) - return (-1); - - memcpy(b, data, len); - return (0); -} - -int -ibuf_set_n8(struct ibuf *buf, size_t pos, uint64_t value) -{ - uint8_t v; - - if (value > UINT8_MAX) { - errno = EINVAL; - return (-1); - } - v = value; - return (ibuf_set(buf, pos, &v, sizeof(v))); -} - -int -ibuf_set_n16(struct ibuf *buf, size_t pos, uint64_t value) -{ - uint16_t v; - - if (value > UINT16_MAX) { - errno = EINVAL; - return (-1); - } - v = htobe16(value); - return (ibuf_set(buf, pos, &v, sizeof(v))); -} - -int -ibuf_set_n32(struct ibuf *buf, size_t pos, uint64_t value) -{ - uint32_t v; - - if (value > UINT32_MAX) { - errno = EINVAL; - return (-1); - } - v = htobe32(value); - return (ibuf_set(buf, pos, &v, sizeof(v))); -} - -int -ibuf_set_n64(struct ibuf *buf, size_t pos, uint64_t value) -{ - value = htobe64(value); - return (ibuf_set(buf, pos, &value, sizeof(value))); -} - -int -ibuf_set_h16(struct ibuf *buf, size_t pos, uint64_t value) -{ - uint16_t v; - - if (value > UINT16_MAX) { - errno = EINVAL; - return (-1); - } - v = value; - return (ibuf_set(buf, pos, &v, sizeof(v))); -} - -int -ibuf_set_h32(struct ibuf *buf, size_t pos, uint64_t value) -{ - uint32_t v; - - if (value > UINT32_MAX) { - errno = EINVAL; - return (-1); - } - v = value; - return (ibuf_set(buf, pos, &v, sizeof(v))); -} - -int -ibuf_set_h64(struct ibuf *buf, size_t pos, uint64_t value) -{ - return (ibuf_set(buf, pos, &value, sizeof(value))); -} - -void * -ibuf_data(const struct ibuf *buf) -{ - return (buf->buf + buf->rpos); -} - -size_t -ibuf_size(const struct ibuf *buf) -{ - return (buf->wpos - buf->rpos); -} - -size_t -ibuf_left(const struct ibuf *buf) -{ - if (buf->max == 0) - return (0); - return (buf->max - buf->wpos); -} - -int -ibuf_truncate(struct ibuf *buf, size_t len) -{ - if (ibuf_size(buf) >= len) { - buf->wpos = buf->rpos + len; - return (0); - } - if (buf->max == 0) { - /* only allow to truncate down */ - errno = ERANGE; - return (-1); - } - return ibuf_add_zero(buf, len - ibuf_size(buf)); -} - -void -ibuf_rewind(struct ibuf *buf) -{ - buf->rpos = 0; -} - -void -ibuf_close(struct msgbuf *msgbuf, struct ibuf *buf) -{ - ibuf_enqueue(msgbuf, buf); -} - -void -ibuf_from_buffer(struct ibuf *buf, void *data, size_t len) -{ - memset(buf, 0, sizeof(*buf)); - buf->buf = data; - buf->size = buf->wpos = len; - buf->fd = -1; -} - -void -ibuf_from_ibuf(struct ibuf *buf, const struct ibuf *from) -{ - ibuf_from_buffer(buf, ibuf_data(from), ibuf_size(from)); -} - -int -ibuf_get(struct ibuf *buf, void *data, size_t len) -{ - if (ibuf_size(buf) < len) { - errno = EBADMSG; - return (-1); - } - - memcpy(data, ibuf_data(buf), len); - buf->rpos += len; - return (0); -} - -int -ibuf_get_ibuf(struct ibuf *buf, size_t len, struct ibuf *new) -{ - if (ibuf_size(buf) < len) { - errno = EBADMSG; - return (-1); - } - - ibuf_from_buffer(new, ibuf_data(buf), len); - buf->rpos += len; - return (0); -} - -int -ibuf_get_n8(struct ibuf *buf, uint8_t *value) -{ - return ibuf_get(buf, value, sizeof(*value)); -} - -int -ibuf_get_n16(struct ibuf *buf, uint16_t *value) -{ - int rv; - - rv = ibuf_get(buf, value, sizeof(*value)); - *value = be16toh(*value); - return (rv); -} - -int -ibuf_get_n32(struct ibuf *buf, uint32_t *value) -{ - int rv; - - rv = ibuf_get(buf, value, sizeof(*value)); - *value = be32toh(*value); - return (rv); -} - -int -ibuf_get_n64(struct ibuf *buf, uint64_t *value) -{ - int rv; - - rv = ibuf_get(buf, value, sizeof(*value)); - *value = be64toh(*value); - return (rv); -} - -int -ibuf_get_h16(struct ibuf *buf, uint16_t *value) -{ - return ibuf_get(buf, value, sizeof(*value)); -} - -int -ibuf_get_h32(struct ibuf *buf, uint32_t *value) -{ - return ibuf_get(buf, value, sizeof(*value)); -} - -int -ibuf_get_h64(struct ibuf *buf, uint64_t *value) -{ - return ibuf_get(buf, value, sizeof(*value)); -} - -int -ibuf_skip(struct ibuf *buf, size_t len) -{ - if (ibuf_size(buf) < len) { - errno = EBADMSG; - return (-1); - } - - buf->rpos += len; - return (0); -} - -void -ibuf_free(struct ibuf *buf) -{ - if (buf == NULL) - return; - if (buf->max == 0) /* if buf lives on the stack */ - abort(); /* abort before causing more harm */ - if (buf->fd != -1) - close(buf->fd); - freezero(buf->buf, buf->size); - free(buf); -} - -int -ibuf_fd_avail(struct ibuf *buf) -{ - return (buf->fd != -1); -} - -int -ibuf_fd_get(struct ibuf *buf) -{ - int fd; - - fd = buf->fd; - buf->fd = -1; - return (fd); -} - -void -ibuf_fd_set(struct ibuf *buf, int fd) -{ - if (buf->max == 0) /* if buf lives on the stack */ - abort(); /* abort before causing more harm */ - if (buf->fd != -1) - close(buf->fd); - buf->fd = fd; -} - -int -ibuf_write(struct msgbuf *msgbuf) -{ - struct iovec iov[IOV_MAX]; - struct ibuf *buf; - unsigned int i = 0; - ssize_t n; - - memset(&iov, 0, sizeof(iov)); - TAILQ_FOREACH(buf, &msgbuf->bufs, entry) { - if (i >= IOV_MAX) - break; - iov[i].iov_base = ibuf_data(buf); - iov[i].iov_len = ibuf_size(buf); - i++; - } - -again: - if ((n = writev(msgbuf->fd, iov, i)) == -1) { - if (errno == EINTR) - goto again; - if (errno == ENOBUFS) - errno = EAGAIN; - return (-1); - } - - if (n == 0) { /* connection closed */ - errno = 0; - return (0); - } - - msgbuf_drain(msgbuf, n); - - return (1); -} - -void -msgbuf_init(struct msgbuf *msgbuf) -{ - msgbuf->queued = 0; - msgbuf->fd = -1; - TAILQ_INIT(&msgbuf->bufs); -} - -static void -msgbuf_drain(struct msgbuf *msgbuf, size_t n) -{ - struct ibuf *buf, *next; - - for (buf = TAILQ_FIRST(&msgbuf->bufs); buf != NULL && n > 0; - buf = next) { - next = TAILQ_NEXT(buf, entry); - if (n >= ibuf_size(buf)) { - n -= ibuf_size(buf); - ibuf_dequeue(msgbuf, buf); - } else { - buf->rpos += n; - n = 0; - } - } -} - -void -msgbuf_clear(struct msgbuf *msgbuf) -{ - struct ibuf *buf; - - while ((buf = TAILQ_FIRST(&msgbuf->bufs)) != NULL) - ibuf_dequeue(msgbuf, buf); -} - -int -msgbuf_write(struct msgbuf *msgbuf) -{ - struct iovec iov[IOV_MAX]; - struct ibuf *buf, *buf0 = NULL; - unsigned int i = 0; - ssize_t n; - struct msghdr msg; - struct cmsghdr *cmsg; - union { - struct cmsghdr hdr; - char buf[CMSG_SPACE(sizeof(int))]; - } cmsgbuf; - - memset(&iov, 0, sizeof(iov)); - memset(&msg, 0, sizeof(msg)); - memset(&cmsgbuf, 0, sizeof(cmsgbuf)); - TAILQ_FOREACH(buf, &msgbuf->bufs, entry) { - if (i >= IOV_MAX) - break; - if (i > 0 && buf->fd != -1) - break; - iov[i].iov_base = ibuf_data(buf); - iov[i].iov_len = ibuf_size(buf); - i++; - if (buf->fd != -1) - buf0 = buf; - } - - msg.msg_iov = iov; - msg.msg_iovlen = i; - - if (buf0 != NULL) { - msg.msg_control = (caddr_t)&cmsgbuf.buf; - msg.msg_controllen = sizeof(cmsgbuf.buf); - cmsg = CMSG_FIRSTHDR(&msg); - cmsg->cmsg_len = CMSG_LEN(sizeof(int)); - cmsg->cmsg_level = SOL_SOCKET; - cmsg->cmsg_type = SCM_RIGHTS; - *(int *)CMSG_DATA(cmsg) = buf0->fd; - } - -again: - if ((n = sendmsg(msgbuf->fd, &msg, 0)) == -1) { - if (errno == EINTR) - goto again; - if (errno == ENOBUFS) - errno = EAGAIN; - return (-1); - } - - if (n == 0) { /* connection closed */ - errno = 0; - return (0); - } - - /* - * assumption: fd got sent if sendmsg sent anything - * this works because fds are passed one at a time - */ - if (buf0 != NULL) { - close(buf0->fd); - buf0->fd = -1; - } - - msgbuf_drain(msgbuf, n); - - return (1); -} - -uint32_t -msgbuf_queuelen(struct msgbuf *msgbuf) -{ - return (msgbuf->queued); -} - -static void -ibuf_enqueue(struct msgbuf *msgbuf, struct ibuf *buf) -{ - if (buf->max == 0) /* if buf lives on the stack */ - abort(); /* abort before causing more harm */ - TAILQ_INSERT_TAIL(&msgbuf->bufs, buf, entry); - msgbuf->queued++; -} - -static void -ibuf_dequeue(struct msgbuf *msgbuf, struct ibuf *buf) -{ - TAILQ_REMOVE(&msgbuf->bufs, buf, entry); - msgbuf->queued--; - ibuf_free(buf); -} diff --git a/devel/got/files/openbsd-compat/imsg.c b/devel/got/files/openbsd-compat/imsg.c deleted file mode 100644 index 1340f251727d..000000000000 --- a/devel/got/files/openbsd-compat/imsg.c +++ /dev/null @@ -1,450 +0,0 @@ -/* $OpenBSD: imsg.c,v 1.23 2023/12/12 15:47:41 claudio Exp $ */ - -/* - * Copyright (c) 2023 Claudio Jeker <claudio@openbsd.org> - * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include <sys/types.h> -#include <sys/queue.h> -#include <sys/socket.h> -#include <sys/uio.h> - -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#include <openbsd-compat.h> - *** 1671 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404261508.43QF81Bc012574>