tadd OpenBSD array handling for compatibility - granular - granular dynamics si… | |
git clone git://src.adamsgaard.dk/granular | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 7e9eec953717ca34bfb7e4d1a49b93b0d1be1a31 | |
parent a3e8b4d285735dbc960c2443cb2753559951fea0 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 25 Mar 2021 10:17:52 +0100 | |
add OpenBSD array handling for compatibility | |
Diffstat: | |
A compat.h | 6 ++++++ | |
A reallocarray.c | 39 +++++++++++++++++++++++++++++… | |
A strlcat.c | 57 +++++++++++++++++++++++++++++… | |
A strlcpy.c | 52 +++++++++++++++++++++++++++++… | |
4 files changed, 154 insertions(+), 0 deletions(-) | |
--- | |
diff --git a/compat.h b/compat.h | |
t@@ -0,0 +1,6 @@ | |
+#undef strlcat | |
+size_t strlcat(char *, const char *, size_t); | |
+#undef strlcpy | |
+size_t strlcpy(char *, const char *, size_t); | |
+#undef reallocarray | |
+void *reallocarray(void *, size_t, size_t); | |
diff --git a/reallocarray.c b/reallocarray.c | |
t@@ -0,0 +1,39 @@ | |
+/* | |
+ * Copyright (c) 2008 Otto Moerbeek <[email protected]> | |
+ * | |
+ * 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. | |
+ */ | |
+ | |
+#include <sys/types.h> | |
+#include <errno.h> | |
+#include <stdint.h> | |
+#include <stdlib.h> | |
+ | |
+#include "compat.h" | |
+ | |
+/* | |
+ * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX | |
+ * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW | |
+ */ | |
+#define MUL_NO_OVERFLOW (1UL << (sizeof(size_t) * 4)) | |
+ | |
+void * | |
+reallocarray(void *optr, size_t nmemb, size_t size) | |
+{ | |
+ if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && | |
+ nmemb > 0 && SIZE_MAX / nmemb < size) { | |
+ errno = ENOMEM; | |
+ return NULL; | |
+ } | |
+ return realloc(optr, size * nmemb); | |
+} | |
diff --git a/strlcat.c b/strlcat.c | |
t@@ -0,0 +1,57 @@ | |
+/* $OpenBSD: strlcat.c,v 1.15 2015/03/02 21:41:08 millert Exp $ … | |
+ | |
+/* | |
+ * Copyright (c) 1998, 2015 Todd C. Miller <[email protected]> | |
+ * | |
+ * 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. | |
+ */ | |
+ | |
+#include <sys/types.h> | |
+#include <string.h> | |
+ | |
+#include "compat.h" | |
+ | |
+/* | |
+ * Appends src to string dst of size dsize (unlike strncat, dsize is the | |
+ * full size of dst, not space left). At most dsize-1 characters | |
+ * will be copied. Always NUL terminates (unless dsize <= strlen(dst)). | |
+ * Returns strlen(src) + MIN(dsize, strlen(initial dst)). | |
+ * If retval >= dsize, truncation occurred. | |
+ */ | |
+size_t | |
+strlcat(char *dst, const char *src, size_t dsize) | |
+{ | |
+ const char *odst = dst; | |
+ const char *osrc = src; | |
+ size_t n = dsize; | |
+ size_t dlen; | |
+ | |
+ /* Find the end of dst and adjust bytes left but don't go past end. */ | |
+ while (n-- != 0 && *dst != '\0') | |
+ dst++; | |
+ dlen = dst - odst; | |
+ n = dsize - dlen; | |
+ | |
+ if (n-- == 0) | |
+ return(dlen + strlen(src)); | |
+ while (*src != '\0') { | |
+ if (n != 0) { | |
+ *dst++ = *src; | |
+ n--; | |
+ } | |
+ src++; | |
+ } | |
+ *dst = '\0'; | |
+ | |
+ return(dlen + (src - osrc)); /* count does not include NUL */ | |
+} | |
diff --git a/strlcpy.c b/strlcpy.c | |
t@@ -0,0 +1,52 @@ | |
+/* $OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $ … | |
+ | |
+/* | |
+ * Copyright (c) 1998, 2015 Todd C. Miller <[email protected]> | |
+ * | |
+ * 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. | |
+ */ | |
+ | |
+#include <sys/types.h> | |
+#include <string.h> | |
+ | |
+#include "compat.h" | |
+ | |
+/* | |
+ * 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 */ | |
+} |