From nobody Thu Dec 12 16:03:50 2024 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 4Y8HMV5ZmQz5gRlC; Thu, 12 Dec 2024 16:03:50 +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 4Y8HMV4ytRz4hCj; Thu, 12 Dec 2024 16:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019430; 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=H7Z601bOXFM5u/UN5CQuFHNPZhhOAvJDxXjPyFoMhmI=; b=dloIQdCiWE0vOVELubY7wtpRPPmaTd5wMYATisY+QK1Chmd81z80Cw66chxINDIXIjUU1O gARyx8jbmgKqmUyiFk/vVppzhRLTJbto4N4GddsFW1VH5sMGkPfc4N1rBRxRKQMKAr6sFc xCMHd6GcDjLzNmaJVCA2vXMAj5JnzN7m5G3i+gc15UyZWNj2BU12+nrM/5YgyYzPhzu8y+ lsGmGlvevoJRZ+DNKrtYT6wZIhOXGAv1NNgff5/14powtwdT8wvaOeOLZ5MNg0ClkjIstm BD7aTqaHESwq92NDX4OYj4/7RhLjzSGDr79+tQ4qG2yMGIksZrRxraEAeFP/KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019430; 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=H7Z601bOXFM5u/UN5CQuFHNPZhhOAvJDxXjPyFoMhmI=; b=NzQKQX/MuKzr03Zv1WvYpe8WCD9vJiELwtdfufAiLX3N+uzvbMztthVx0NO1WBBAiwpn6a wUJELaCmhD8K1Ean70u1l336Rexm9R5r7C3oGqIjHtNDzMxCXctjwZahf3ORtvaREHLJM3 /7RpqkzyFVUo2Ajp7mrfWxhkMdVQuP8h1v3hmu4KdDkJDYsw8liBuPTxRPLFOSWLDcoSaK t2VuqcjT0YciriZtmasUYa1Cgbzg1Ig4JyFZWH6ZncsP8nSADwmCRNkc5eTkCiGqFUD49h fvoy3r630YYOpJRd0gc+ajWMRYQlyraXVGTXrRNMWzexjGxwKZNr0TRKZCrPOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734019430; a=rsa-sha256; cv=none; b=vRSHFeH9GiP/3sjDvk8wKo0vWhtr8zG7BLU3k9jdi/aBi49ljrnOPEc6c+qHhMUNDv5b61 872fgI3CciMrzea6UswXvXrEB+IXG0PZvBlXa3EJmsjGG2K8ciC9rFbCOg9lFXYL4Hee8O JUEALmMmZ/+9dFq22icQZ6eTR3aubNR6BKqF6XJdwQ8N7KLqMW325qtTQYSBYq3bvFeROX 0+heLNMak6LrdPIpQ/yRsZ70ymLlKEBGDlbps7HNVhZwCfVvzd4llU107NR4gbtImGY0tc lCLXJ3xPB3SsZeW16NDuUQzMyFEhHhNjyxYZYaiiV03p+FEgMvH/jhZfRfV6ew== 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 4Y8HMV4LXkz10Gg; Thu, 12 Dec 2024 16:03:50 +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 4BCG3onX053312; Thu, 12 Dec 2024 16:03:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCG3o6G053309; Thu, 12 Dec 2024 16:03:50 GMT (envelope-from git) Date: Thu, 12 Dec 2024 16:03:50 GMT Message-Id: <202412121603.4BCG3o6G053309@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: 35a6770dde02 - stable/14 - sh(1): -l is only valid in cli option not as set -l 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 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/14 X-Git-Reftype: branch X-Git-Commit: 35a6770dde027d85e6b9a9b6fd9f7d254a320ef3 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=35a6770dde027d85e6b9a9b6fd9f7d254a320ef3 commit 35a6770dde027d85e6b9a9b6fd9f7d254a320ef3 Author: Baptiste Daroussin AuthorDate: 2024-11-20 13:14:43 +0000 Commit: Baptiste Daroussin CommitDate: 2024-12-12 16:03:34 +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 43a8ee47411e..383f9523975d 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);