From patchwork Mon Jan 4 11:10:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1422041 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=j4f1VwUo; 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 4D8Y0r2RhQz9sTv for ; Mon, 4 Jan 2021 22:14:03 +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=bNyedagAweFpkEfUE/IOAxoE3NXwSa1KbcQAnMP0+mg=; b=j4f1VwUoZow40rFFvOsa18kE4l Tb8N8V7q3G5Wk1EtrVYGfdsTl9uemwNTXIR0f0iJeMwVVaU8vDTm6NYfOgHDmKU+kSgSDXABCEpPB wk4Vk7loAz2pngAh4JLsanp0VunTaiW8N4Gy+xlN71FGduwNoB42R2javXjZF7tsZo2WMqYuXDK6x wIyANgQ2Z3/EJnUs0TvhDFs/AJCA5bIX7k2YK/UNbz4ICmmTFbh+RCc3Z5XlD3li8L+bcR7neWshj JZTyUvnGOFRsn59RabJTMV1sq4eefQM+zO/cL6AbQSzsEJgBKff8ZrffvlyXWxRmJKlO3gQXypbCo J06xafyQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwNm8-0001h6-9i; Mon, 04 Jan 2021 11:11:48 +0000 Received: from mout.kundenserver.de ([212.227.126.134]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwNm3-0001fS-Ka for openwrt-devel@lists.openwrt.org; Mon, 04 Jan 2021 11:11:45 +0000 Received: from buildfff.adridolf.com ([178.26.242.49]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M8k65-1ksEub3OJl-004hjC; Mon, 04 Jan 2021 12:11:40 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] base-files: read all 5 bytes in get_magic_fat32() at once Date: Mon, 4 Jan 2021 12:10:54 +0100 Message-Id: <20210104111054.1417-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:h2QgVGpH64HZxP8KoyH6hNsF77Zj6dafw7dM7jZ0G4gmVI5Xxs4 e2djV32yVjkaXwNKNz9G6XLrPu6gAd/fR+oDZU51SCnJTaxoaKnffWbR96Av08J+Emu/hPB RwYveG64/8whdwMaxuMAcsFNE0ME2Pb0YOue61PYUqJV4pe0OpRGgPRA8v3zC0mN3LCri+q tBqQfpB/18e7Maag3b/hg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:uBBlwH54Mm0=:NYjV/Xt5Wu9flHgeNULiw3 O6BIgSpMbS7RneSRXcOrXcOjNJSE7r84O/7ckQ6M0d00B9Perny8+Ly76SQfQX2fWd8nixega bH67RO1v5175ZD5dJoV0E+VVPG0WlRQDoAUE+5OZ7M4lFyCHqynp24r3QTtVkoWhTWywV+zrJ cr0DPK0zW0idpnFN7kZjoHlTzgz2V30pl4aT0OKvyu/73j1UUiGpWNmB6CmWk/0un2NE/4uVR VtWE6kAP8L6mO/qU8JxISx8ttl4JoP/FUE2dCyD7WkdrRXaBXtgrW2NML2xgmZNwiawa/K7Rj +PLCbLzXfCQpEsPO+H4WqB3tAVUx5qamQKm4FMAmx4AeayG9D/hiyjR1GJbVxiCCnCoXGl4Cr OWB2S5+up24L2+RIi/6aIkETB0vhkH/x6Nk9VYtCaVuItaO2+RLwlaGn4F6d2yBKnT8LCkwvQ iUI15A0N3g== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210104_061143_919335_DE55CA5E X-CRM114-Status: GOOD ( 10.44 ) 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_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.134 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.134 listed in wl.mailspike.net] -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. Suggested-by: Paul Spooren 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 8d40eb0e49..f18f221129 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:=245 +PKG_RELEASE:=246 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 c28bae48a1..9b17e2ac5d 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -134,7 +134,7 @@ get_magic_vfat() { } get_magic_fat32() { - (get_image "$@" | dd bs=1 count=5 skip=82) 2>/dev/null + (get_image "$@" | dd iflag=skip_bytes bs=5 count=1 skip=82) 2>/dev/null } part_magic_efi() {