diff options
| author | June McEnroe <june@causal.agency> | 2020-07-30 12:59:55 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2020-07-30 13:05:24 -0400 |
| commit | 5a3b63e4444ca70c5e363bc597711ee51d782dc2 (patch) | |
| tree | d5c72cbc856a6ee7087c72395455bdc9b93bacac | |
| parent | Bump .so versions in chroot (diff) | |
| download | catgirl-5a3b63e4444ca70c5e363bc597711ee51d782dc2.tar.gz catgirl-5a3b63e4444ca70c5e363bc597711ee51d782dc2.zip | |
Remove use of strlcat
catf is not better though and should really be replaced.
| -rw-r--r-- | chat.h | 3 | ||||
| -rw-r--r-- | handle.c | 3 |
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; |