summaryrefslogtreecommitdiff
path: root/package/busybox/busybox-1.17.1/busybox-1.17.1-shell.patch
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2010-08-11 11:07:01 -0300
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-08-11 18:01:54 +0200
commita22d4082eac385cf5386f19d8c9207ee1fd381c1 (patch)
tree0bf0286e1c6e2328b8bc594d1229612eb39280b2 /package/busybox/busybox-1.17.1/busybox-1.17.1-shell.patch
parentf4ffc04bbd066d4b59b4f07486ac485f28fb7f00 (diff)
Update busybox 1.17.1 fixes
New shell_common fix and sed fix. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Diffstat (limited to 'package/busybox/busybox-1.17.1/busybox-1.17.1-shell.patch')
-rw-r--r--package/busybox/busybox-1.17.1/busybox-1.17.1-shell.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/package/busybox/busybox-1.17.1/busybox-1.17.1-shell.patch b/package/busybox/busybox-1.17.1/busybox-1.17.1-shell.patch
index 04adc8f1d..5279b1202 100644
--- a/package/busybox/busybox-1.17.1/busybox-1.17.1-shell.patch
+++ b/package/busybox/busybox-1.17.1/busybox-1.17.1-shell.patch
@@ -84,3 +84,22 @@ diff -urpN busybox-1.17.1/shell/hush_test/hush-trap/signal7.tests busybox-1.17.1
+&& test x"$REAL_CHILD" = x"$PARENTS_IDEA_OF_CHILD"
+echo "Bug detected: $?"
+}
+diff -urpN busybox-1.17.1/shell/shell_common.c busybox-1.17.1-shell/shell/shell_common.c
+--- busybox-1.17.1/shell/shell_common.c 2010-07-06 04:25:54.000000000 +0200
++++ busybox-1.17.1-shell/shell/shell_common.c 2010-07-27 08:41:43.000000000 +0200
+@@ -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) {