From nobody Sat Jul 25 17:09:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h6rv13K80z6ll1Q for ; Sat, 25 Jul 2026 17:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6rv12BVCz3KMN for ; Sat, 25 Jul 2026 17:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784999373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bZvIfxXTQYWcmeRBQZjZ20ysmMWadDWBDNMAZgmolCs=; b=lALj8cf+2hqvRvbzt0ua5SOavfoYdhCna6ClapqO4F8rE1gzqqmSMLBAbWXSG2CxMLiDan 9GxS/Ekl+6WRBjkJ6IDbGl/U+hBvahb6g+hc+QDWbgXt5+1T2zu0R1mD/lHLwwV3aAMt/2 V4Xfk0kPPVyCNPeyJONMHZUBRlF7dxFhDLBf+/XJoUu70M+U0aDDywVEuQhFuv1csHBgz0 MbTX35QWZO4VwI4I03PZWssvsI8lAfb0IhIlYPuET28Ti+l6EJN2LwEPVNqYbbLJJxavz4 Ro7ZN/dfPPQ7ZzJDmlfFSzvdKu60yR4Ir/wi48hK9W37BRfWH9afdzzWaIFllw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784999373; a=rsa-sha256; cv=none; b=Cl6ohK7JegKFPx/d33RDRkpfzH/cIoADH4+ggra9sW7EJ85mR9uAFi8srHcKwSeJ0d7czk x7i+C6yYyEN9Ll2LeotszouOCc2wS4z89iyCQnafUVvmCDaDYQz4mEPQgC8W1DwVoVc3PW 2GqGK4N3xrMZccwlXqI8BPF5ypCYqNKC6nOMnHXNRJbenZMn3Ps5HVH8oI2wH3fElXa/HQ ClhCs+7z7CPgYj4nkIi4Xl4TFstfhNpVsslZilH9SRbpSyPrNm0lyiweYOP1k2keLCh8mh JglKLwPjtgqCHhi7lLoONY7sOtkg0SeSOindkRW13ac2fn+m2srKn4VTesg3qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784999373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bZvIfxXTQYWcmeRBQZjZ20ysmMWadDWBDNMAZgmolCs=; b=LLr4Y1uKZXRKwJ5qnpJTQmvFvnrTJ8QcseFtdOqRFt3uIVd832O3BtW6x4GAFr1hQ9XgRl wRL5eecBy0kbEBWnXz0MRsT/rhV0NJh2YAfNFA0MMqK8Ewp6L3fDQbLSJ2rKbj3eLUv9HL Ht2teu8VzH6W3JfZuGq2Vf4pHD1QRWwn5e7JRMrydUSgBeIKCqnYbHYcNYbJNMiXy1GIrm oQxWI4jGjBZHjj1luADnKLMwL3l21llrgeeI77guuDMj/LsaxdxWqporvMQjuEex/fdHb5 JQm2o19OHLytJN9OmCifH/ONlJniKP91nsQo5ofoPUMCsLGZ9AXauEhMqWjRYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6rv0697FzlpQ for ; Sat, 25 Jul 2026 17:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f25c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Jul 2026 17:09:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 58e2ad53b989 - stable/15 - tail: Allow repetitive or contraditory options List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 58e2ad53b989267bceabfd4ef928bf16e4ee3fe2 Auto-Submitted: auto-generated Date: Sat, 25 Jul 2026 17:09:32 +0000 Message-Id: <6a64edcc.1f25c.e802d2b@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=58e2ad53b989267bceabfd4ef928bf16e4ee3fe2 commit 58e2ad53b989267bceabfd4ef928bf16e4ee3fe2 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-13 06:42:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-25 17:09:23 +0000 tail: Allow repetitive or contraditory options Unlike its GNU counterpart, our tail(1) has always errored out if given repetitive or contradictory options, even prior to Keith Bostic's 1991 reimplementation. There is no good reason to continue to do so, not even tradition, since many other commands (including head(1)) simply apply the rightmost option in cases like this. MFC after: 1 week Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D58192 (cherry picked from commit 9fc14dbe4897c4541113b9ba98236fbd7eb75380) --- usr.bin/tail/tail.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c index a92eee3881b4..1d76cc59ad61 100644 --- a/usr.bin/tail/tail.c +++ b/usr.bin/tail/tail.c @@ -96,8 +96,6 @@ main(int argc, char *argv[]) */ #define ARG(units, forward, backward) { \ int64_t num; \ - if (style) \ - usage(); \ if (expand_number(optarg, &num)) \ err(1, "illegal offset -- %s", optarg); \ if (num > INT64_MAX / units || num < INT64_MIN / units) \