From patchwork Thu Dec 16 11:36:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1569129 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=vAfpqIh4; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ZWQtlZE7; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JFBMy5HkGz9s1l for ; Thu, 16 Dec 2021 23:32:46 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=VPL7w+/SBxd38GTsZUDqmFl8/AiXQxDA2NwRLxW9Hec=; b=vAfpqIh4gGb0Si KkG2A8T/Dbfq6bzOby98p78ojYVvnQ93sAscnhfITM83jmemo+btpYkFMuMnbaJ0ZKDjpok4eXLFD tnpWzzN7T+/Lbr/Kx431uRRnqUSKm7acuk9AtHco2+8A0lmRHblNCQ4z/Yxhu7KnSRpM1zstL2sJ3 uGENAr2Oua6AIdBE/xQbFU8NpMDne4ct+Phy+mQDH94Cg6rmSBQ/BlIP4Le/6pC0BSt+N/kHeOeHx 2VuZHEmnxkzKzz9wqhJkVf/+26XYtS7n5ORIzzX5VZKyO75YVuj6Wyg3yBWqRR0GoSUojUACr7ExH fZRuea5sHCOF2sPkyTfg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxpqW-005QLf-DN; Thu, 16 Dec 2021 12:26:53 +0000 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxp3h-005EA6-I0 for openwrt-devel@lists.openwrt.org; Thu, 16 Dec 2021 11:36:27 +0000 Received: by mail-lf1-x133.google.com with SMTP id b40so49056025lfv.10 for ; Thu, 16 Dec 2021 03:36:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aWnNBtMLL9QrR6slypepGagWKJZ0BoOciP2+Yh81xYQ=; b=ZWQtlZE7+GsNEUxVEaq1k6opaPLelGwxvwoRxZk2aYP+1w3MHQ3gTAekReht1AdueB qbWcyfXDNxX/Hb5Sgqlx1ypg1cG98oHvgtyL2CG2t3W2BEWcs37Cqe0wpMPFtQMlNPID 7mmkLKqMSiuU/CL1thGxHfYrqj5eV03e9OxrPM/oUvvkMfdEawvN9zZ/AhNd53U77qkw 0Wm6DUNWEIOFBFhPiEdeWjjnsRtMN6ZiWlkIaEmMujFvFKVCWlXQcEsNU9+ZSTIbsqJN PFa61/IED/ygB6DcnS/RTtct3pxy9P3hngJ17MuuDiZvsV3uCtre1/VlXZxKgzUMsoWx 4OAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aWnNBtMLL9QrR6slypepGagWKJZ0BoOciP2+Yh81xYQ=; b=FOrLBeWGHv6cR/U9PuUZpBO+uu/wAIU7EmWeMTTeli9ce1OU4r96qw3XT2D0vebtk1 AwLa6llTbki+jNNleO8fLep60kEMiK6pEOiTXLVTvM/Bgbhmg31yEXeUZ/s/jAHOwTsS IHbe2E55CCHBgsnRxhyQ3oVyG6vphXbt31TZ3ZX4+Ez5/6PNjIfr85lITT2DeiOZhamf mlCNOXvBmauJ8DVHlpHo300r8WgRPv+NHPwu+2rB5OICd4dZLDlj4Ukj5KInb5wlSqi8 28x9IJXH9jCWeRcqj1cw3WLP2M6vcRJdg7exkULA9aUs1WculnwPMsnkPC49SREvYYbD RagQ== X-Gm-Message-State: AOAM5338oLD5dT6gehI5eUOqFwvMEj9st4HH8WuMs4koX5DpJ2LAEPpN 7GLyEFKJRwZWf8Y8rSlkLBXZGjdshfE= X-Google-Smtp-Source: ABdhPJyguSRF9hhohqgIdmJJ13KbLfxlTTdwlfyuRIlqHu+YaTSCoChCBcFCjfkYwjdpnnG6sQ31rQ== X-Received: by 2002:ac2:4119:: with SMTP id b25mr13841700lfi.3.1639654583279; Thu, 16 Dec 2021 03:36:23 -0800 (PST) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id l20sm828879lfj.36.2021.12.16.03.36.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 03:36:23 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH 21.02] busybox: backport dd support for iflag=count_bytes Date: Thu, 16 Dec 2021 12:36:16 +0100 Message-Id: <20211216113616.9885-1-zajec5@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211216_033625_700516_701D9251 X-CRM114-Status: GOOD ( 19.76 ) X-Spam-Score: 0.1 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Rafa=C5=82_Mi=C5=82ecki_It=27s?= =?unknown-8bit?q?_very_useful_flag_for_handling_various?= =?unknown-8bit?q?_formats_in_sysupgrade=2E_This_commits_comes_from_1=2E34=2E?= =?unknown-8bit?q?0_release=2E_Signed-off-by=3A?= =?unknown-8bit?q?_Rafa=C5=82_Mi=C5=82ecki_---_=2E=2E=2E/001-dd-support-iflag?= =?unknown-8bit?q?-count=5Fbytes=2Epatch_=7C_140_++++++++++++++++++?= =?unknown-8bit?q?_1_file_changed=2C_140_insertions=28+=29_create_mode_100644?= =?unknown-8bit?q?_package/utils/busybox/patches/001-dd-suppo?= =?unknown-8bit?b?IFsuLi5dIA==?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E1_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_no_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDoxMzMgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail?= =?unknown-8bit?q?_provider?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_0=2E2_FREEMAIL=5FENVFROM=5FEND=5FDIGIT_Envelope-from_freem?= =?unknown-8bit?q?ail_username_ends?= =?unknown-8bit?q?_in_digit?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_0=2E0_WEIRD=5FQUOTING__________BODY=3A_Weird_repeated_doub?= =?unknown-8bit?q?le-quotation_marks?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 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 From: Rafał Miłecki It's very useful flag for handling various formats in sysupgrade. This commits comes from 1.34.0 release. Signed-off-by: Rafał Miłecki --- .../001-dd-support-iflag-count_bytes.patch | 140 ++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 package/utils/busybox/patches/001-dd-support-iflag-count_bytes.patch diff --git a/package/utils/busybox/patches/001-dd-support-iflag-count_bytes.patch b/package/utils/busybox/patches/001-dd-support-iflag-count_bytes.patch new file mode 100644 index 0000000000..c195c10cf1 --- /dev/null +++ b/package/utils/busybox/patches/001-dd-support-iflag-count_bytes.patch @@ -0,0 +1,140 @@ +From 4eb46e1be6d88eaf077252ce93127ebf00aa8ef2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Wed, 24 Mar 2021 16:01:42 +0100 +Subject: [PATCH] dd: support iflag=count_bytes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It allows passing amount of bytes in the count= + +function old new delta +packed_usage 33599 33617 +18 +static.iflag_words 29 41 +12 +dd_main 1601 1607 +6 +------------------------------------------------------------------------------ +(add/remove: 0/0 grow/shrink: 3/0 up/down: 36/0) Total: 36 bytes + +Signed-off-by: Rafał Miłecki +Signed-off-by: Denys Vlasenko +--- + coreutils/dd.c | 50 ++++++++++++++++++++++++------------- + testsuite/dd/dd-count-bytes | 1 + + 2 files changed, 33 insertions(+), 18 deletions(-) + create mode 100644 testsuite/dd/dd-count-bytes + +--- a/coreutils/dd.c ++++ b/coreutils/dd.c +@@ -59,7 +59,7 @@ + //usage: "[if=FILE] [of=FILE] [" IF_FEATURE_DD_IBS_OBS("ibs=N obs=N/") "bs=N] [count=N] [skip=N] [seek=N]\n" + //usage: IF_FEATURE_DD_IBS_OBS( + //usage: " [conv=notrunc|noerror|sync|fsync]\n" +-//usage: " [iflag=skip_bytes|fullblock|direct] [oflag=seek_bytes|append|direct]" ++//usage: " [iflag=skip_bytes|count_bytes|fullblock|direct] [oflag=seek_bytes|append|direct]" + //usage: ) + //usage:#define dd_full_usage "\n\n" + //usage: "Copy a file with converting and formatting\n" +@@ -82,6 +82,7 @@ + //usage: "\n conv=fsync Physically write data out before finishing" + //usage: "\n conv=swab Swap every pair of bytes" + //usage: "\n iflag=skip_bytes skip=N is in bytes" ++//usage: "\n iflag=count_bytes count=N is in bytes" + //usage: "\n oflag=seek_bytes seek=N is in bytes" + //usage: "\n iflag=direct O_DIRECT input" + //usage: "\n oflag=direct O_DIRECT output" +@@ -136,21 +137,22 @@ enum { + FLAG_SWAB = (1 << 4) * ENABLE_FEATURE_DD_IBS_OBS, + /* end of conv flags */ + /* start of input flags */ +- FLAG_IFLAG_SHIFT = 5, +- FLAG_SKIP_BYTES = (1 << 5) * ENABLE_FEATURE_DD_IBS_OBS, +- FLAG_FULLBLOCK = (1 << 6) * ENABLE_FEATURE_DD_IBS_OBS, +- FLAG_IDIRECT = (1 << 7) * ENABLE_FEATURE_DD_IBS_OBS, ++ FLAG_IFLAG_SHIFT = 5, ++ FLAG_SKIP_BYTES = (1 << 5) * ENABLE_FEATURE_DD_IBS_OBS, ++ FLAG_COUNT_BYTES = (1 << 6) * ENABLE_FEATURE_DD_IBS_OBS, ++ FLAG_FULLBLOCK = (1 << 7) * ENABLE_FEATURE_DD_IBS_OBS, ++ FLAG_IDIRECT = (1 << 8) * ENABLE_FEATURE_DD_IBS_OBS, + /* end of input flags */ + /* start of output flags */ +- FLAG_OFLAG_SHIFT = 8, +- FLAG_SEEK_BYTES = (1 << 8) * ENABLE_FEATURE_DD_IBS_OBS, +- FLAG_APPEND = (1 << 9) * ENABLE_FEATURE_DD_IBS_OBS, +- FLAG_ODIRECT = (1 << 10) * ENABLE_FEATURE_DD_IBS_OBS, ++ FLAG_OFLAG_SHIFT = 9, ++ FLAG_SEEK_BYTES = (1 << 9) * ENABLE_FEATURE_DD_IBS_OBS, ++ FLAG_APPEND = (1 << 10) * ENABLE_FEATURE_DD_IBS_OBS, ++ FLAG_ODIRECT = (1 << 11) * ENABLE_FEATURE_DD_IBS_OBS, + /* end of output flags */ +- FLAG_TWOBUFS = (1 << 11) * ENABLE_FEATURE_DD_IBS_OBS, +- FLAG_COUNT = 1 << 12, +- FLAG_STATUS_NONE = 1 << 13, +- FLAG_STATUS_NOXFER = 1 << 14, ++ FLAG_TWOBUFS = (1 << 12) * ENABLE_FEATURE_DD_IBS_OBS, ++ FLAG_COUNT = 1 << 13, ++ FLAG_STATUS_NONE = 1 << 14, ++ FLAG_STATUS_NOXFER = 1 << 15, + }; + + static void dd_output_status(int UNUSED_PARAM cur_signal) +@@ -175,8 +177,9 @@ static void dd_output_status(int UNUSED_ + //So far we react to it (we print the stats), + //status=none only suppresses final, non-USR1 generated status message. + # endif +- fprintf(stderr, "%llu bytes (%sB) copied, ", +- G.total_bytes, ++ fprintf(stderr, /*G.total_bytes < 1024 ++ ? "%llu bytes copied, " : */ "%llu bytes (%sB) copied, " ++ , G.total_bytes, + /* show fractional digit, use suffixes */ + make_human_readable_str(G.total_bytes, 1, 0) + ); +@@ -317,7 +320,7 @@ int dd_main(int argc UNUSED_PARAM, char + static const char conv_words[] ALIGN1 = + "notrunc\0""sync\0""noerror\0""fsync\0""swab\0"; + static const char iflag_words[] ALIGN1 = +- "skip_bytes\0""fullblock\0""direct\0"; ++ "skip_bytes\0""count_bytes\0""fullblock\0""direct\0"; + static const char oflag_words[] ALIGN1 = + "seek_bytes\0append\0""direct\0"; + #endif +@@ -359,6 +362,7 @@ int dd_main(int argc UNUSED_PARAM, char + /* Partially implemented: */ + //swab swap every pair of input bytes: will abort on non-even reads + OP_iflag_skip_bytes, ++ OP_iflag_count_bytes, + OP_iflag_fullblock, + OP_iflag_direct, + OP_oflag_seek_bytes, +@@ -551,8 +555,17 @@ int dd_main(int argc UNUSED_PARAM, char + goto die_outfile; + } + +- while (!(G.flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) { +- ssize_t n = dd_read(ibuf, ibs); ++ while (1) { ++ ssize_t n = ibs; ++ ++ if (G.flags & FLAG_COUNT) { ++ if (count == 0) ++ break; ++ if ((G.flags & FLAG_COUNT_BYTES) && count < ibs) ++ n = count; ++ } ++ ++ n = dd_read(ibuf, n); + if (n == 0) + break; + if (n < 0) { +@@ -587,6 +600,7 @@ int dd_main(int argc UNUSED_PARAM, char + p16++; + } + } ++ count -= (G.flags & FLAG_COUNT_BYTES) ? n : 1; + if ((size_t)n == ibs) + G.in_full++; + else { +--- /dev/null ++++ b/testsuite/dd/dd-count-bytes +@@ -0,0 +1 @@ ++test "$(echo I WANT | busybox dd count=3 iflag=count_bytes 2>/dev/null)" = "I W"