[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220504204123.22967-2-baskov@ispras.ru>
Date: Wed, 4 May 2022 23:41:22 +0300
From: Baskov Evgeniy <baskov@...ras.ru>
To: Borislav Petkov <bp@...en8.de>
Cc: Baskov Evgeniy <baskov@...ras.ru>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
Dave Hansen <dave.hansen@...ux.intel.com>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH v2 1/2] x86: add strlcat() to compressed kernel
strlcat() simplifies the code of command line
concatenation and reduces the probability of mistakes.
Signed-off-by: Baskov Evgeniy <baskov@...ras.ru>
diff --git a/arch/x86/boot/compressed/string.c b/arch/x86/boot/compressed/string.c
index 81fc1eaa3229..b0635539b6f6 100644
--- a/arch/x86/boot/compressed/string.c
+++ b/arch/x86/boot/compressed/string.c
@@ -40,6 +40,21 @@ static void *____memcpy(void *dest, const void *src, size_t n)
}
#endif
+size_t strlcat(char *dest, const char *src, size_t count)
+{
+ size_t dsize = strlen(dest);
+ size_t len = strlen(src);
+ size_t res = dsize + len;
+
+ dest += dsize;
+ count -= dsize;
+ if (len >= count)
+ len = count-1;
+ memcpy(dest, src, len);
+ dest[len] = 0;
+ return res;
+}
+
void *memset(void *s, int c, size_t n)
{
int i;
--
2.36.0
Powered by blists - more mailing lists