From nobody Mon Feb 9 12:09:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1619015062; cv=none; d=zohomail.com; s=zohoarc; b=WVCFCZ5Ymhm00UUAzCp4gLhIL3KEXIrINjcjj2K90fIpGKdf6smbK3mtCZF2j6H0wEkEtowKRUfsR3wwkbgJhZEdtaA4kRlR1dY2s16aCQzlNy5zIYNIwGH1MLkUHQsQpxZejXvZ4YPI/2CC7ZmiaWX9eO5m1nYnhorNvySqBew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619015062; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Qptv3sDhy3glLo/iGAHFmZQ2Uu0levQpMb7ZH5gYAjo=; b=Vu0dmr/sQWi+dCwuwJDd+ed7BS+mRK76uUMYOkvEIWfOG/XKZb/h+oXVn1ibNVjMYjjhcg1rrZXuC7eJCjjcJ52zmmz00bCd9bujL+lKlWcnX+GQ4CW8S+wOVXJx4PoZdT5dB2Z/i9qVnKTqR27wI+EhzVOtcwHsphX3hcCqH5g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1619015062217772.4256200771365; Wed, 21 Apr 2021 07:24:22 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.114675.218575 (Exim 4.92) (envelope-from ) id 1lZDlw-0002hk-RP; Wed, 21 Apr 2021 14:24:08 +0000 Received: by outflank-mailman (output) from mailman id 114675.218575; Wed, 21 Apr 2021 14:24:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lZDlw-0002hd-Mu; Wed, 21 Apr 2021 14:24:08 +0000 Received: by outflank-mailman (input) for mailman id 114675; Wed, 21 Apr 2021 14:24:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lZDlv-0002hS-Ob for xen-devel@lists.xenproject.org; Wed, 21 Apr 2021 14:24:07 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9d84c05e-1612-47fc-af05-0f30e0f543f0; Wed, 21 Apr 2021 14:24:07 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 40AD3B4D0; Wed, 21 Apr 2021 14:24:06 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9d84c05e-1612-47fc-af05-0f30e0f543f0 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1619015046; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Qptv3sDhy3glLo/iGAHFmZQ2Uu0levQpMb7ZH5gYAjo=; b=jmordhoN2zOGSVSBlRXfCeIiB4vdFvR6Hr7ADEqqUi2/h/hIE+Nelryqu1kvDpJhUga3fq 909PMMrhIBEw2HNspd45ZcLJn/UKrVS9ZowJVJpz9/Wz9lL2gURCMEYrAAzD/IWR6kk6nx UeJ/8JeeeJUQV7bdfmNnDsJFm5htCLk= Subject: [PATCH v2 12/20] lib: move strlcat() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Ian Jackson , Julien Grall , Stefano Stabellini , Wei Liu References: <3ae091ce-6f6c-3ec6-abd3-4490239a707f@suse.com> Message-ID: Date: Wed, 21 Apr 2021 16:24:05 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <3ae091ce-6f6c-3ec6-abd3-4490239a707f@suse.com> Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" Allow the function to be individually linkable, discardable, and overridable. Signed-off-by: Jan Beulich --- a/xen/common/string.c +++ b/xen/common/string.c @@ -56,35 +56,6 @@ int (strcasecmp)(const char *s1, const c } #endif =20 -#ifndef __HAVE_ARCH_STRLCAT -/** - * strlcat - Append a %NUL terminated string into a sized buffer - * @dest: Where to copy the string to - * @src: Where to copy the string from - * @size: size of destination buffer - * - * Compatible with *BSD: the result is always a valid - * NUL-terminated string that fits in the buffer (unless, - * of course, the buffer size is zero). - */ -size_t strlcat(char *dest, const char *src, size_t size) -{ - size_t slen =3D strlen(src); - size_t dlen =3D strnlen(dest, size); - char *p =3D dest + dlen; - - while ((p - dest) < size) - if ((*p++ =3D *src++) =3D=3D '\0') - break; - - if (dlen < size) - *(p-1) =3D '\0'; - - return slen + dlen; -} -EXPORT_SYMBOL(strlcat); -#endif - #ifndef __HAVE_ARCH_STRCHR /** * strchr - Find the first occurrence of a character in a string --- a/xen/lib/Makefile +++ b/xen/lib/Makefile @@ -15,6 +15,7 @@ lib-y +=3D parse-size.o lib-y +=3D rbtree.o lib-y +=3D sort.o lib-y +=3D strcmp.o +lib-y +=3D strlcat.o lib-y +=3D strlcpy.o lib-y +=3D strlen.o lib-y +=3D strncmp.o --- /dev/null +++ b/xen/lib/strlcat.c @@ -0,0 +1,41 @@ +/* + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +#include + +/** + * strlcat - Append a %NUL terminated string into a sized buffer + * @dest: Where to copy the string to + * @src: Where to copy the string from + * @size: size of destination buffer + * + * Compatible with *BSD: the result is always a valid + * NUL-terminated string that fits in the buffer (unless, + * of course, the buffer size is zero). + */ +size_t strlcat(char *dest, const char *src, size_t size) +{ + size_t slen =3D strlen(src); + size_t dlen =3D strnlen(dest, size); + char *p =3D dest + dlen; + + while ((p - dest) < size) + if ((*p++ =3D *src++) =3D=3D '\0') + break; + + if (dlen < size) + *(p-1) =3D '\0'; + + return slen + dlen; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + */