diff options
author | gjb <gjb@FreeBSD.org> | 2016-03-14 18:54:29 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2016-03-14 18:54:29 +0000 |
commit | 086e6f562ffbb6de24f1e51c7df40f403dd1522b (patch) | |
tree | 7aa3dd8f24b6558f2ef57be4db6203ac91424ea3 /bin | |
parent | 1c7e318a9a31cae130bd5b2de01d93e7800f66ff (diff) | |
parent | aab6aadc586e30f7b3512d20c6a5f780bddc2de3 (diff) | |
download | FreeBSD-src-086e6f562ffbb6de24f1e51c7df40f403dd1522b.zip FreeBSD-src-086e6f562ffbb6de24f1e51c7df40f403dd1522b.tar.gz |
MFH
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'bin')
-rw-r--r-- | bin/sh/exec.c | 5 | ||||
-rw-r--r-- | bin/sh/miscbltin.c | 2 | ||||
-rw-r--r-- | bin/sh/sh.1 | 7 |
3 files changed, 12 insertions, 2 deletions
diff --git a/bin/sh/exec.c b/bin/sh/exec.c index ab86b76..79dad6c 100644 --- a/bin/sh/exec.c +++ b/bin/sh/exec.c @@ -332,6 +332,7 @@ find_command(const char *name, struct cmdentry *entry, int act, if (strchr(name, '/') != NULL) { entry->cmdtype = CMDNORMAL; entry->u.index = 0; + entry->special = 0; return; } @@ -408,6 +409,7 @@ find_command(const char *name, struct cmdentry *entry, int act, cmdp = &loc_cmd; cmdp->cmdtype = CMDNORMAL; cmdp->param.index = idx; + cmdp->special = 0; INTON; goto success; } @@ -420,6 +422,7 @@ find_command(const char *name, struct cmdentry *entry, int act, } entry->cmdtype = CMDUNKNOWN; entry->u.index = 0; + entry->special = 0; return; success: @@ -588,6 +591,7 @@ addcmdentry(const char *name, struct cmdentry *entry) } cmdp->cmdtype = entry->cmdtype; cmdp->param = entry->u; + cmdp->special = entry->special; INTON; } @@ -604,6 +608,7 @@ defun(const char *name, union node *func) INTOFF; entry.cmdtype = CMDFUNCTION; entry.u.func = copyfunc(func); + entry.special = 0; addcmdentry(name, &entry); INTON; } diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c index 9dae4cb..1537196 100644 --- a/bin/sh/miscbltin.c +++ b/bin/sh/miscbltin.c @@ -452,7 +452,7 @@ ulimitcmd(int argc __unused, char **argv __unused) struct rlimit limit; what = 'f'; - while ((optc = nextopt("HSatfdsmcnuvlbpwk")) != '\0') + while ((optc = nextopt("HSatfdsmcnuvlbpwko")) != '\0') switch (optc) { case 'H': how = HARD; diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 9406779..1f2d67b 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -2615,7 +2615,7 @@ and not found. For aliases the alias expansion is printed; for commands and tracked aliases the complete pathname of the command is printed. -.It Ic ulimit Oo Fl HSabcdfklmnpstuvw Oc Op Ar limit +.It Ic ulimit Oo Fl HSabcdfklmnopstuvw Oc Op Ar limit Set or display resource limits (see .Xr getrlimit 2 ) . If @@ -2674,6 +2674,11 @@ kilobytes. The maximal resident set size of a process, in kilobytes. .It Fl n Ar nofiles The maximal number of descriptors that could be opened by a process. +.It Fl o Ar umtxp +The maximal number of process-shared locks +(see +.Xr pthread 3 ) +for this user ID. .It Fl p Ar pseudoterminals The maximal number of pseudo-terminals for this user ID. .It Fl s Ar stacksize |