busybox: update to version 1.24.1
Patches applied upstream and dropped: 280-fix_find_regression.patch 300-ip-addr-improvements.patch Fixed upstream: 290-ash-fix-a-regression-in-handling-local-variables.patch (see thread: http://lists.busybox.net/pipermail/busybox/2015-April/082783.html) Signed-off-by: Magnus Kroken <mkroken@gmail.com> SVN-Revision: 47288v19.07.3_mercusys_ac12_duma
Felix Fietkau
9 years ago
parent
ce09894398
commit
e35d42e890
@ -1,31 +0,0 @@
|
||||
find: fix regression in status processing for path arguments
|
||||
|
||||
Regression added in commit 14158b4127dba30466c50147b868a6a89702960b
|
||||
"find: add optional support for '-exec ... {} +'"
|
||||
|
||||
This commit causes find to exit on the first path argument that was not
|
||||
found, which breaks existing scripts and is incompatible to other
|
||||
implementations.
|
||||
|
||||
Instead of exiting on the first failure, return EXIT_FAILURE at the end
|
||||
if any error occurred.
|
||||
|
||||
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||
|
||||
--- a/findutils/find.c
|
||||
+++ b/findutils/find.c
|
||||
@@ -1460,12 +1460,10 @@ int find_main(int argc UNUSED_PARAM, cha
|
||||
NULL, /* user data */
|
||||
0) /* depth */
|
||||
) {
|
||||
- status = EXIT_FAILURE;
|
||||
- goto out;
|
||||
+ status |= EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
- IF_FEATURE_FIND_EXEC_PLUS(status = flush_exec_plus();)
|
||||
-out:
|
||||
+ IF_FEATURE_FIND_EXEC_PLUS(status |= flush_exec_plus();)
|
||||
return status;
|
||||
}
|
||||
@ -1,75 +0,0 @@
|
||||
From: Felix Fietkau <nbd@openwrt.org>
|
||||
Date: Fri, 17 Apr 2015 01:54:51 +0200
|
||||
Subject: [PATCH] ash: fix a regression in handling local variables
|
||||
|
||||
commit 109ee5d33694a03cda3424b4846584250832ba8e
|
||||
"ash: make "locak VAR" unset VAR (bash does that)"
|
||||
|
||||
This commit introduced a regression where calling local on an already
|
||||
local variable unsets it. This does not match bash behavior.
|
||||
|
||||
Update test case to check for this behavior
|
||||
|
||||
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||
---
|
||||
|
||||
--- a/shell/ash.c
|
||||
+++ b/shell/ash.c
|
||||
@@ -8961,6 +8961,21 @@ parse_command_args(char **argv, const ch
|
||||
}
|
||||
#endif
|
||||
|
||||
+static bool
|
||||
+findlocal(struct var *vp)
|
||||
+{
|
||||
+ struct localvar *lvp = localvars;
|
||||
+
|
||||
+ while (lvp) {
|
||||
+ if (lvp->vp == vp)
|
||||
+ return true;
|
||||
+
|
||||
+ lvp = lvp->next;
|
||||
+ }
|
||||
+
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* Make a variable a local variable. When a variable is made local, it's
|
||||
* value and flags are saved in a localvar structure. The saved values
|
||||
@@ -9000,7 +9015,7 @@ mklocal(char *name)
|
||||
vp->flags |= VSTRFIXED|VTEXTFIXED;
|
||||
if (eq)
|
||||
setvareq(name, 0);
|
||||
- else
|
||||
+ else if (!findlocal(vp))
|
||||
/* "local VAR" unsets VAR: */
|
||||
setvar(name, NULL, 0);
|
||||
}
|
||||
--- a/shell/ash_test/ash-misc/local1.right
|
||||
+++ b/shell/ash_test/ash-misc/local1.right
|
||||
@@ -1,4 +1,5 @@
|
||||
A1:'A'
|
||||
A2:''
|
||||
-A3:''
|
||||
-A4:'A'
|
||||
+A3:'B'
|
||||
+A4:''
|
||||
+A5:'A'
|
||||
--- a/shell/ash_test/ash-misc/local1.tests
|
||||
+++ b/shell/ash_test/ash-misc/local1.tests
|
||||
@@ -3,9 +3,12 @@ f() {
|
||||
local a
|
||||
# the above line unsets $a
|
||||
echo "A2:'$a'"
|
||||
- unset a
|
||||
+ a=B
|
||||
+ local a
|
||||
echo "A3:'$a'"
|
||||
+ unset a
|
||||
+ echo "A4:'$a'"
|
||||
}
|
||||
echo "A1:'$a'"
|
||||
f
|
||||
-echo "A4:'$a'"
|
||||
+echo "A5:'$a'"
|
||||
@ -1,73 +0,0 @@
|
||||
From 6a7cd3d4aba493c0b0d00155b1e09a867db437cf Mon Sep 17 00:00:00 2001
|
||||
From: Michael Tokarev <mjt@tls.msk.ru>
|
||||
Date: Wed, 20 May 2015 16:27:44 +0300
|
||||
Subject: [PATCH] ip addr: support change and replace commands
|
||||
|
||||
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
||||
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
||||
---
|
||||
networking/ip.c | 2 +-
|
||||
networking/libiproute/ipaddress.c | 20 ++++++++++++--------
|
||||
2 files changed, 13 insertions(+), 9 deletions(-)
|
||||
|
||||
--- a/networking/ip.c
|
||||
+++ b/networking/ip.c
|
||||
@@ -33,7 +33,7 @@
|
||||
//usage: "{ {add|del} IFADDR dev STRING | {show|flush}\n"
|
||||
//usage: " [dev STRING] [to PREFIX] }"
|
||||
//usage:#define ipaddr_full_usage "\n\n"
|
||||
-//usage: "ipaddr {add|delete} IFADDR dev STRING\n"
|
||||
+//usage: "ipaddr {add|change|replace|delete} IFADDR dev STRING\n"
|
||||
//usage: "ipaddr {show|flush} [dev STRING] [scope SCOPE-ID]\n"
|
||||
//usage: " [to PREFIX] [label PATTERN]\n"
|
||||
//usage: " IFADDR := PREFIX | ADDR peer PREFIX\n"
|
||||
--- a/networking/libiproute/ipaddress.c
|
||||
+++ b/networking/libiproute/ipaddress.c
|
||||
@@ -598,7 +598,7 @@ static int default_scope(inet_prefix *lc
|
||||
}
|
||||
|
||||
/* Return value becomes exitcode. It's okay to not return at all */
|
||||
-static int ipaddr_modify(int cmd, char **argv)
|
||||
+static int ipaddr_modify(int cmd, int flags, char **argv)
|
||||
{
|
||||
static const char option[] ALIGN1 =
|
||||
"peer\0""remote\0""broadcast\0""brd\0"
|
||||
@@ -622,7 +622,7 @@ static int ipaddr_modify(int cmd, char *
|
||||
memset(&req, 0, sizeof(req));
|
||||
|
||||
req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
|
||||
- req.n.nlmsg_flags = NLM_F_REQUEST;
|
||||
+ req.n.nlmsg_flags = NLM_F_REQUEST | flags;
|
||||
req.n.nlmsg_type = cmd;
|
||||
req.ifa.ifa_family = preferred_family;
|
||||
|
||||
@@ -749,16 +749,24 @@ static int ipaddr_modify(int cmd, char *
|
||||
int FAST_FUNC do_ipaddr(char **argv)
|
||||
{
|
||||
static const char commands[] ALIGN1 =
|
||||
- "add\0""delete\0""list\0""show\0""lst\0""flush\0";
|
||||
+ /* 0 1 2 3 4 5 6 7 8 */
|
||||
+ "add\0""change\0""chg\0""replace\0""delete\0""list\0""show\0""lst\0""flush\0";
|
||||
int cmd = 2;
|
||||
if (*argv) {
|
||||
cmd = index_in_substrings(commands, *argv);
|
||||
if (cmd < 0)
|
||||
invarg(*argv, applet_name);
|
||||
argv++;
|
||||
- if (cmd <= 1)
|
||||
- return ipaddr_modify((cmd == 0) ? RTM_NEWADDR : RTM_DELADDR, argv);
|
||||
+ if (cmd <= 4) {
|
||||
+ return ipaddr_modify(
|
||||
+ /*cmd:*/ cmd == 4 ? RTM_DELADDR : RTM_NEWADDR,
|
||||
+ /*flags:*/
|
||||
+ cmd == 0 ? NLM_F_CREATE|NLM_F_EXCL : /* add */
|
||||
+ cmd == 1 || cmd == 2 ? NLM_F_REPLACE : /* change */
|
||||
+ cmd == 3 ? NLM_F_CREATE|NLM_F_REPLACE : /* replace */
|
||||
+ 0 /* delete */
|
||||
+ , argv);
|
||||
+ }
|
||||
}
|
||||
- /* 2 == list, 3 == show, 4 == lst */
|
||||
- return ipaddr_list_or_flush(argv, cmd == 5);
|
||||
+ return ipaddr_list_or_flush(argv, cmd == 8);
|
||||
}
|
||||
Loading…
Reference in New Issue