From nobody Sun Apr 20 18:08:24 2025 X-Original-To: dev-commits-src-main@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 4Zgc1h2qbqz5tRQv; Sun, 20 Apr 2025 18:08:24 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zgc1h28Bvz3nxq; Sun, 20 Apr 2025 18:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745172504; 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=mkYMmsntqfaYm10RqTwkNAA5iV/Qd3IrTWl20RYoMeE=; b=R6VPYr0rVZGZKSXA3PqXjR0cirOrYEa/g3Ygcra4vXhqWoIoIpy6rvEHN984TrE0RWo32K kfdPi6/SEljPetCKLhAlsv4M4N2L+zVjM5qWdGzctjXPr0F2yui/Y8M8vYO7TDulPBy8KS VP9FIhkHxpEJfOw2ZH16JgVN8Xs/fjkR5Spg1W1STLukHb4L/0eayNlbkzNN1HeUbbpjtb TOXoqVIQHVjqML+5q4fmJB79i7urKDQJITniO0OIubgPmABLTqb48kiZS4EDoqUORQ6vW0 DEdwxljSpAKdvD05h52zUOTohNwnbTa46OpHGsq5qangfJkqqhoMUwFNqM3ayg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745172504; a=rsa-sha256; cv=none; b=gd29KG1NjNk9jOiVOz76OzA8KtRl372LgdZW/AGKX1XpDDFLBsKQwBaYZ0z0UTjgIvBPFK /eFXavfbJHSEtzWRT2oOYc1Y6X5Wf5oVyECb1B17TxDmwmAyeKlhDFjqn4W00M8J+n1cI0 6cAS5zp/EpA5teEybyNZeuEM5bEuT7HMpnp2D6PlimJa7jEK/bN0Fxe0NlqiYE+jnhauYP 7y0DWF3PM9zzYqKFFHlHiUvf7/w2XdbCoDLdoZNldLGhlX/n/pfFlOKIhqIcwbcFg7wfXA 6+OE4Kw3RH15Vm9aI6UX+rR5RKtpgvvhtQmjU1EEnjQI5peZnBNa1imQ4b3M8g== 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=1745172504; 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=mkYMmsntqfaYm10RqTwkNAA5iV/Qd3IrTWl20RYoMeE=; b=GblZOLem5be/4qk+bZPT1a384JIB+oTOH2ijfGK/Qeizr/YCe4vFyZB85eTf3s+F1Zpqvy 7RtcOviLnJEhXinvnIgFSVrNPyz2mYUtexxmCtHKCyvFZAx/5mGf+90gAmAWxpMKGa8Tuv 4IAxpdaYs8dw/gGPnnXStIv567IWrBbf2Czp6pHnyzoTJjvhqF2brIVztKlyECnnC1pE/F 7KrkzCCUQtJMcDsOx8a/fw3QW0tZgol093geIVXMMmIKYSPi9Kx08qcO0FDbV8KvAZyyq+ /+MzT1g+iyz3XTX2nxpf1dMjnalpBZBbH7rWS7xNBwd+GOzp00epTjxsYaD9tw== 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 4Zgc1h1b5YzN0; Sun, 20 Apr 2025 18:08:24 +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 53KI8Oxp074333; Sun, 20 Apr 2025 18:08:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53KI8ONU074330; Sun, 20 Apr 2025 18:08:24 GMT (envelope-from git) Date: Sun, 20 Apr 2025 18:08:24 GMT Message-Id: <202504201808.53KI8ONU074330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: d8fd55143870 - main - bintrans: disable argument permutation for qp and base64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d8fd551438706b3766da23e72ef077945ba43cd3 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d8fd551438706b3766da23e72ef077945ba43cd3 commit d8fd551438706b3766da23e72ef077945ba43cd3 Author: Kyle Evans AuthorDate: 2025-04-20 18:08:09 +0000 Commit: Kyle Evans CommitDate: 2025-04-20 18:08:18 +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 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D48483 --- 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");