h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-27 00:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

ulimit: some corrections to descriptions and documentation

Browse Source
This commit is contained in:
David Adam
2022-03-21 23:33:47 +08:00
parent c92cda9bec
commit ee69a2467e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc_src/cmds/ulimit.rst
View File

@@ -25,7 +25,7 @@ Use one of the following switches to specify which resource limit to set or repo
The maximum size of a process' data segment.
**-f** or **--file-size**
The maximum size of files created by the shell.
The maximum size of files created by a process.
**-l** or **--lock-size**
The maximum size that may be locked into memory.
@@ -34,7 +34,7 @@ Use one of the following switches to specify which resource limit to set or repo
The maximum resident set size.
**-n** or **--file-descriptor-count**
The maximum number of open file descriptors (most systems do not allow this value to be set).
The maximum number of open file descriptors.
**-s** or **--stack-size**
The maximum stack size.
@@ -43,7 +43,7 @@ Use one of the following switches to specify which resource limit to set or repo
The maximum amount of CPU time in seconds.
**-u** or **--process-count**
The maximum number of processes available to a single user.
The maximum number of processes available to the current user.
**-v** or **--virtual-memory-size**
The maximum amount of virtual memory available to the shell.
@@ -54,7 +54,7 @@ The value of limit can be a number in the unit specified for the resource or one
If limit is given, it is the new value of the specified resource. If no option is given, then **-f** is assumed. Values are in kilobytes, except for **-t**, which is in seconds and **-n** and **-u**, which are unscaled values. The exit status is 0 unless an invalid option or argument is supplied, or an error occurs while setting a new limit.
``ulimit`` also accepts the following switches that determine what type of limit to set:
``ulimit`` also accepts the following options that determine what type of limit to set:
**-H** or **--hard**
Sets hard resource limit.

6
src/builtins/ulimit.cpp
View File

@@ -37,12 +37,12 @@ static const struct resource_t resource_arr[] = {
#endif
{RLIMIT_NOFILE, L"Maximum number of open file descriptors", L'n', 1},
{RLIMIT_STACK, L"Maximum stack size", L's', 1024},
{RLIMIT_CPU, L"Maximum amount of cpu time in seconds", L't', 1},
{RLIMIT_CPU, L"Maximum amount of CPU time in seconds", L't', 1},
#ifdef RLIMIT_NPROC
{RLIMIT_NPROC, L"Maximum number of processes available to a single user", L'u', 1},
{RLIMIT_NPROC, L"Maximum number of processes available to current user", L'u', 1},
#endif
#ifdef RLIMIT_AS
{RLIMIT_AS, L"Maximum amount of virtual memory available to the shell", L'v', 1024},
{RLIMIT_AS, L"Maximum amount of virtual memory available to each process", L'v', 1024},
#endif
{0, nullptr, 0, 0}};