emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash,hush: ulimit: add -i RLIMIT_SIGPENDING, -q RLIMIT_MSGQUEUE

Browse Source 
function                                             old     new   delta
limits_tbl                                           104     120     +16
ulimit_opt_string                                     44      50      +6
limit_chars                                           14      16      +2
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 24/0)               Total: 24 bytes
   text	   data	    bss	    dec	    hex	filename
 981996	    485	   7296	 989777	  f1a51	busybox_old
 982065	    485	   7296	 989846	  f1a96	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-04-28 11:25:11 +02:00
parent 57e1b0ad5e
commit 93f0b39a07
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
shell/shell_common.c
View File

@ -344,6 +344,9 @@ static const struct limits limits_tbl[] = {
{ RLIMIT_NICE, 0, "scheduling priority" }, // -e { RLIMIT_NICE, 0, "scheduling priority" }, // -e
{ RLIMIT_FSIZE, 9, "file size (blocks)" }, // -f { RLIMIT_FSIZE, 9, "file size (blocks)" }, // -f
#define LIMIT_F_IDX 3 #define LIMIT_F_IDX 3
#ifdef RLIMIT_SIGPENDING
{ RLIMIT_SIGPENDING, 0, "pending signals" }, // -i
#endif
#ifdef RLIMIT_MEMLOCK #ifdef RLIMIT_MEMLOCK
{ RLIMIT_MEMLOCK, 10, "max locked memory (kb)" }, // -l { RLIMIT_MEMLOCK, 10, "max locked memory (kb)" }, // -l
#endif #endif
@ -353,6 +356,9 @@ static const struct limits limits_tbl[] = {
#ifdef RLIMIT_NOFILE #ifdef RLIMIT_NOFILE
{ RLIMIT_NOFILE, 0, "open files" }, // -n { RLIMIT_NOFILE, 0, "open files" }, // -n
#endif #endif
#ifdef RLIMIT_MSGQUEUE
{ RLIMIT_MSGQUEUE, 0, "POSIX message queues (bytes)" }, // -q
#endif
#ifdef RLIMIT_RTPRIO #ifdef RLIMIT_RTPRIO
{ RLIMIT_RTPRIO, 0, "real-time priority" }, // -r { RLIMIT_RTPRIO, 0, "real-time priority" }, // -r
#endif #endif
@ -372,16 +378,17 @@ static const struct limits limits_tbl[] = {
{ RLIMIT_LOCKS, 0, "file locks" }, // -x { RLIMIT_LOCKS, 0, "file locks" }, // -x
#endif #endif
}; };
// bash also has these: // bash also shows:
//pending signals (-i) 61858 //RLIMIT_SIGPENDING
//pipe size (512 bytes, -p) 8 //pipe size (512 bytes, -p) 8
//POSIX message queues (bytes, -q) 819200 //RLIMIT_MSGQUEUE
static const char limit_chars[] ALIGN1 = static const char limit_chars[] ALIGN1 =
"c" "c"
"d" "d"
"e" "e"
"f" "f"
#ifdef RLIMIT_SIGPENDING
"i"
#endif
#ifdef RLIMIT_MEMLOCK #ifdef RLIMIT_MEMLOCK
"l" "l"
#endif #endif
@ -391,6 +398,9 @@ static const char limit_chars[] ALIGN1 =
#ifdef RLIMIT_NOFILE #ifdef RLIMIT_NOFILE
"n" "n"
#endif #endif
#ifdef RLIMIT_MSGQUEUE
"q"
#endif
#ifdef RLIMIT_RTPRIO #ifdef RLIMIT_RTPRIO
"r" "r"
#endif #endif
@ -417,6 +427,9 @@ static const char ulimit_opt_string[] ALIGN1 = "-HSa"
"d::" "d::"
"e::" "e::"
"f::" "f::"
#ifdef RLIMIT_SIGPENDING
"i::"
#endif
#ifdef RLIMIT_MEMLOCK #ifdef RLIMIT_MEMLOCK
"l::" "l::"
#endif #endif
@ -426,6 +439,9 @@ static const char ulimit_opt_string[] ALIGN1 = "-HSa"
#ifdef RLIMIT_NOFILE #ifdef RLIMIT_NOFILE
"n::" "n::"
#endif #endif
#ifdef RLIMIT_MSGQUEUE
"q::"
#endif
#ifdef RLIMIT_RTPRIO #ifdef RLIMIT_RTPRIO
"r::" "r::"
#endif #endif