From nobody Thu Dec 12 15:51:27 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 4Y8H5C49Zzz5gQL7; Thu, 12 Dec 2024 15:51:27 +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 4Y8H5C25Gqz4fQF; Thu, 12 Dec 2024 15:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734018687; 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=U5++p9/TjBX2MXvd+ITfwtfSuM9UnBhTUu20q3ntBMo=; b=qx+d3MtEx76FVHdiWToStKaln3xuJYCNTU9WAb29Pr8GuPei+e5rIKxxaKoWJfTIxO4jTQ WcnbnSh3l+JKwu75Uw4RpNX7rkhsHTBl5nlZVcX6C0dlZkM+wfkzv3BjoeqFBoD7wAoYTX 2FJaS0a+TIel1VUqkLIFpjbLY+UJ3vkUTYiscJQRUr+JhHbZz2Q1qIBfLkwaTbOv6T+16p h0i3PW7m41HovSOAe7X+vK5Tj0dDkatDNvAcKo+kR5io3VOYIeTMSWXUo7gDbLtywRQ1Nb /LyOr3odgru01ahGAddQpL9VBRr7KukW/GO8zKFabPyB3mizPkVTw4xk4AIuAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734018687; 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=U5++p9/TjBX2MXvd+ITfwtfSuM9UnBhTUu20q3ntBMo=; b=XvzNjJJJqliRjDepx4j+Mz4qVhhO5E3ANcvoV1E/1XdqcFmRkZClY7Qj+0B1vHHND7+Rxe rFzZkpDxXOgZ6sLKWnV1h5eeMcvkUDJjoBvau8dSjUS1Tj6gyUhKYPztxE1y/eO21NJQaG IHzIMnzlxHnqJ0xTuznidKDZ1N9cf8DYH4F0zLRg6mIB8a/SevsC5QXPs6vGHDw4lh1xva 0dV/M36MAS46bCcM8w8RfQAMnrK2yMlkqYQ8rB35k4bG6FtH/a9cU1LfUrgmlNNEiFnznz xtVcDWdOdK22pPiBiWXEH79c97rAkSnPbn1KnUJsVdLCeCeUVSIpD/j0tba5pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734018687; a=rsa-sha256; cv=none; b=djTMMqXLY61Hb+EWORMwiGlnn/Di5TFx2fBbY0mCK3Lg5+Wx1f6KOg9oWSKmkP+zbvSVde G9ZTKu9TWohmpPGKfMrjTMCVjIPjpznFeGKB7kZvSXR2C1A4h8aaSIuxRGXGgaORD3+yDP pAKaCLioggrwmyzYkQA2UOKs/RAOborLuZ0/g/x73Up/CtgUWcHH+24BbPRgEMqq2ZSLPy QiaY6O8aBVx1SopErYIbcr+P8rjZq7/5WitUehABifZLrFke7zx4ue0YWwgRYCfAVUoQoM l6D7bf2SkotKz7P4yuLG3r7MsjxEORA1kvl62aneclMWTsSQ067c3ZkYLBNu7w== 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 4Y8H5C1SJlzyMc; Thu, 12 Dec 2024 15:51:27 +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 4BCFpRUE031533; Thu, 12 Dec 2024 15:51:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCFpRgq031530; Thu, 12 Dec 2024 15:51:27 GMT (envelope-from git) Date: Thu, 12 Dec 2024 15:51:27 GMT Message-Id: <202412121551.4BCFpRgq031530@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: 07d147a7fcbf - stable/14 - sh(1): add -l option 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: 07d147a7fcbf61125cad0470b83fe203f725dc39 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=07d147a7fcbf61125cad0470b83fe203f725dc39 commit 07d147a7fcbf61125cad0470b83fe203f725dc39 Author: Baptiste Daroussin AuthorDate: 2024-11-20 10:48:39 +0000 Commit: Baptiste Daroussin CommitDate: 2024-12-12 15:51:17 +0000 sh(1): add -l option -l is required by LSB for login shell, all other shells: bash, zsh, oksh, mksh, ... implements it. with -l sh will act as a login shell and read the profile. MFC After: 1 week Obtained From: dash (3b7c8442bfe7c2fd0a6b0415df6ddf66a399fd55) Reviewed by: kib, lme Differential Revision: https://reviews.freebsd.org/D47681 (cherry picked from commit 65f5dd42f11cdcb7716e6cdd09fac2314c144c1f) --- bin/sh/main.c | 5 +++-- bin/sh/options.c | 24 ++++++++++++++++-------- bin/sh/options.h | 2 +- bin/sh/sh.1 | 10 ++++++---- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/bin/sh/main.c b/bin/sh/main.c index 7a4dbc254f81..257f6b16162c 100644 --- a/bin/sh/main.c +++ b/bin/sh/main.c @@ -107,6 +107,7 @@ main(int argc, char *argv[]) static struct stackmark smark, smark2; volatile int state; char *shinit; + int login; (void) setlocale(LC_ALL, ""); initcharset(); @@ -140,13 +141,13 @@ main(int argc, char *argv[]) initvar(); setstackmark(&smark); setstackmark(&smark2); - procargs(argc, argv); + login = procargs(argc, argv); trap_init(); pwd_init(iflag); INTON; if (iflag) chkmail(1); - if (argv[0] && argv[0][0] == '-') { + if (login) { state = 1; read_profile("/etc/profile"); state1: diff --git a/bin/sh/options.c b/bin/sh/options.c index 87ee4ab5c658..43a8ee47411e 100644 --- a/bin/sh/options.c +++ b/bin/sh/options.c @@ -70,7 +70,7 @@ char *nextopt_optptr; /* used by nextopt */ char *minusc; /* argument to -c option */ -static void options(int); +static int options(int); static void minus_o(char *, int); static void setoption(int, int); static void setoptionbyindex(int, int); @@ -82,19 +82,20 @@ static int getopts(char *, char *, char **, char ***, char **); * Process the shell command line arguments. */ -void +int procargs(int argc, char **argv) { - int i; + int i, login; char *scriptname; argptr = argv; + login = argptr[0] != NULL && argptr[0][0] == '-'; if (argc > 0) argptr++; for (i = 0; i < NOPTS; i++) optval[i] = 2; privileged = (getuid() != geteuid() || getgid() != getegid()); - options(1); + login |= options(1); if (*argptr == NULL && minusc == NULL) sflag = 1; if (iflag != 0 && sflag == 1 && isatty(0) && isatty(1)) { @@ -125,6 +126,8 @@ procargs(int argc, char **argv) argptr++; } optschanged(); + + return (login); } @@ -145,12 +148,13 @@ optschanged(void) * to the set special builtin. */ -static void +static int options(int cmdline) { char *kp, *p; int val; int c; + int login = 0; if (cmdline) minusc = NULL; @@ -196,6 +200,8 @@ options(int cmdline) if (q == NULL || minusc != NULL) error("Bad -c option"); minusc = q; + } else if (c == 'l') { + login = 1; } else if (c == 'o') { minus_o(*argptr, val); if (*argptr) @@ -204,13 +210,13 @@ options(int cmdline) setoption(c, val); } } - return; + return (login); /* When processing `set', a single "-" means turn off -x and -v */ end_options1: if (!cmdline) { xflag = vflag = 0; - return; + return (login); } /* @@ -223,7 +229,7 @@ end_options2: if (!cmdline) { if (*argptr == NULL) setparam(0, argptr); - return; + return (login); } /* @@ -242,6 +248,8 @@ end_options2: /* We need to keep the final argument */ argptr--; } + + return (login); } static void diff --git a/bin/sh/options.h b/bin/sh/options.h index 9c516b07ad23..a477f24e90ca 100644 --- a/bin/sh/options.h +++ b/bin/sh/options.h @@ -111,7 +111,7 @@ extern char **argptr; /* argument list for builtin commands */ extern char *shoptarg; /* set by nextopt */ extern char *nextopt_optptr; /* used by nextopt */ -void procargs(int, char **); +int procargs(int, char **); void optschanged(void); void freeparam(struct shparam *); int nextopt(const char *); diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 03e8af70c9aa..1a0275a396ea 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -31,7 +31,7 @@ .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" -.Dd December 14, 2022 +.Dd November 20, 2024 .Dt SH 1 .Os .Sh NAME @@ -39,14 +39,14 @@ .Nd command interpreter (shell) .Sh SYNOPSIS .Nm -.Op Fl /+abCEefhIimnPpTuVvx +.Op Fl /+abCEefhIilmnPpTuVvx .Op Fl /+o Ar longname .Oo .Ar script .Op Ar arg ... .Oc .Nm -.Op Fl /+abCEefhIimnPpTuVvx +.Op Fl /+abCEefhIilmnPpTuVvx .Op Fl /+o Ar longname .Fl c Ar string .Oo @@ -54,7 +54,7 @@ .Op Ar arg ... .Oc .Nm -.Op Fl /+abCEefhIimnPpTuVvx +.Op Fl /+abCEefhIilmnPpTuVvx .Op Fl /+o Ar longname .Fl s .Op Ar arg ... @@ -253,6 +253,8 @@ Ignore from input when in interactive mode. .It Fl i Li interactive Force the shell to behave interactively. +.It Fl l +Force the shell to act as if it has been invoked as a login shell. .It Fl m Li monitor Turn on job control (set automatically when interactive). A new process group is created for each pipeline (called a job).