diff options
Diffstat (limited to 'lib/strlcat.c')
| -rw-r--r-- | lib/strlcat.c | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/lib/strlcat.c b/lib/strlcat.c index 1d04b43d95..f144b76b5b 100644 --- a/lib/strlcat.c +++ b/lib/strlcat.c @@ -27,45 +27,42 @@ #ifndef HAVE_STRLCAT #undef strlcat -size_t -strlcat (char *__restrict dest, const char *__restrict src, size_t size); +size_t strlcat(char *__restrict dest, const char *__restrict src, size_t size); -size_t -strlcat (char *__restrict dest, const char *__restrict src, size_t size) +size_t strlcat(char *__restrict dest, const char *__restrict src, size_t size) { - size_t src_length = strlen (src); + size_t src_length = strlen(src); - /* Our implementation strlcat supports dest == NULL if size == 0 - (for consistency with snprintf and strlcpy), but strnlen does - not, so we have to cover this case explicitly. */ - if (size == 0) - return src_length; + /* Our implementation strlcat supports dest == NULL if size == 0 + (for consistency with snprintf and strlcpy), but strnlen does + not, so we have to cover this case explicitly. */ + if (size == 0) + return src_length; - size_t dest_length = strnlen (dest, size); - if (dest_length != size) - { - /* Copy at most the remaining number of characters in the - destination buffer. Leave for the NUL terminator. */ - size_t to_copy = size - dest_length - 1; - /* But not more than what is available in the source string. */ - if (to_copy > src_length) - to_copy = src_length; + size_t dest_length = strnlen(dest, size); + if (dest_length != size) { + /* Copy at most the remaining number of characters in the + destination buffer. Leave for the NUL terminator. */ + size_t to_copy = size - dest_length - 1; + /* But not more than what is available in the source string. */ + if (to_copy > src_length) + to_copy = src_length; - char *target = dest + dest_length; - memcpy (target, src, to_copy); - target[to_copy] = '\0'; - } + char *target = dest + dest_length; + memcpy(target, src, to_copy); + target[to_copy] = '\0'; + } - /* If the sum wraps around, we have more than SIZE_MAX + 2 bytes in - the two input strings (including both null terminators). If each - byte in the address space can be assigned a unique size_t value - (which the static_assert checks), then by the pigeonhole - principle, the two input strings must overlap, which is - undefined. */ +/* If the sum wraps around, we have more than SIZE_MAX + 2 bytes in + the two input strings (including both null terminators). If each + byte in the address space can be assigned a unique size_t value + (which the static_assert checks), then by the pigeonhole + principle, the two input strings must overlap, which is + undefined. */ #if __STDC_VERSION__ >= 201112L - _Static_assert (sizeof (uintptr_t) == sizeof (size_t), - "theoretical maximum object size covers address space"); + _Static_assert(sizeof(uintptr_t) == sizeof(size_t), + "theoretical maximum object size covers address space"); #endif - return dest_length + src_length; + return dest_length + src_length; } #endif /* HAVE_STRLCAT */ |