about 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.
Diffstat (limited to '')
-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;
ct system, I don't think, since the mandoc package actually creates those files, but it does work. This lets me actually use the git installed by MacPorts. 2020-09-12Move /opt/local behind /usr againJune McEnroe The reason I did this with pkgsrc was because I actually don't want the man(1) from mandoc, since it won't follow MANSECT. Same applies to MacPorts. I wish I could disable its man(1) with a variant or whatever. 2020-09-12Enable toc in cgit renderings of man pagesJune McEnroe But keep it disabled for READMEs since they always use non-standard sections and the TOC is just distracting there, I think. Also add the style so its h1 is the same size as the ones inside sections... 2020-09-11Install mandoc on macOSJune McEnroe 2020-09-11Rewrite install script yet againJune McEnroe 2020-09-11Remove NetBSD from install scriptJune McEnroe I never use it. 2020-09-11Use MacPorts rather than pkgsrcJune McEnroe My system is probably such a mess now... 2020-09-11Add debian VM name to sshJune McEnroe 2020-09-11Add influencer tweetJune McEnroe 2020-09-10Add The Kingdom of GodsJune McEnroe Reading has really slowed down :( 2020-09-07Add SunglassesJune McEnroe An IRC find. 2020-09-06Add Between the BreathsJune McEnroe One of those good songs from a soundtrack of a film that probably isn't? The summary sounds a lot more interesting than the title implies, at least. 2020-09-04Open /dev/tty in nudgeJune McEnroe This makes it work even when it's run connected to a pipe, i.e. as the notify command of catgirl... 2020-09-04Add nudgeJune McEnroe 2020-09-03Build fbclock with -lzJune McEnroe I guess this got lost somewhere, long ago... 2020-08-29Add tweets from retweetsJune McEnroe