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 From patchwork Tue Dec 29 15:35:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 1421215 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::13e; helo=mail-lf1-x13e.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=cGPktttb; dkim-atps=neutral Received: from mail-lf1-x13e.google.com (mail-lf1-x13e.google.com [IPv6:2a00:1450:4864:20::13e]) (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 4D4z642dnDz9sVx for ; Wed, 30 Dec 2020 02:36:10 +1100 (AEDT) Received: by mail-lf1-x13e.google.com with SMTP id c11sf8904986lfi.9 for ; Tue, 29 Dec 2020 07:36:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1609256167; cv=pass; d=google.com; s=arc-20160816; b=K92STmeLyXS1SOdS9uU3tVl9ZsplhToFBlYgBtpyEyXMrnQVASUTD1tyimMTsa9MSY yqoBBTo2g7qCUyk5qtcRmZb9c6cw0QZCZMv1m+0JBZ4ISNsgCEzMrea4qT35tNmBx1Uv aRm5zmvnwYRGW3AONNanZJ0BiTzPkqab6DrTWIxM0NBT+RZWhtvi2ykofdQx3IknHJ/E q7xSUIo8rKnmmFcShidCMS7bRKLD1TIy5sdGFBMSew7cGg1grVIUGJuYhH0wIa4soKw9 XhodiLwpDgYFI3AxJ9ml2bVkokw3DzybB6TvUOo18QsAv1ybeSQWbxLe/LT97oZOXHdu LXtA== 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=vDVm17GGAChi25eF6m/defMm2swb43XZ0oT5Bq3jlFo=; b=aN7JVP7CK6tqb7dXMCzR5tW6kfI1VJHL2MswQyT69kfT8GshmvzcZ2D60pQfxjXurU Bxcg7ZgoUq7GG39/9JCa9HA533aPtkP4v9dvUD/sSBo5xwbNqmaittTQW2WZpLCAeoUz 8LhnKsXd9d3baSfsIonPWNjLowkvuWi94HlkTBjAP//Ht/NiJJ69hqruRVy6JC5urwwJ vuyXN9rp6BlmrJlI/jUiIeLCnU8lvBoHFbO7uJptbC2goU2L2vW8FGjCQnA1cAEXJyom QFFpH794vsXiQNS0JZchNq1XPHHU4YBSo9g08LI7Nr9Pz/68z/XTEEcctav7XNxTPcV9 82tQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=iCQD6E0+; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of bage@linutronix.de designates 2a0a:51c0:0:12e:550::1 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=vDVm17GGAChi25eF6m/defMm2swb43XZ0oT5Bq3jlFo=; b=cGPktttbX5HraUOyu/ETEyLcP0RjkSLMlRh10i3QnVcFf6RTn+/5MGAKXvvZp0ZTkm QYJ87f/hkudx4lCOMxKycisq/O3m/TB5BmflciE/lrdJQv+zSLIJCwyQpEQ21bRZnun/ fBUwLPMvvruF+Ra7C3yW+RuDXKmBOxKp22W4GOxed4PXFu1N0E2cnkPvOUIZ1MUVRXKy 9n7AJ1okLPOnQfCoShkfa6+Jbc3An+gasAPOZAJFDJykUjILt8DpiK8o4F5oO2jiTGBG zdmcr2OY+KOOJhgh2JM7bc6L7o1jBhtw6dC3DaaYjuxyydcawKUtcpaWwWNWSA91T/QP dauA== 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=vDVm17GGAChi25eF6m/defMm2swb43XZ0oT5Bq3jlFo=; b=DX9inXsTwJWigs//Jm3uiONuBhCaNCGjgSp+WTU0UMo+QSI1pLGLJ2oi9Hyde1SUCS YN47ay0lyFR7KiiZGxCK2CqIBtcmM4dzVf7WOrIFPEYYDe3/3B9peIvp8R1y8HalGEJX lOy+LTOsxKEAPwAUeyehAXn1lMdafiaCUHl2Y/eV831TNyyHeJzIp16zaN813ttv6d/6 YmBI7uxloPj2rReVDIIvocU+tuReR+YqjnrTJQTngETuB2AL+va2HcbqooW/mpev2Hww 4M8aKIxp13i5y4HE68StaM/hHxGIwZ/bHA7sCA6vdeiVX17yO+3twz7y2qs4ImhXOs7e oPTQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530p4pSrgGEb64cdp3AkagHMrrH9/zmIynQrWnxEdHsHijPbUG0q 5haHKAcLVmykGs3b5HaxI4k= X-Google-Smtp-Source: ABdhPJxiKhLElZ78WQNz61tXL9lU/IugJ0CvczKQ2t+HJKnzb8dYNGCQAZ0WD4q2nOEGjREM932eHg== X-Received: by 2002:a19:c711:: with SMTP id x17mr16588552lff.56.1609256167098; Tue, 29 Dec 2020 07:36:07 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a19:c886:: with SMTP id y128ls756888lff.0.gmail; Tue, 29 Dec 2020 07:36:06 -0800 (PST) X-Received: by 2002:a19:f718:: with SMTP id z24mr22679255lfe.532.1609256165939; 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=K7rze6euqB/GauLgiBaHjcnA1r1z9kzVrriiKL+TCVpcHM77WIE6hitNUTyNh0NS9F KdKaiFi/sC571U2kTr3BOp2hyxSoixEG6y0FfJTpdJpP0rhvIdKbyzF7nlpdtR9Z3eLw /fHxaQd4S/Na6vnkYCedg/WlvCK+dHQL2DBd4Oe17UjQhYL6IwozSip578NFoR/M8cGC xA8hI9wLfExBFix7mRNc+2YTkOLOBFOXklYLzHg46b8KM6E8hZzutgElRktQUeT2IONF PB6RRUwZIsSaFTHIp9Y1vpdnx0qyh8o5rtYKqfwh2IdTDoqSbjSmQVxJ7iZyvigNuBYR p14w== 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=rb3t9l2atkTogEyQH01gMST9iE+zU0dFYNsEukOzsXA=; b=lkV3PNWW69kF/1nuKl2oj7F9DaYwtyn7qRxQIwVDpDH6fKq8g6GsDJPhnvQd6qHuG8 ugtqKaC1l0CGme8IW/UEI1T7Q9rcL5KAwA8nN4C9sEDmo2vyLXCqp2YW5rEaqLb4aBGx OCpEDX5xie4QBIAeP2dmCh+iAfhoG0ehM0fRfniasP9Z6TGxOzO58pqIWIItz95NCzg7 ds1SrgAqOEOlz6FK21pLu3qYrmU1ObzSG1oQFMvHeLF6E56l1lG3H+CSgou9UcvqzKF9 nWYVYfXWcdzqNFB80aw+QUySX60TzxEIjFCQPuD7rJmToxEid0IXCBfTYcW4UlSwJJFf vSkA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=iCQD6E0+; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of bage@linutronix.de designates 2a0a:51c0:0:12e:550::1 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. [2a0a:51c0:0:12e:550::1]) by gmr-mx.google.com with ESMTPS id t65si773902lff.3.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 2a0a:51c0:0:12e:550::1 as permitted sender) client-ip=2a0a:51c0:0:12e:550::1; From: bage@linutronix.de To: swupdate@googlegroups.com Cc: Bastian Germann Subject: [swupdate] [PATCH 2/3] Revert "Introduce strlcpy() as string copy replacement" Date: Tue, 29 Dec 2020 16:35:55 +0100 Message-Id: <20201229153556.22996-3-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=iCQD6E0+; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of bage@linutronix.de designates 2a0a:51c0:0:12e:550::1 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 ca00d834c6f335ac53ab97dfd8e64fce3c24f3c0. Signed-off-by: Bastian Germann --- core/util.c | 22 ---------------------- include/util.h | 5 ----- 2 files changed, 27 deletions(-) diff --git a/core/util.c b/core/util.c index 6f5313e..2025276 100644 --- a/core/util.c +++ b/core/util.c @@ -223,28 +223,6 @@ char *substring(const char *src, int first, int len) { return s; } -#if defined(__linux__) -size_t -strlcpy(char *dst, const char * src, size_t size) -{ - - 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 - int openfileoutput(const char *filename) { int fdout; diff --git a/include/util.h b/include/util.h index a0edd3e..e5a8955 100644 --- a/include/util.h +++ b/include/util.h @@ -181,11 +181,6 @@ int copy_write(void *out, const void *buf, unsigned int len); #if defined(__FreeBSD__) int copy_write_padded(void *out, const void *buf, unsigned int len); #endif -#if defined(__linux__) -/* strlcpy was originally developped in FreeBSD, not present in glibc */ -size_t -strlcpy(char *dst, const char * src, size_t size); -#endif int copyfile(int fdin, void *out, unsigned int nbytes, unsigned long *offs, unsigned long long seek, int skip_file, int compressed, uint32_t *checksum, From patchwork Tue Dec 29 15:35:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 1421217 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::63d; helo=mail-ej1-x63d.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=O+xf4JBP; dkim-atps=neutral Received: from mail-ej1-x63d.google.com (mail-ej1-x63d.google.com [IPv6:2a00:1450:4864:20::63d]) (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 4D4z643NCNz9sW0 for ; Wed, 30 Dec 2020 02:36:10 +1100 (AEDT) Received: by mail-ej1-x63d.google.com with SMTP id h4sf3508725eja.12 for ; Tue, 29 Dec 2020 07:36:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1609256167; cv=pass; d=google.com; s=arc-20160816; b=VtIReayRiCqLxYBe1VTkheOg/RowVjvgAJxLNmbAWssjve3Iu4XS8/Y26B0ryM+7l0 IA7swM+mfWLPFvscEU3Qr1zFLu9u3vPDiB3A2umaa59P1hUJYX864Tux9mRjqIbr+py8 ZTa+EbprWoAz4xg6HjhOXU0tG+q40gF4+VfNcnzl+W2qCXDr1OEJeW/m+e+GFuWrxje2 MnwUn+0SsCop140l+G6wWjN+aAjTPAJgQ925+NHlrc7j242RkkCU6EvNg6gW3XKeXQAS qEws5dDk6s1oHLo5KYcHNJOG8gQDZav+452FegUZTSRXljfPfQxKbtEZ3Dq1RrqS4Wkz kB7Q== 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=MkeoStLYWyu4mk4N0LQBa5JpDp32i/Ni08RJTlVZ0dQ=; b=E1uJYdikROC5JCipWpy5EUN00qvvfeirQ7ZEC3ezKemIq6g8SQW0wPlTcLuN5su6iS saXdwA4BIH7eHBokAQ5knogzEcEcoM6uuHoNHT/qRGYfiwpmch4hWAyGkecRn0cIJKwS yejGeaLQJIYNA5zr++PwVmDyU4e2NzPvcJ4wO2reU9RlN7cR0o9kQ4IGY/F0Tei6SgrI sW4V0iumQt9o0/yuM5e1rK3a2xP3Z9iqdNwH9OBzoU4z+DiW+eq+iak5uzvcOEmRqy1z /gMUtgT64tSAyaoJoBz8XtfzYiX2E3u8YlGmyujRVkYxYe+ZwZ89e1+TVpJ+O8Iw09EZ rtKQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=C3ZD7K5F; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=8jURnkjl; spf=pass (google.com: domain of bage@linutronix.de designates 2a0a:51c0:0:12e:550::1 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=MkeoStLYWyu4mk4N0LQBa5JpDp32i/Ni08RJTlVZ0dQ=; b=O+xf4JBPkpkimOiFMgQZE4ymBhY4gbCKnoAgc1mFnlPd5EoFV/5QpvJdD9JOaCSK0F vETzYyVJcM7KjEt9Nscq95RNqV6PNGw1yVwejLbOvz1AwjZUw8rJPRiY+ZI++3wND9+l sTFbQy41EdIQ0syZ5i/917kHUkb32FhQPvbTMwSIbQtzgvOYMlC/pUGQTQi5cxdMfHgX gHKuSh34/AR+KdmbXq3999CgC5X5ClMvtkq75/N+nrVu7HSvmfJHJif5WJY1WmEZtytl md9ivzP2BcWpg4MZgb+u7/ok40pBwWf0r8NKwUpL+J9hazLueFRO/XyIEusX0K+yove8 Wipw== 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=MkeoStLYWyu4mk4N0LQBa5JpDp32i/Ni08RJTlVZ0dQ=; b=VVHcBU2Uijit1V9RQRFN0mzDi8B/A8hlvLEKWcfR0d7iWwVgyc7D3zc6fc9MpgSAlb i64f2uqSTXx/oilcBr2KdQk8+Bcxf0Z4NezsOlPU1QyazUEDqZglEWI72r5B19ZzqP13 Z5RJ8v7Tlt8UswwblvUkU69fVj4ujG/R1jFYqeORjpN3Qe1RhCOlLkti52VbFhErsZr5 fhWQt+mFTaY6O4zhDtn2pXugmpdUZExstlQ/IhumPUrF0r08dMS+LuxfY2+iCYLhxTvH zht2tJ2hXjIcFEtlRSQY7lOSRXgTGk7h+oyJoPWh8aaSINFVL3+yymAuhTvcnUL/+WtO JPqA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM53094Op2E8IYLe+WyTeVCylKsdw9jOFxGbrKDMMZLsFV2I+WZpWR K2QdHlob8jwxmteyR+4drcg= X-Google-Smtp-Source: ABdhPJwWrv0Q0MHapl+4sa9GgB8hxHRf0y6+ob7LPPKsLlt1Fj52lgKeo2oSYabG2IuzwcqXzfrQ6A== X-Received: by 2002:a17:906:fb1a:: with SMTP id lz26mr45749775ejb.194.1609256166991; Tue, 29 Dec 2020 07:36:06 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:906:5a96:: with SMTP id l22ls18756037ejq.7.gmail; Tue, 29 Dec 2020 07:36:05 -0800 (PST) X-Received: by 2002:a17:906:d101:: with SMTP id b1mr27205594ejz.80.1609256165930; 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=dg/Jbuw6KxDWZxXpMZpKYK0RZXh+FXAgwuV2xqGi8wFAHuB3yUvQ1RBk7myx+4jZhW ZAkxKA8eeqBuYtJG7q3sDNTwVLq5GvyXM68cPkMtWLYG6Y6//dJYwglHH6fC5d32EK8r kpjBhSjYGEqUC2TV10HN7wESjhWIolIT1hlWg0czlbTH+Bl9FeKwkWpv5UZfPf8BjtqL s4mveZ6WfQK2XgBB9Htq7coUJyuVnOsD6cjhfBAWldzWzpC+tWIDM9UR4jXgIa+Jl0z+ Sl6XyQaXDZda/ftSSUuLVa32u5PhznoSofYlib5BOIyOZ87IqCr+WsyhXS8w1MYMFZNg xXlA== 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=i3DM5xybhlw84s0RPISVPS7vMbp8yx1vKkThYTc6iFo=; b=WthX0kZEcwn+EInj/jhlNEA/olp5qMnxPmcDNze/rYjehSVPhzGIc+Mtd2apNqqC7S mOmfv5AnGo8VC8W2uX/Z7uHW81tggfdfPxB+OfYQuiwm5PtTUcdgk1JaW4Q1T8eIejI5 BPG0pj+mZInpAfiee4UKtWzBtRf2rXIuyFns2c4IiA8VDdvjEALXV+jQ6zrC0ngDcim/ 6h7bJaJZNUGwhtyRvN5QZbABAoijTQ8IlkDTBdRcCi1wY6D1ivYgql4TyTCAqXcKX5iI Y9aj6tZM9pkebCKyT46mxySoNTACYyPuyPB6nSOoax2YSgXQzLOypcHNCuLSRGGvIynZ fqOA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=C3ZD7K5F; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=8jURnkjl; spf=pass (google.com: domain of bage@linutronix.de designates 2a0a:51c0:0:12e:550::1 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. [2a0a:51c0:0:12e:550::1]) by gmr-mx.google.com with ESMTPS id i6si1072996edk.4.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 2a0a:51c0:0:12e:550::1 as permitted sender) client-ip=2a0a:51c0:0:12e:550::1; From: bage@linutronix.de To: swupdate@googlegroups.com Cc: Bastian Germann Subject: [swupdate] [PATCH 3/3] Build with libbsd for strlcpy Date: Tue, 29 Dec 2020 16:35:56 +0100 Message-Id: <20201229153556.22996-4-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=C3ZD7K5F; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=8jURnkjl; spf=pass (google.com: domain of bage@linutronix.de designates 2a0a:51c0:0:12e:550::1 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 The previously included strlcpy implementation can conflict with libbsd if REMOTE_HANDLER is enabled and zeromq is built with libbsd. On Linux, build with libbsd to get rid of that error: handlers/built-in.o: undefined reference to symbol 'strlcpy@@LIBBSD_0.0' Link: https://salsa.debian.org/debian/swupdate/-/jobs/1288597 Signed-off-by: Bastian Germann --- Makefile.flags | 3 +++ doc/source/swupdate.rst | 1 + include/util.h | 1 + 3 files changed, 5 insertions(+) diff --git a/Makefile.flags b/Makefile.flags index 7003af1..783cb89 100644 --- a/Makefile.flags +++ b/Makefile.flags @@ -101,6 +101,9 @@ KBUILD_CFLAGS += --sysroot=$(CONFIG_SYSROOT) export SYSROOT=$(CONFIG_SYSROOT) endif +ifeq ($(HAVE_LINUX),y) +LDLIBS += bsd +endif # Links always pthread LDLIBS += pthread # lua diff --git a/doc/source/swupdate.rst b/doc/source/swupdate.rst index a8144d1..ede3b10 100644 --- a/doc/source/swupdate.rst +++ b/doc/source/swupdate.rst @@ -210,6 +210,7 @@ There are only a few libraries that are required to compile SWUpdate. - openssl / wolfssl / mbedtls (optional) for cryptographic operations - p11-kit & wolfssl (optional) for PKCS#11 support - Lua: liblua and the development headers. +- libbsd is linked on Linux. - libz is always linked. - libconfig (optional) for the default parser - libarchive (optional) for archive handler diff --git a/include/util.h b/include/util.h index e5a8955..d6df2b8 100644 --- a/include/util.h +++ b/include/util.h @@ -13,6 +13,7 @@ #include #include #if defined(__linux__) +#include #include #endif #include "swupdate.h"