From nobody Wed Aug 24 18:22:25 2022 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 4MCZFY4Gv8z4ZXGJ; Wed, 24 Aug 2022 18:22:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MCZFY3Wqcz3K9T; Wed, 24 Aug 2022 18:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661365345; 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=6gjoWVyOaTl48Ko06sb+gRc4M2DqyqtCyoXfncDJmXg=; b=vI+u+Zlk0xKGC4U5ssfxjEy8MH855ORfK4D5IBwBEOQwI51P/FX1i6W5zFjeFGlQKtenmu I/aAS4A7QT/l7f3w7I0vNbgDLyaB2LdGPOD9NtLSp8Ka+7bvyQHQhGSQn/n/DITQffIQ1N U44E9iJk8j5G4et/rUM5v5x56GAQpj95qzz7Ie/HI8mOmQTqY26GHftwElUTck1oqhpVPP b67P9QKGFJK1isCJ42LFJ4Wuxvox7n1F5oKZbuad9MTzA55eOhv61CFxEH6zZ4F6KnjWIx 2erevgDIQIz6L4oM4+0XP5KC2zGyN9SzpioJaXWLFSpAQTHjp8DQrWu2l7Sm9g== 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 4MCZFY2Z8vzJhr; Wed, 24 Aug 2022 18:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27OIMPH7083759; Wed, 24 Aug 2022 18:22:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27OIMPa3083758; Wed, 24 Aug 2022 18:22:25 GMT (envelope-from git) Date: Wed, 24 Aug 2022 18:22:25 GMT Message-Id: <202208241822.27OIMPa3083758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 6480563d0678 - stable/13 - sh: accept fc options grouped behind one '-' 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6480563d0678662301b04c010d4f96f05283fc12 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661365345; 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=6gjoWVyOaTl48Ko06sb+gRc4M2DqyqtCyoXfncDJmXg=; b=HrLgL4MR8he1yUMOWTIzIUhtUKeRFYTBQL0cCL1lIFykvtSiCp/kX5tcbwU9kT2RcLCe5C GJM75EVCEarKAjQfRH1srvzU/FOiI5u8cFyyXzpNh6acEUK7HSbbcEr41STxnp6Q2KH3lY sJc7H43YWKN2FdgdSIcq49+uLBgbv+JF9bgzDmWrygBpbCAGzLr+0ncuAQawvBDPNZpvGu vId3GxUMzkzMohgzwORO2NoXCGxlgx0UHhhWlgpp3TM5ZclRLXHPyH4GF/6b5ZpO00fwvz lEtgKeZb5I8jk0wm8ahU0QFiWkRGD28VAW9dMOuwSdYlK3hM8d6ZplAsoOBeog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661365345; a=rsa-sha256; cv=none; b=QCcDhHGTuQaJmrS+fRnkhK9AwnwlUmbfbxZfIEwudwtjdmatMbkYF9Qz7Ru00uZshur5MA 6GaP5IKQRufeIr6qRiBNfH2Q0kRikwaRvTj949o8loc579jtNmnimMtEKrq5+RR5/2BkyK 49fhPByMWSnAM+8AH0CG29OUGCwg+cYX/snMMyxUwuw9ybXqZHDQODskkSC2IeWdDYEl7N gipa/sJR1ZVMmxK95IBROatA/lBERymgwT5EpB8seMWOKUr+9Mxzv1Ec1LZ/qxjc/kAZ7i J2JvPLQmUoc7KYMBHT39zy/p8itHMJ9nvBzkU+zwGbIUW+FCjXRaLZHA8hZDZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=6480563d0678662301b04c010d4f96f05283fc12 commit 6480563d0678662301b04c010d4f96f05283fc12 Author: Piotr Pawel Stefaniak AuthorDate: 2022-08-20 10:15:05 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2022-08-24 18:21:23 +0000 sh: accept fc options grouped behind one '-' As per Utility Syntax Guidelines, accept both forms: -l -n and -ln. To do that, anticipate the source string for the next option that will be parsed by nextopt(). It's not always *argptr, sometimes it is nextopt_optptr. To simplify the check for not_fcnumber, slightly modify nextopt() to always nullify nextopt_optptr in cases where it would have been set to point to a NUL character. (cherry picked from commit 755a1be6d015287763b0f336d4e9b8179615f511) --- bin/sh/histedit.c | 43 ++++++++++++++++++++------------------ bin/sh/options.c | 5 ++++- bin/sh/tests/builtins/Makefile | 1 + bin/sh/tests/builtins/fc3.0 | 9 ++++++++ bin/sh/tests/builtins/fc3.0.stderr | 1 + bin/sh/tests/builtins/fc3.0.stdout | 3 +++ 6 files changed, 41 insertions(+), 21 deletions(-) diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index 2001b80bd8ed..b9af20e6e9ab 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -256,7 +256,6 @@ setterm(const char *term) int histcmd(int argc, char **argv __unused) { - int ch; const char *editor = NULL; HistEvent he; int lflg = 0, nflg = 0, rflg = 0, sflg = 0; @@ -278,25 +277,29 @@ histcmd(int argc, char **argv __unused) if (argc == 1) error("missing history argument"); - while (not_fcnumber(*argptr) && (ch = nextopt("e:lnrs")) != '\0') - switch ((char)ch) { - case 'e': - editor = shoptarg; - break; - case 'l': - lflg = 1; - break; - case 'n': - nflg = 1; - break; - case 'r': - rflg = 1; - break; - case 's': - sflg = 1; - break; - } - + while (not_fcnumber(*argptr)) + do { + switch (nextopt("e:lnrs")) { + case 'e': + editor = shoptarg; + break; + case 'l': + lflg = 1; + break; + case 'n': + nflg = 1; + break; + case 'r': + rflg = 1; + break; + case 's': + sflg = 1; + break; + case '\0': + goto operands; + } + } while (nextopt_optptr != NULL); +operands: savehandler = handler; /* * If executing... diff --git a/bin/sh/options.c b/bin/sh/options.c index 73d79ca9a74f..32c504b3fc75 100644 --- a/bin/sh/options.c +++ b/bin/sh/options.c @@ -589,6 +589,9 @@ nextopt(const char *optstring) shoptarg = p; p = NULL; } - nextopt_optptr = p; + if (p != NULL && *p != '\0') + nextopt_optptr = p; + else + nextopt_optptr = NULL; return c; } diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile index 197d735920e6..7f8615d5cc1b 100644 --- a/bin/sh/tests/builtins/Makefile +++ b/bin/sh/tests/builtins/Makefile @@ -94,6 +94,7 @@ ${PACKAGE}FILES+= exit3.0 ${PACKAGE}FILES+= export1.0 ${PACKAGE}FILES+= fc1.0 ${PACKAGE}FILES+= fc2.0 +${PACKAGE}FILES+= fc3.0 fc3.0.stdout fc3.0.stderr ${PACKAGE}FILES+= for1.0 ${PACKAGE}FILES+= for2.0 ${PACKAGE}FILES+= for3.0 diff --git a/bin/sh/tests/builtins/fc3.0 b/bin/sh/tests/builtins/fc3.0 new file mode 100644 index 000000000000..daa615bcc3ca --- /dev/null +++ b/bin/sh/tests/builtins/fc3.0 @@ -0,0 +1,9 @@ +export PS1='_ ' # cannot predict whether ran by root or not + +echo ': command1 +: command2 +: command3 +: command4 +fc -l -n -1 +fc -ln 2 3 +' | ENV= HISTFILE=/dev/null ${SH} +m -i diff --git a/bin/sh/tests/builtins/fc3.0.stderr b/bin/sh/tests/builtins/fc3.0.stderr new file mode 100644 index 000000000000..e05147fb8209 --- /dev/null +++ b/bin/sh/tests/builtins/fc3.0.stderr @@ -0,0 +1 @@ +_ _ _ _ _ _ _ _ diff --git a/bin/sh/tests/builtins/fc3.0.stdout b/bin/sh/tests/builtins/fc3.0.stdout new file mode 100644 index 000000000000..8c23c913635d --- /dev/null +++ b/bin/sh/tests/builtins/fc3.0.stdout @@ -0,0 +1,3 @@ +: command4 +: command2 +: command3