diff options
author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-11-20 21:20:32 +0900 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2014-12-11 13:18:41 -0700 |
commit | 80d9ef8d40b2aa35c4a3483f5cf3549215187a7c (patch) | |
tree | 15663071cb0f6fc98f997053ee36f676d548fe4f /lib | |
parent | 9b416a9f4ca7cf5ac4d5f7143d67edde7f7d7326 (diff) | |
download | u-boot-imx-80d9ef8d40b2aa35c4a3483f5cf3549215187a7c.zip u-boot-imx-80d9ef8d40b2aa35c4a3483f5cf3549215187a7c.tar.gz u-boot-imx-80d9ef8d40b2aa35c4a3483f5cf3549215187a7c.tar.bz2 |
lib: string: move strlcpy() to a common place
Move strlcpy() definition from drivers/usb/gadget/ether.c to
lib/string.c because it is a very useful function.
Let's add the prototype to include/linux/string.h too.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/string.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/lib/string.c b/lib/string.c index 29c2ca7..87c9a40 100644 --- a/lib/string.c +++ b/lib/string.c @@ -102,6 +102,31 @@ char * strncpy(char * dest,const char *src,size_t count) } #endif +#ifndef __HAVE_ARCH_STRLCPY +/** + * strlcpy - Copy a C-string into a sized buffer + * @dest: Where to copy the string to + * @src: Where to copy the string from + * @size: size of destination buffer + * + * 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 pad + * out the result like strncpy() does. + */ +size_t strlcpy(char *dest, const char *src, size_t size) +{ + size_t ret = strlen(src); + + if (size) { + size_t len = (ret >= size) ? size - 1 : ret; + memcpy(dest, src, len); + dest[len] = '\0'; + } + return ret; +} +#endif + #ifndef __HAVE_ARCH_STRCAT /** * strcat - Append one %NUL-terminated string to another |