From: Alexander Shishkin <virtuoso@slind.org>
Date: Tue, 27 Jul 2010 06:40:55 +0000 (+0200)
Subject: ulimit: set both hard and soft limits by default
X-Git-Tag: 1_18_0~379
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=17e0e43c3522882e2ac8e921132540ba01a1c66c;p=oweals%2Fbusybox.git

ulimit: set both hard and soft limits by default

function                                             old     new   delta
shell_builtin_ulimit                                 494     498      +4

Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/shell/shell_common.c b/shell/shell_common.c
index 3114ff3f7..dc363e298 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -428,9 +428,14 @@ shell_builtin_ulimit(char **argv)
 						val <<= l->factor_shift;
 					}
 //bb_error_msg("opt %c val_str:'%s' val:%lld", opt_char, val_str, (long long)val);
+					/* from man bash: "If neither -H nor -S
+					 * is specified, both the soft and hard
+					 * limits are set. */
+					if (!opts)
+						opts = OPT_hard + OPT_soft;
 					if (opts & OPT_hard)
 						limit.rlim_max = val;
-					if ((opts & OPT_soft) || opts == 0)
+					if (opts & OPT_soft)
 						limit.rlim_cur = val;
 //bb_error_msg("setrlimit(%d, %lld, %lld)", l->cmd, (long long)limit.rlim_cur, (long long)limit.rlim_max);
 					if (setrlimit(l->cmd, &limit) < 0) {