From nobody Sat Apr 26 03:21:17 2025 X-Original-To: dev-commits-src-branches@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 4Zkw3L6sYPz5tXkF; Sat, 26 Apr 2025 03:21:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zkw3K6WSDz3L0C; Sat, 26 Apr 2025 03:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745637677; 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=Ai5HZX9l4JS0fD4oiqZVtefoulbbVuQKA1VJAy7qiTc=; b=txbPKRbpeRNvf+y/7EBMtLtMye8H2Qczr/tbHZdmM73P3D1lv7k1cIeYt9ENcfChqzAJ7/ koNLr5TCH+0wnzHCYd1NsGwlCgniAWn7vaU+4Y21TVrhM+FsthAan7BKaAup+nz8njCpe8 2O6nZ5zjOlLNY4syiN0BbhSiSvGX/fsh0W4Sc9CRDKSkxN/KR7yMQN9GYLvyVnRbTfnjQm SMxEDqiTFN1do1TBC3FAs4IaQzG4oZQtz4QHkSNDlMYq6VPXRqTXX8GCYhfqy+RB+6T1Lg gNhJ93gRXLLny8DlIQ+XNnuvGgxCee/cSGwZp3IsO2x8t4eUlHofocv9bMUXJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745637677; a=rsa-sha256; cv=none; b=EgQJpJFiy89NVtS3SqAQcP6Ujo9OR1dQR/39a8JznxRlwdBCKNFYztqjtPuNZdPFj3VoWP 6lxzt28WDhu8fgOOm1YusgYf8cbDh8lrjp6EWDYede6EzcjBZL7gvlAbos1nSfnSwEytVE 5p4nPSUvmCRGKtNhgIRFhqAEQ3+hZFw672Y3KeqaDQO48BenSNbdoguWH00+3JqjtJ/cxK uVhL5zIWZlMzZhpiaim0Lbe8HeJq4peQ7XPHnYjYSEUkw/KG+LPM0XNGl/+dYmQdSI4q7W V0AVyjuR0RRIUD1QrTl5SzOfRmYFg4ZpzrqothBJ8AgOiEO4chyVtfzPMXeYLQ== 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=1745637677; 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=Ai5HZX9l4JS0fD4oiqZVtefoulbbVuQKA1VJAy7qiTc=; b=j/h7tHMpyCqerLJifBeOKQiQZx/lnh7iXvJ2YAdLYhEl3p68d4XDv904/SoT+vCSKRR5xI HP63zgUUvI/M1/nwHoK6Y1nwlKpLnC0hmxi2ytl7kkM/cWxpKCIb++DV1+Ezb002BV6O9d hxNWScET1MftEU+B5zYXmk5IZ623EIgTc2hXn11Y6Z9rrfvJXP5irT3+HlaTaBJa9zzHFT Df8lwvuZ09zIbY/I5d+kJZnG6F5v6c0CTza1IJ1fWF6ctSusRBjsEezhk7sYVjGSMOtMr0 QnLpL4kTu+Vc6GzuhCsOiTUtotd120xWDsOMMasLlC0WC2gXIPFBetr0oAeYiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zkw3K66Xvz12x5; Sat, 26 Apr 2025 03:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53Q3LHCV009760; Sat, 26 Apr 2025 03:21:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53Q3LHXb009757; Sat, 26 Apr 2025 03:21:17 GMT (envelope-from git) Date: Sat, 26 Apr 2025 03:21:17 GMT Message-Id: <202504260321.53Q3LHXb009757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: c195ae95912a - stable/14 - bintrans: disable argument permutation for qp and base64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c195ae95912ac873c62ba6325a82fc39b6aecc7a Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c195ae95912ac873c62ba6325a82fc39b6aecc7a commit c195ae95912ac873c62ba6325a82fc39b6aecc7a Author: Kyle Evans AuthorDate: 2025-04-20 18:08:09 +0000 Commit: Kyle Evans CommitDate: 2025-04-26 03:19:48 +0000 bintrans: disable argument permutation for qp and base64 Err on the side of caution and revert to the BSD-style getopt(3) behavior for argument processing, as it's harder to go back and it's not clear that this was strictly intentional. This is the difference between allowing `base64 /COPYRIGHT -w 80` and forcing `base64 -w 80 /COPYRIGHT`. Reviewed by: emaste, pstef (cherry picked from commit d8fd551438706b3766da23e72ef077945ba43cd3) --- usr.bin/bintrans/bintrans.c | 2 +- usr.bin/bintrans/qp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/bintrans/bintrans.c b/usr.bin/bintrans/bintrans.c index c4b443a9009b..e5e9ac17d524 100644 --- a/usr.bin/bintrans/bintrans.c +++ b/usr.bin/bintrans/bintrans.c @@ -139,7 +139,7 @@ base64_encode_or_decode(int argc, char *argv[]) {NULL, no_argument, NULL, 0} }; - while ((ch = getopt_long(argc, argv, "diw:", opts, NULL)) != -1) + while ((ch = getopt_long(argc, argv, "+diw:", opts, NULL)) != -1) switch (ch) { case 'd': decode = true; diff --git a/usr.bin/bintrans/qp.c b/usr.bin/bintrans/qp.c index 862db437f4e0..a989b17e7162 100644 --- a/usr.bin/bintrans/qp.c +++ b/usr.bin/bintrans/qp.c @@ -181,7 +181,7 @@ main_quotedprintable(int argc, char *argv[]) {NULL, no_argument, NULL, 0} }; - while ((ch = getopt_long(argc, argv, "do:ru", opts, NULL)) != -1) { + while ((ch = getopt_long(argc, argv, "+do:ru", opts, NULL)) != -1) { switch(ch) { case 'o': fpo = fopen(optarg, "w");