From 50def0e4950ec82e96d79c297c455f5eaf78fc14 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 22 Nov 2008 06:49:33 +0000 Subject: [PATCH] busybox: updated 1.13.0 ash fix --- package/busybox/busybox-1.13.0-ash.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/busybox/busybox-1.13.0-ash.patch b/package/busybox/busybox-1.13.0-ash.patch index 6bfb7219b4..c3ab30a492 100644 --- a/package/busybox/busybox-1.13.0-ash.patch +++ b/package/busybox/busybox-1.13.0-ash.patch @@ -1,7 +1,6 @@ -diff -urpN busybox-1.13.0/shell/ash.c busybox-1.13.0-ash/shell/ash.c ---- busybox-1.13.0/shell/ash.c 2008-10-30 08:41:32.000000000 +0100 -+++ busybox-1.13.0-ash/shell/ash.c 2008-11-21 11:38:04.000000000 +0100 -@@ -536,6 +536,7 @@ static const char dolatstr[] ALIGN1 = { +--- busybox-1.13.0/shell/ash.c Thu Oct 30 08:41:32 2008 ++++ busybox-1.13.0-ash/shell/ash.c Sat Nov 22 02:31:06 2008 +@@ -536,6 +536,7 @@ #define NHERE 24 #define NXHERE 25 #define NNOT 26 @@ -9,7 +8,7 @@ diff -urpN busybox-1.13.0/shell/ash.c busybox-1.13.0-ash/shell/ash.c union node; -@@ -7546,43 +7547,44 @@ commandcmd(int argc UNUSED_PARAM, char * +@@ -7546,43 +7547,46 @@ /* ============ eval.c */ @@ -74,7 +73,9 @@ diff -urpN busybox-1.13.0/shell/ash.c busybox-1.13.0-ash/shell/ash.c + [NDEFUN ] = SHELL_ALIGN(sizeof(struct narg)), + [NARG ] = SHELL_ALIGN(sizeof(struct narg)), + [NTO ] = SHELL_ALIGN(sizeof(struct nfile)), ++#if ENABLE_ASH_BASH_COMPAT + [NTO2 ] = SHELL_ALIGN(sizeof(struct nfile)), ++#endif + [NCLOBBER ] = SHELL_ALIGN(sizeof(struct nfile)), + [NFROM ] = SHELL_ALIGN(sizeof(struct nfile)), + [NFROMTO ] = SHELL_ALIGN(sizeof(struct nfile)),