summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-07-30 12:59:55 -0400
committerJune McEnroe <june@causal.agency>2020-07-30 13:05:24 -0400
commit5a3b63e4444ca70c5e363bc597711ee51d782dc2 (patch)
treed5c72cbc856a6ee7087c72395455bdc9b93bacac
parentBump .so versions in chroot (diff)
downloadcatgirl-5a3b63e4444ca70c5e363bc597711ee51d782dc2.tar.gz
catgirl-5a3b63e4444ca70c5e363bc597711ee51d782dc2.zip
Remove use of strlcat
catf is not better though and should really be replaced.
-rw-r--r--chat.h3
-rw-r--r--handle.c3
2 files changed, 1 insertions, 5 deletions
diff --git a/chat.h b/chat.h
index bb5bec8..1dfe119 100644
--- a/chat.h
+++ b/chat.h
@@ -298,6 +298,3 @@ int getopt_config(
 
 // Defined in libcrypto if missing from libc:
 void explicit_bzero(void *b, size_t len);
-#ifndef strlcat
-size_t strlcat(char *restrict dst, const char *restrict src, size_t dstsize);
-#endif
diff --git a/handle.c b/handle.c
index 441bbc5..5f29db2 100644
--- a/handle.c
+++ b/handle.c
@@ -67,8 +67,7 @@ static const char *capList(enum Cap caps) {
 	buf[0] = '\0';
 	for (size_t i = 0; i < ARRAY_LEN(CapNames); ++i) {
 		if (caps & (1 << i)) {
-			if (buf[0]) strlcat(buf, " ", sizeof(buf));
-			strlcat(buf, CapNames[i], sizeof(buf));
+			catf(buf, sizeof(buf), "%s%s", (buf[0] ? " " : ""), CapNames[i]);
 		}
 	}
 	return buf;
='/catsit/commit/service.c?id=497cafbf0f2e96c21539fcc65b149450de262be8&follow=1'>Add reset interval after which restart interval is resetJune McEnroe 2020-08-15Log when service name pattern doesn't matchJune McEnroe 2020-08-15Add FreeBSD rc scriptJune McEnroe 2020-08-15Call setproctitle with number of servicesJune McEnroe 2020-08-15Rename project to catsitJune McEnroe 2020-08-15Use only LOG_NOTICE and LOG_WARNINGJune McEnroe 2020-08-15Make log messages consistentJune McEnroe 2020-08-15Remove closelog callJune McEnroe 2020-08-15Implement service statusJune McEnroe 2020-08-15Parse control commandsJune McEnroe 2020-08-15Read service pipesJune McEnroe 2020-08-15Implement non-blocking line-buffered readingJune McEnroe 2020-08-15Generate tags fileJune McEnroe 2020-08-15Just use CLOCK_MONOTONIC and clean up includesJune McEnroe 2020-08-15Reap childrenJune McEnroe 2020-08-14Implement serviceSignal, serviceStop, serviceRestartJune McEnroe 2020-08-14Reset restartInterval and restartDeadline on startJune McEnroe 2020-08-14Switch to timespec for timeoutsJune McEnroe 2020-08-14Implement serviceStartJune McEnroe 2020-08-14Flesh out Service structJune McEnroe 2020-08-14Build environment for servicesJune McEnroe 2020-08-14Implement spawntab parsingJune McEnroe 2020-08-14Open syslog, daemonize, write PIDJune McEnroe 2020-08-14Implement user and group lookupJune McEnroe 2020-08-14Add install targetJune McEnroe 2020-08-14Add spawnd skeletonJune McEnroe