<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/7e54e2460a49221a6ff20d0f3e608da8f3203f9f">https://github.com/macports/macports-base/commit/7e54e2460a49221a6ff20d0f3e608da8f3203f9f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7e54e2460 src: Add strl{cat,cpy},getline compat includes
</span>7e54e2460 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e54e2460a49221a6ff20d0f3e608da8f3203f9f
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sun Oct 1 17:18:43 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> src: Add strl{cat,cpy},getline compat includes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> pextlib1.0/tracelib.c additionally had its own implementation, which is
</span><span style='display:block; white-space:pre;color:#404040;'> now no longer required since we have a centrally provided compatibility
</span><span style='display:block; white-space:pre;color:#404040;'> implementation.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> machista1.0 did not yet use the compat implementation and thus probably
</span><span style='display:block; white-space:pre;color:#404040;'> did not work on operating systems that do not have strlcpy.
</span>---
src/darwintracelib1.0/darwintrace.c | 1 +
src/darwintracelib1.0/readdir.c | 1 +
src/machista1.0/Makefile.in | 5 +++++
src/machista1.0/libmachista.c | 1 +
src/pextlib1.0/sip_copy_proc.c | 2 ++
src/pextlib1.0/tracelib.c | 17 +----------------
6 files changed, 11 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/darwintracelib1.0/darwintrace.c b/src/darwintracelib1.0/darwintrace.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 71ba17e1d..a4f81bf79 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/darwintracelib1.0/darwintrace.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/darwintracelib1.0/darwintrace.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,7 @@
</span> #define DARWINTRACE_USE_PRIVATE_API 1
#include "darwintrace.h"
#include "sandbox_actions.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "strlcpy.h"
</span>
#ifdef HAVE_STDATOMIC_H
#include <stdatomic.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/darwintracelib1.0/readdir.c b/src/darwintracelib1.0/readdir.c
</span><span style='display:block; white-space:pre;color:#808080;'>index e413e6775..660a88396 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/darwintracelib1.0/readdir.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/darwintracelib1.0/readdir.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,7 @@
</span> */
#include "darwintrace.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "strlcat.h"
</span>
#include <errno.h>
#include <fcntl.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/machista1.0/Makefile.in b/src/machista1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index e1abb26a3..61a612f97 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/machista1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/machista1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,11 @@ OBJS= libmachista.o hashmap.o machista_wrap.o
</span> SHLIB_NAME= machista${SHLIB_SUFFIX}
INSTALLDIR= ${TCL_PACKAGE_PATH}/machista1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+CPPFLAGS+= -I$(srcdir)/../compat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifneq ($(HAVE_STRLCAT),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OBJS+= ../compat/strlcat.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> SWIG = @SWIG@
SWIG_FLAGS = -tcl8 -pkgversion 1.0 -namespace
SWIG_LDFLAGS = -ltcl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/machista1.0/libmachista.c b/src/machista1.0/libmachista.c
</span><span style='display:block; white-space:pre;color:#808080;'>index cead31c4c..016f79401 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/machista1.0/libmachista.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/machista1.0/libmachista.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +61,7 @@
</span>
#include "libmachista.h"
#include "hashmap.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "strlcpy.h"
</span>
#ifdef __MACH__
/* Tiger compatibility */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/sip_copy_proc.c b/src/pextlib1.0/sip_copy_proc.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 61e1eab25..10aa5df86 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/sip_copy_proc.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/sip_copy_proc.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +52,8 @@
</span> #include <copyfile.h>
#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "getline.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #include "sip_copy_proc.h"
#ifndef DARWINTRACE_SIP_WORKAROUND_PATH
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/tracelib.c b/src/pextlib1.0/tracelib.c
</span><span style='display:block; white-space:pre;color:#808080;'>index b67d5a937..410356349 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/tracelib.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/tracelib.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,24 +71,9 @@
</span> #include "Pextlib.h"
#include "strlcat.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "strlcpy.h"
</span>
#ifdef HAVE_TRACEMODE_SUPPORT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef HAVE_STRLCPY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Define strlcpy if it's not available. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-size_t strlcpy(char *dst, const char *src, size_t size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-size_t strlcpy(char *dst, const char *src, size_t size) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t result = strlen(src);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (size > 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t copylen = size - 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (copylen > result) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copylen = result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy(dst, src, copylen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dst[copylen] = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span>
#ifdef HAVE_PEERPID_LIST
static bool peerpid_list_enqueue(int sock, pid_t pid);
</pre><pre style='margin:0'>
</pre>