From 0822df4d5f9d4313c3dbfb54e9e4c5624fb705a5 Mon Sep 17 00:00:00 2001 From: Wynn Wolf Arbor Date: Sun, 24 May 2020 13:51:13 +0200 Subject: Add strlcpy(3) from OpenBSD The original file location in the OpenBSD tree - lib/libc/string/strlcpy.c --- slowcgi.c | 6 ++++++ strlcpy.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 strlcpy.c diff --git a/slowcgi.c b/slowcgi.c index 660f95e..a422918 100644 --- a/slowcgi.c +++ b/slowcgi.c @@ -39,6 +39,12 @@ #include #include +#ifdef strlcpy +#define HAVE_STRLCPY +#else +size_t strlcpy(char *, const char *, size_t); +#endif + #ifndef __packed #define __packed __attribute__((packed)) #endif diff --git a/strlcpy.c b/strlcpy.c new file mode 100644 index 0000000..a3192d5 --- /dev/null +++ b/strlcpy.c @@ -0,0 +1,56 @@ +/* $OpenBSD: strlcpy.c,v 1.16 2019/01/25 00:19:25 millert Exp $ */ + +/* + * Copyright (c) 1998, 2015 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef HAVE_STRLCPY + +#include +#include + +size_t strlcpy(char *, const char *, size_t); + +/* + * Copy string src to buffer dst of size dsize. At most dsize-1 + * chars will be copied. Always NUL terminates (unless dsize == 0). + * Returns strlen(src); if retval >= dsize, truncation occurred. + */ +size_t +strlcpy(char *dst, const char *src, size_t dsize) +{ + const char *osrc = src; + size_t nleft = dsize; + + /* Copy as many bytes as will fit. */ + if (nleft != 0) { + while (--nleft != 0) { + if ((*dst++ = *src++) == '\0') + break; + } + } + + /* Not enough room in dst, add NUL and traverse rest of src. */ + if (nleft == 0) { + if (dsize != 0) + *dst = '\0'; /* NUL-terminate dst */ + while (*src++) + ; + } + + return(src - osrc - 1); /* count does not include NUL */ +} + +#endif -- cgit v1.2.3-2-gb3c3