From b4cf974a3256275fe2c03d8eaaf07a5e5b337cfc Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Thu, 27 Sep 2018 09:22:19 +0100 Subject: [PATCH] libc: Adapt strlcpy to this codebase Change-Id: I2f5f64aaf90caae936510e1179392a8835f493e0 Signed-off-by: Antonio Nino Diaz --- include/lib/libc/string.h | 1 + lib/libc/libc.mk | 1 + lib/libc/strlcpy.c | 9 ++++----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/lib/libc/string.h b/include/lib/libc/string.h index 3c8e3b65..ee6eeace 100644 --- a/include/lib/libc/string.h +++ b/include/lib/libc/string.h @@ -28,5 +28,6 @@ void *memset(void *dst, int val, size_t count); size_t strlen(const char *s); size_t strnlen(const char *s, size_t maxlen); char *strrchr(const char *p, int ch); +size_t strlcpy(char * dst, const char * src, size_t dsize); #endif /* STRING_H */ diff --git a/lib/libc/libc.mk b/lib/libc/libc.mk index daa2ec10..1276f5c8 100644 --- a/lib/libc/libc.mk +++ b/lib/libc/libc.mk @@ -19,6 +19,7 @@ LIBC_SRCS := $(addprefix lib/libc/, \ snprintf.c \ strchr.c \ strcmp.c \ + strlcpy.c \ strlen.c \ strncmp.c \ strnlen.c \ diff --git a/lib/libc/strlcpy.c b/lib/libc/strlcpy.c index 019d2316..c4f39bb9 100644 --- a/lib/libc/strlcpy.c +++ b/lib/libc/strlcpy.c @@ -1,6 +1,8 @@ /* $OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $ */ /* + * SPDX-License-Identifier: ISC + * * Copyright (c) 1998, 2015 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any @@ -16,10 +18,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -__FBSDID("$FreeBSD$"); - -#include +#include #include /* @@ -28,7 +27,7 @@ __FBSDID("$FreeBSD$"); * Returns strlen(src); if retval >= dsize, truncation occurred. */ size_t -strlcpy(char * __restrict dst, const char * __restrict src, size_t dsize) +strlcpy(char * dst, const char * src, size_t dsize) { const char *osrc = src; size_t nleft = dsize; -- 2.30.2