From patchwork Tue Dec 29 15:35:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 1421218 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::139; helo=mail-lf1-x139.google.com; envelope-from=swupdate+bncbdpppp7kyilbbzuzvx7qkgqe7olcufy@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linutronix.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=FY2oKvLj; dkim-atps=neutral Received: from mail-lf1-x139.google.com (mail-lf1-x139.google.com [IPv6:2a00:1450:4864:20::139]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D4z641MtCz9sVt for ; Wed, 30 Dec 2020 02:36:10 +1100 (AEDT) Received: by mail-lf1-x139.google.com with SMTP id x187sf8900961lfa.3 for ; Tue, 29 Dec 2020 07:36:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1609256166; cv=pass; d=google.com; s=arc-20160816; b=qwzkTIgT96bbH+5xq1tUXNMSh0qTD9GOIyOdRdW9FnRQOy3JygUDAmFqbx6TGGcjUX IODmImi9BvbqhuNDM27/CjfbtNY9cTqpaVUPpgmb7J4Da4U2qiRDywP/ZiuE/vafeJzP Ruuq0dUFgJz7uGStpG49ZGTEdH6fKFnn4lk05GBNGSlN1qATF88/PSY3oC4228x8OFh2 qOZON7SSMDtvM5aeoRFNtu/8rXZel3HD2HrbwYkgnlKSwvJtBge79jXqz3RCNiJflI+e f5hcKbNQmbhgyv7PR80QV0R6y5bkSIvguOZaXXl6GK3wvBZRwvzMZAsPljZXof0NIhSi 4wvQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=dOQRa7197PBORkm4ZLtcv3JP2OfRy7FRFN4xMG+v5Zs=; b=hp5YlAjp8VCPmPmswX3WMseNhs3wrJL5WjgmoanCE3Ut9c1Gnw78VzNb6KL9ZkfqIG 9Z8yMYn5Tc0V4GUp1h7caDignbD4gTdMUmW1PzQwGNg7RSpzSkRlZREcLN7joYsIjmeF PAe57m0ojh/9ED5ckc0/FYacqkVjsvD+AeLvJSwHrwYeNvplSyzAXMBySPsIaRZFEs00 yM9jJ/wVMy/m60fSTiE0hLF4osGEThR/pg6gRowHee9FDv5mR3T1RdmpfDTI0Fk4BrH0 EwI3DD1ue73fan+VdaKCAv4aLEkELebFz0ngGbP/ohM8ekTvTlIXY6ofsYSNBBPk6Rcf mlnw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=q2Zkfbsk; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of bage@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=bage@linutronix.de; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=dOQRa7197PBORkm4ZLtcv3JP2OfRy7FRFN4xMG+v5Zs=; b=FY2oKvLjNcaifcSzvXY+yfPNcCx/5Dx6Qh0XaaeOIDlBOYNKBrpilO6Vk2Rmge4Ru2 ojd4Yvq22SbtXI9d0XZw9Yy1mB2ZaPPhEmGSKzufXx/XBRFvJTt5gHgTmYmuJp3u5MOu Cs0Ffdev+0HAb6uv+xrcpR9NpDdlHY6dPswDWsv7PQoGBPtKEtG/lGaKI8H+rh1gIdCz tdI8stnElMMBXhVbHobJgU528hr6C7/UgukCT63DUsO2U5qeMCTNYinacJb8ywRrD/Vv Yy9HkzValoh64UOF1w6ncuHcHdnpVQDRc4Vkfuy2ZZyMIOUA2LpmW7RuBXg0nazf+5m0 s4AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=dOQRa7197PBORkm4ZLtcv3JP2OfRy7FRFN4xMG+v5Zs=; b=HpjkXuxD0aKdES+UJrtYlYsyPEgcCVd7lIUD+zqmhh/MwZ9uUVHQ9BblO7gCq4OnLV e0hmYB3GyxOP+umaoJwXbEWkyWVGYMTpcFuMtEXAJbcuBf7PJ1L6jUGYByPSiXG6VUcw 8bc2qzn5JmJ/iIuUtOXFkUc+tjo+qafx6HnX+NCdNVSIK050xS0oXfE88SDCmlhfJRAZ BEyeHvxIGqyVT3qgpzK8OLHGOEC/7/lzlhjY7K1xW8VRVcYoKAuMXAQ90Y7VR8azkuv8 nuu3oKbLphcn5XT55MHjEdjNXR5S+iuy/2VPIt500ral+dbwNg5E2RQWrBob5HzD/V51 lhgg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532R4388XmR9gPjufHHXws2N0d1hNoQ1GRZ7FIUaMssMUq2KKDcS zQFTevGkAXTr4z1GMNCgl9E= X-Google-Smtp-Source: ABdhPJwNmXP/slXQnuyI9mPvmwnjlBi5V3SzARCUVATrfhQ9+qY46u3W8liIhdkXpo8toujGHnua4Q== X-Received: by 2002:a2e:b538:: with SMTP id z24mr25798876ljm.478.1609256166733; Tue, 29 Dec 2020 07:36:06 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:7d0d:: with SMTP id y13ls10231764ljc.9.gmail; Tue, 29 Dec 2020 07:36:05 -0800 (PST) X-Received: by 2002:a05:651c:1386:: with SMTP id k6mr23822776ljb.113.1609256165536; Tue, 29 Dec 2020 07:36:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609256165; cv=none; d=google.com; s=arc-20160816; b=k4Klf4C53i4vh9BP94CqqFYguAvnXtSuSMdgzPuXwu+0hhc3e5E5QSY9gufBTA06bB sxO/TFlW+qyCvYrry9NzWDj3rrBtTFZ8zH6Y4UNLoLdDHHQku19L+xM8mdgMrCpupS6c piIo787ald4wJk9UJDOkWtIEflrbbDmfPCfkOWkC4t24swwZNmaDl9TLB3deRGp/oeaM uZGIH2q8s4vsXfcXMwonbL4B20JvNcsJcC7mHbh2Di6iXWZDkcu5mwl+XogqeiQ9wGYx wbn8A07f9n3UmuCYUvz1urEp21k0oRZ2F8wcHWz1J1FJNWOwNhmOX0WXR7QaZu5VKtma 2rWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dkim-signature:dkim-signature:from; bh=eN4ohlW7iGvLYrGU7ZmlSs5UaPhoJUyyaJIrstt9YAk=; b=0q5nr04wwZm+/LDLyaR8ITbf73rE9NzYA/UrCQS8EPJ8sJ3rd8uD6Qsl9evn54Dmf+ C2T7SH7y49iF3YbyPlZd+7H+q8C+57bbBZgbyEacQoK+CBaC6B6/mjPu8LTgxgk4C+Wz RV0SEopiLYpLrgA0G7Rz05Suskllx6PR6nKUwVtH3XvXu1LIxTzr3h6L9XEBLWi0/vvf OC0myzHE8y7e+1R0aqFWoqD0t6P1qBwLPt6a7FPPjpgCdz5dqupOzvoBbqZgySXyR1gW s3g/aYAR+YkL9+H8QvlagtefTDhts11huqoXAzj9vbs3vUnxzDxUKEZmRAV4SvA+wDvZ l5XA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=q2Zkfbsk; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of bage@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=bage@linutronix.de; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from galois.linutronix.de (Galois.linutronix.de. [193.142.43.55]) by gmr-mx.google.com with ESMTPS id c24si1251127lfc.1.2020.12.29.07.36.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Dec 2020 07:36:05 -0800 (PST) Received-SPF: pass (google.com: domain of bage@linutronix.de designates 193.142.43.55 as permitted sender) client-ip=193.142.43.55; From: bage@linutronix.de To: swupdate@googlegroups.com Cc: Bastian Germann Subject: [swupdate] [PATCH 1/3] Revert "Replace own implementation of strlcpy with FreeBSD" Date: Tue, 29 Dec 2020 16:35:54 +0100 Message-Id: <20201229153556.22996-2-bage@linutronix.de> In-Reply-To: <20201229153556.22996-1-bage@linutronix.de> References: <20201229153556.22996-1-bage@linutronix.de> MIME-Version: 1.0 X-Original-Sender: bage@linutronix.de X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=q2Zkfbsk; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of bage@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=bage@linutronix.de; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , From: Bastian Germann This reverts commit 43b59c9bc5a8073f4170d152a10720c6df5e021f. Signed-off-by: Bastian Germann --- core/util.c | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/core/util.c b/core/util.c index 69d02c5..6f5313e 100644 --- a/core/util.c +++ b/core/util.c @@ -224,35 +224,24 @@ char *substring(const char *src, int first, int len) { } #if defined(__linux__) - -/* - * 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 * __restrict dst, const char * __restrict src, size_t dsize) +strlcpy(char *dst, const char * src, size_t size) { - 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 */ + size_t len = strlen(src); + /* + * src is null termintaed, + * copy the last '\0', too. + */ + if (len < size) { + memcpy(dst, src, len + 1); + } else if (len) { + /* truncate string */ + memcpy(dst, src, size - 1); + /* Add C string terminator */ + dst[size - 1] = '\0'; + } + return len; } #endif