From 3f0914da760e154861e42178c776f975920fb40b Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 6 Apr 2013 09:16:35 -0400 Subject: [PATCH] Cleaner safe_strncat(). --- src/safe_strncat.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/src/safe_strncat.c b/src/safe_strncat.c index 8584e08..f26b4e2 100644 --- a/src/safe_strncat.c +++ b/src/safe_strncat.c @@ -24,24 +24,11 @@ size_t safe_strncat(char *dst, const char *src, size_t n) { - char *dp; - const char *sp; size_t len; + char *p; - if (!n) - return strlen(dst)+strlen(src)+1; - - for (dp = dst, len = 0; *dp; dp++, len++); - - for (sp = src; *sp && len < n-1; len++, sp++) - *dp++ = *sp; - - *dp = 0; - - if (*sp) { - while (*sp++) - len++; - } - + p = strncat (dst, src, n); + len = strlen (p); + p[len] = 0; return len; } -- 2.11.4.GIT