From d3c323cc390659dfd3da50a015e18285b5b5b6ff Mon Sep 17 00:00:00 2001 From: Walter de Jong Date: Fri, 29 Mar 2013 10:03:40 +0100 Subject: xstrcpy() belongs in libtac --- libtac/lib/xalloc.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'libtac/lib/xalloc.c') diff --git a/libtac/lib/xalloc.c b/libtac/lib/xalloc.c index d749b52..8fcce26 100644 --- a/libtac/lib/xalloc.c +++ b/libtac/lib/xalloc.c @@ -41,7 +41,7 @@ void *xrealloc(void *ptr, size_t size) { return val; } -char *xstrdup(char *s) { +char *xstrdup(const char *s) { char *p; if (s == NULL) return NULL; @@ -51,3 +51,26 @@ char *xstrdup(char *s) { } return p; } + + +/* + safe string copy that aborts when destination buffer is too small +*/ +char *xstrcpy(char *dst, const char *src, size_t dst_size) { + if (dst == NULL) { + TACSYSLOG((LOG_ERR, "xstrcpy(): dst == NULL")); + } + if (src == NULL) { + TACSYSLOG((LOG_ERR, "xstrcpy(): src == NULL")); + } + if (!dst_size) + return NULL; + + if (strlen(src) >= dst_size) { + TACSYSLOG((LOG_ERR, "xstrcpy(): argument too long, aborting")); + abort(); + } + + return strcpy(dst, src); +} + -- cgit v1.2.3