From patchwork Mon Jan 4 00:28:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1421979 X-Patchwork-Delegate: freifunk@adrianschmutzler.de 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=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=brTrZlMW; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4D8Gl95kCMz9s24 for ; Mon, 4 Jan 2021 11:31:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=Ne2XgRokfnZhK1aPY0nEBHZV4IefYHJH3qn067NtDt0=; b=brTrZlMWqkY+AeiwaCITPhNe2w a5d8iudCwQX/lf2VxLO91zmXqe1X4MbBDzJdSJMJcd0KmYuP1CKyWGVlFMXhf0bJC/zVROFcdG7Uv gZs/4d8sUx3Y4jVQiXpCRfwI2Mexr/V400Ct3OxkjJdFra7JheBH7ZD3rdk2cT7v1BP5LV7Wo1m8v Jk2tOKJqn2HJ6a14borJ1/QU+A+wHBp+hiyPtXeBHYesMXeviHvcNApqSoL7j7u9Un1hxyyKG1B3T MUroM9N7rQHUMFQYdS7YR0m+jPsQhdfoP/ou9yLvECrFqNlcooD6E4qbFqf11oap2f06Vp4vpKCVL C4QoeYjg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwDkg-00082u-HW; Mon, 04 Jan 2021 00:29:38 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwDkY-0007xx-RH for openwrt-devel@lists.openwrt.org; Mon, 04 Jan 2021 00:29:33 +0000 Received: from buildfff.adridolf.com ([178.26.242.49]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MNOZO-1kbpaW3jFS-00Opvl for ; Mon, 04 Jan 2021 01:29:26 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] base-files: read all 3 bytes in get_magic_vfat() at once Date: Mon, 4 Jan 2021 01:28:44 +0100 Message-Id: <20210104002844.57223-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:rdBe8wdD4T0XIO+Ycc23gDzaAHlhK9Noo5FuLrYIzXgn7YM/lJi UatvTfn5JD7dqABc7zRkj2ILDKIH8Rp+qw/UMJw/FHXkMTu40tVz1AGVGlkKuCNkaX7Uim9 4V9KsIS7nLT74koo2Y1xVwT0aVI45xJabf+pyh7roJKBBOhXbfLVDB/6j7CYfAaGzbwCc+O ujDDkPVwoUiC/MGCXLxOg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:J9JtPSqUC+U=:2RfFTSxleOvG0uoYSpNn05 TccR9IU6Rz3xNqhk3AHkS6rR74VTGwzVJriXfpGKXKXnQCBdqL/Ad6GwJ3ieIBeeqIr/4LTaD dinbR24ay/DfmsM9aCA+mopsaDJii9hkSZe1fymiUi25epFwe0IiBaP06/ekvxb94Ny1nU+10 t7KbY/AVYywGdKXfI2TgMvBdmYT3K/afruFKhzmo2w6IY04pL9P+RB9U704oguI3PkKDce+uj hNLWY6ykqYnhvjix/V0NJ8IfkJvhn2GzztOzeXDI0MdCAVcY1lR8zETuDIvXJrsgsYYTpwXt6 YBu3ceTOgG2aOqATUP3WEOqdCCS5bJNtErwtoUrElVdCizfLLgmh5fXbuVz3fHj0YqZkR5C+t Lo5aKcQ6bjJibP3q1wG3DuMxIiSoSiGF4tqZ7IO+GSq09ztRnkDMz0EAX25HSZtYss3wWebIs XA2MQHZq4Q== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210103_192931_878164_CF72228C X-CRM114-Status: UNSURE ( 9.55 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.131 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.131 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org While the speed improvement might be negligible, there is still no reason to read individual bytes. Signed-off-by: Adrian Schmutzler --- package/base-files/Makefile | 2 +- package/base-files/files/lib/upgrade/common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index da3976424f..8d40eb0e49 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=244 +PKG_RELEASE:=245 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index e8a28f4138..c28bae48a1 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -130,7 +130,7 @@ get_magic_gpt() { } get_magic_vfat() { - (get_image "$@" | dd bs=1 count=3 skip=54) 2>/dev/null + (get_image "$@" | dd bs=3 count=1 skip=18) 2>/dev/null } get_magic_fat32() {