lib: string: Implement strlcat
This introduces strlcat, which provides a safer interface than strncat. It never copies more than its size bytes, including the terminating nul. In addition, it never reads past dest[size - 1], even if dest is not nul-terminated. This also removes the stub for dwc3 now that we have a proper implementation. Signed-off-by: Sean Anderson <seanga2@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
@@ -13,10 +13,4 @@
|
|||||||
|
|
||||||
#define dev_WARN(dev, format, arg...) debug(format, ##arg)
|
#define dev_WARN(dev, format, arg...) debug(format, ##arg)
|
||||||
|
|
||||||
static inline size_t strlcat(char *dest, const char *src, size_t n)
|
|
||||||
{
|
|
||||||
strcat(dest, src);
|
|
||||||
return strlen(dest) + strlen(src);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -35,6 +35,9 @@ extern char * strcat(char *, const char *);
|
|||||||
#ifndef __HAVE_ARCH_STRNCAT
|
#ifndef __HAVE_ARCH_STRNCAT
|
||||||
extern char * strncat(char *, const char *, __kernel_size_t);
|
extern char * strncat(char *, const char *, __kernel_size_t);
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef __HAVE_ARCH_STRLCAT
|
||||||
|
size_t strlcat(char *, const char *, size_t);
|
||||||
|
#endif
|
||||||
#ifndef __HAVE_ARCH_STRCMP
|
#ifndef __HAVE_ARCH_STRCMP
|
||||||
extern int strcmp(const char *,const char *);
|
extern int strcmp(const char *,const char *);
|
||||||
#endif
|
#endif
|
||||||
|
19
lib/string.c
19
lib/string.c
@@ -180,6 +180,25 @@ char * strncat(char *dest, const char *src, size_t count)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __HAVE_ARCH_STRLCAT
|
||||||
|
/**
|
||||||
|
* strlcat - Append a length-limited, %NUL-terminated string to another
|
||||||
|
* @dest: The string to be appended to
|
||||||
|
* @src: The string to append to it
|
||||||
|
* @size: The size of @dest
|
||||||
|
*
|
||||||
|
* Compatible with *BSD: the result is always a valid NUL-terminated string that
|
||||||
|
* fits in the buffer (unless, of course, the buffer size is zero). It does not
|
||||||
|
* write past @size like strncat() does.
|
||||||
|
*/
|
||||||
|
size_t strlcat(char *dest, const char *src, size_t size)
|
||||||
|
{
|
||||||
|
size_t len = strnlen(dest, size);
|
||||||
|
|
||||||
|
return len + strlcpy(dest + len, src, size - len);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef __HAVE_ARCH_STRCMP
|
#ifndef __HAVE_ARCH_STRCMP
|
||||||
/**
|
/**
|
||||||
* strcmp - Compare two strings
|
* strcmp - Compare two strings
|
||||||
|
Reference in New Issue
Block a user