89 lines
2.7 KiB
Diff
89 lines
2.7 KiB
Diff
From e18faa9c700eb734fe156d336b0f5defa69b8d4e Mon Sep 17 00:00:00 2001
|
|
From: Eric Radman <ericshane@eradman.com>
|
|
Date: Wed, 12 Jan 2022 13:27:32 -0500
|
|
Subject: [PATCH] Update copy of strlcpy(3) for Linux
|
|
|
|
Adjust strlcpy(3) signature to match implementation
|
|
Fixes compile warning with gcc -flto
|
|
---
|
|
missing/compat.h | 2 +-
|
|
missing/strlcpy.c | 37 ++++++++++++++++++-------------------
|
|
4 files changed, 24 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/missing/compat.h b/missing/compat.h
|
|
index 79bd60f..184088c 100644
|
|
--- a/missing/compat.h
|
|
+++ b/missing/compat.h
|
|
@@ -6,7 +6,7 @@
|
|
|
|
#if defined(_LINUX_PORT) && defined(__GLIBC__)
|
|
#include <sys/types.h>
|
|
-size_t strlcpy(char *to, const char *from, int l);
|
|
+size_t strlcpy(char *dst, const char *src, size_t dsize);
|
|
#endif
|
|
|
|
#if defined(_LINUX_PORT)
|
|
diff --git a/missing/strlcpy.c b/missing/strlcpy.c
|
|
index d32b659..2fa498c 100644
|
|
--- a/missing/strlcpy.c
|
|
+++ b/missing/strlcpy.c
|
|
@@ -1,7 +1,7 @@
|
|
-/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */
|
|
+/* $OpenBSD: strlcpy.c,v 1.16 2019/01/25 00:19:25 millert Exp $ */
|
|
|
|
/*
|
|
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
|
|
+ * Copyright (c) 1998, 2015 Todd C. Miller <millert@openbsd.org>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
@@ -20,32 +20,31 @@
|
|
#include <string.h>
|
|
|
|
/*
|
|
- * Copy src to string dst of size siz. At most siz-1 characters
|
|
- * will be copied. Always NUL terminates (unless siz == 0).
|
|
- * Returns strlen(src); if retval >= siz, truncation occurred.
|
|
+ * 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 siz)
|
|
+strlcpy(char *dst, const char *src, size_t dsize)
|
|
{
|
|
- char *d = dst;
|
|
- const char *s = src;
|
|
- size_t n = siz;
|
|
+ const char *osrc = src;
|
|
+ size_t nleft = dsize;
|
|
|
|
- /* Copy as many bytes as will fit */
|
|
- if (n != 0) {
|
|
- while (--n != 0) {
|
|
- if ((*d++ = *s++) == '\0')
|
|
+ /* 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 (n == 0) {
|
|
- if (siz != 0)
|
|
- *d = '\0'; /* NUL-terminate dst */
|
|
- while (*s++)
|
|
+ /* 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(s - src - 1); /* count does not include NUL */
|
|
+ return(src - osrc - 1); /* count does not include NUL */
|
|
}
|