From a8e1ea139810054ffd25bd68f5d3a42bdbe1a058 Mon Sep 17 00:00:00 2001 From: sin Date: Mon, 10 Feb 2014 13:14:12 +0000 Subject: [PATCH] Guard against strlcpy()/strlcat() being implemented as macros --- util.h | 2 ++ util/strlcat.c | 1 + util/strlcpy.c | 1 + 3 files changed, 4 insertions(+) diff --git a/util.h b/util.h index a643205..c478579 100644 --- a/util.h +++ b/util.h @@ -14,6 +14,8 @@ void eprintf(const char *, ...); long estrtol(const char *, int); void putword(const char *); void recurse(const char *, void (*)(const char *)); +#undef strlcat size_t strlcat(char *, const char *, size_t); +#undef strlcpy size_t strlcpy(char *, const char *, size_t); char *ttytostr(int, int); diff --git a/util/strlcat.c b/util/strlcat.c index 71749e7..37379e7 100644 --- a/util/strlcat.c +++ b/util/strlcat.c @@ -1,5 +1,6 @@ #include #include +#include "../util.h" size_t strlcat(char *dest, const char *src, size_t count) diff --git a/util/strlcpy.c b/util/strlcpy.c index f1b6e9e..4804d20 100644 --- a/util/strlcpy.c +++ b/util/strlcpy.c @@ -1,5 +1,6 @@ #include #include +#include "../util.h" size_t strlcpy(char *dest, const char *src, size_t size)