Commit 99fa554b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

busybox: 1.22.1: correct ash patch 

Upstream initially put the wrong patch online:

http://lists.busybox.net/pipermail/busybox/2014-January/080364.html



Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 1052a4a7

package/busybox/1.22.1/0002-busybox-1.22.1-ash.patch

+11 −20
Original line number Diff line number Diff line 
--- busybox-1.22.1/procps/top.c

+++ busybox-1.22.1-ash/procps/top.c

@@ -917,17 +917,12 @@ enum {

 #if ENABLE_FEATURE_USE_TERMIOS

 static unsigned handle_input(unsigned scan_mask, unsigned interval)

 {

-	struct pollfd pfd[1];

-

 	if (option_mask32 & OPT_EOF) {

 		/* EOF on stdin ("top </dev/null") */

 		sleep(interval);

 		return scan_mask;

 	}

 

-	pfd[0].fd = 0;

-	pfd[0].events = POLLIN;

-

 	while (1) {

 		int32_t c;

 
--- busybox-1.22.1/shell/ash.c

+++ busybox-1.22.1-ash/shell/ash.c

@@ -13014,7 +13014,7 @@ init(void)

 		setvar2("PPID", utoa(getppid()));

 #if ENABLE_ASH_BASH_COMPAT

 		p = lookupvar("SHLVL");

-		setvar2("SHLVL", utoa(p ? atoi(p) + 1 : 1));

+		setvar("SHLVL", utoa((p ? atoi(p) : 0) + 1), VEXPORT);

 #endif

 		p = lookupvar("PWD");

 		if (p) {