From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0DB0C433F5 for ; Thu, 5 May 2022 10:32:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355877AbiEEKgb (ORCPT ); Thu, 5 May 2022 06:36:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355879AbiEEKg2 (ORCPT ); Thu, 5 May 2022 06:36:28 -0400 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4D6941631 for ; Thu, 5 May 2022 03:32:47 -0700 (PDT) Received: from localhost.localdomain (unknown [80.240.223.29]) by mail.ispras.ru (Postfix) with ESMTPSA id A897440755E9; Thu, 5 May 2022 10:32:43 +0000 (UTC) From: Baskov Evgeniy To: Borislav Petkov Cc: Baskov Evgeniy , Thomas Gleixner , Ingo Molnar , Dave Hansen , x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/2] x86: Add strlcat() to compressed kernel Date: Thu, 5 May 2022 13:32:23 +0300 Message-Id: <20220505103224.21667-2-baskov@ispras.ru> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220505103224.21667-1-baskov@ispras.ru> References: <20220505103224.21667-1-baskov@ispras.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org strlcat() simplifies the code of command line concatenation and reduces the probability of mistakes. Signed-off-by: Baskov Evgeniy 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