From nobody Thu Dec 12 16:02:52 2024 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 4Y8HLN5rmJz5gRbC; Thu, 12 Dec 2024 16:02:52 +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 4Y8HLN5GXBz4gj1; Thu, 12 Dec 2024 16:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019372; 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=IAccUbzL+7McEmT9eJhSGddCNfbepc+QXz8c9LEPskM=; b=rIMf44sWuJpdgSyj96PH/FJkkVN9ly8QaCRvBWCqphLUiBZyQNaWLyND7vCj1ouS5wLao2 +s06sTmchDQYRfnfrZn07AIlhkdnMVoOqFVDr6yKyl3gMELThVYw5q3266EkxXryNEtWIG maJdxbcWN+9WAEjrhqJk0Hg1wrhpm/2B88vbHxr6ga1NA9guFxOG5hmMURLFVs+Oo+s8/i Rdz3QlNIWoSjQo4NeoYdzQZhAFY6uolQkFVca8iyz1OHacYL1FHYfHi+6tW4vl3PYJ42tA nf32u5U4vf2DWP1l0yVxgSgvCmqne0bseLFDk+DEpONzngpHEgv+4+E9epqhqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019372; 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=IAccUbzL+7McEmT9eJhSGddCNfbepc+QXz8c9LEPskM=; b=Y473ysaxz5HR+/6Gf1JKxC2EeFllKR+vHu25jv9HOx84Xil9CsJk+MXinGA1SHFad25nmX W7H2SLBiiV2KrMxRXUbSPowpNMPU5lkfbncKsACd82VfVf93SlZHS56Xej+4ITmL6N/IUQ sU/aR06g+3qso561nUHEmLbQcBX0zU7w7iYkW2afHmt3ug7j5IMeF16ah+Rj/ogjmCd0ZU Y6K2x+Nksv9o8SQvuJUpllu+BBj5kSL8eY5moMWPypEGRY0k3pG2LPuZ3WtEPdX8raZV57 C3RNZ472HSV8a7ER8a5IK0EnH+GXB1b6ZhnzMQcAlgJce3RjrSFH91I+ET+/MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734019372; a=rsa-sha256; cv=none; b=aysh0D8dVvear2Ih6Ycq6x6CktnJiF+TaHVSfdP5ZuX/WtGZyt30heHeXfjZfxiLYnk73z qpP9jwCM7RQBuCPHowcQO2kfl5iOkWfhvM1galCG5sSK/61jnVS2DvOzuiXhD+Hq6pzg6d KRnmA85vkSsXYjijxMnMt53MDb97pCREFpzw0k/Dg9jXIoNEoGkUIQ/8aLbKRCpwT9LdPc 8HHhWpYl/NsyiZ9ZTlvbEQEfNTEYMjbALhREHsn55ObTI/lKiywoN6Yx6Ml8lwJIDCQnfB lsN+VQ7Wun1MJ4g/F4ePJqrNELoq4+J9aeWbvEgK9IN0MI1Y4rpKAr0D8NlpQA== 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 4Y8HLN4tXTz10Gf; Thu, 12 Dec 2024 16:02:52 +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 4BCG2qrX052865; Thu, 12 Dec 2024 16:02:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCG2qmB052862; Thu, 12 Dec 2024 16:02:52 GMT (envelope-from git) Date: Thu, 12 Dec 2024 16:02:52 GMT Message-Id: <202412121602.4BCG2qmB052862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 1e502fc1c421 - stable/13 - sh(1): -l is only valid in cli option not as set -l 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1e502fc1c4215ac61db04598eb0a15d0e1ff7d6a Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1e502fc1c4215ac61db04598eb0a15d0e1ff7d6a commit 1e502fc1c4215ac61db04598eb0a15d0e1ff7d6a Author: Baptiste Daroussin AuthorDate: 2024-11-20 13:14:43 +0000 Commit: Baptiste Daroussin CommitDate: 2024-12-12 16:02:48 +0000 sh(1): -l is only valid in cli option not as set -l (cherry picked from commit 0df81552d74d2c188a9323ffe18f6ebe799b86f9) --- bin/sh/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/options.c b/bin/sh/options.c index 17fd878fa530..283bceb04e62 100644 --- a/bin/sh/options.c +++ b/bin/sh/options.c @@ -200,7 +200,7 @@ options(int cmdline) if (q == NULL || minusc != NULL) error("Bad -c option"); minusc = q; - } else if (c == 'l') { + } else if (c == 'l' && cmdline) { login = 1; } else if (c == 'o') { minus_o(*argptr, val);