c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-23 10:54:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Check for strlcat and strlcpy

Browse Source 
This partially reverts commit 8005ca4 by moving the strlcat()
and strlcpy() compatibility implementations back to their original
location.

In addition, these two functions were added to the AC_CHECK_FUNCS
macro. When these functions are available from the C library,
HAVE_STRLCAT and HAVE_STRLCPY will be defined and library version
used. Otherwise the compatibility version is built.

Reviewed-by: Sebastian Gottschall <s.gottschall@dd-wrt.com>
Reviewed-by: Alek Pinchuk <apinchuk@datto.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #8157 
Closes #8202
This commit is contained in:
Brian Behlendorf
2018-12-11 16:01:41 -08:00
committed by GitHub
parent a48cd034c8
commit 4b70290163
6 changed files with 126 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libspl/include/string.h
+6 -49
View File
@@ -28,56 +28,13 @@
#define _LIBSPL_STRING_H
#include_next <string.h>
#include <sys/types.h>
/*
* Appends src to the dstsize buffer at dst. The append will never
* overflow the destination buffer and the buffer will always be null
* terminated. Never reference beyond &dst[dstsize-1] when computing
* the length of the pre-existing string.
*/
static inline size_t
strlcat(char *dst, const char *src, size_t dstsize)
{
char *df = dst;
size_t left = dstsize;
size_t l1;
size_t l2 = strlen(src);
size_t copied;
#ifndef HAVE_STRLCAT
extern size_t strlcat(char *dst, const char *src, size_t dstsize);
#endif
while (left-- != 0 && *df != '\0')
df++;
l1 = df - dst;
if (dstsize == l1)
return (l1 + l2);
copied = l1 + l2 >= dstsize ? dstsize - l1 - 1 : l2;
(void) memcpy(dst + l1, src, copied);
dst[l1+copied] = '\0';
return (l1 + l2);
}
/*
* Copies src to the dstsize buffer at dst. The copy will never
* overflow the destination buffer and the buffer will always be null
* terminated.
*/
static inline size_t
strlcpy(char *dst, const char *src, size_t len)
{
size_t slen = strlen(src);
if (len == 0)
return (slen);
size_t copied = (slen >= len) ? len - 1 : slen;
(void) memcpy(dst, src, copied);
dst[copied] = '\0';
return (slen);
}
#ifndef HAVE_STRLCPY
extern size_t strlcpy(char *dst, const char *src, size_t len);
#endif
#endif