busybox: updated 1.13.0 ash fix

This commit is contained in:
Peter Korsgaard 2008-11-22 06:49:33 +00:00
parent 1776132d63
commit 50def0e495

View File

@ -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 Thu Oct 30 08:41:32 2008
--- busybox-1.13.0/shell/ash.c 2008-10-30 08:41:32.000000000 +0100 +++ busybox-1.13.0-ash/shell/ash.c Sat Nov 22 02:31:06 2008
+++ busybox-1.13.0-ash/shell/ash.c 2008-11-21 11:38:04.000000000 +0100 @@ -536,6 +536,7 @@
@@ -536,6 +536,7 @@ static const char dolatstr[] ALIGN1 = {
#define NHERE 24 #define NHERE 24
#define NXHERE 25 #define NXHERE 25
#define NNOT 26 #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; union node;
@@ -7546,43 +7547,44 @@ commandcmd(int argc UNUSED_PARAM, char * @@ -7546,43 +7547,46 @@
/* ============ eval.c */ /* ============ 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)), + [NDEFUN ] = SHELL_ALIGN(sizeof(struct narg)),
+ [NARG ] = SHELL_ALIGN(sizeof(struct narg)), + [NARG ] = SHELL_ALIGN(sizeof(struct narg)),
+ [NTO ] = SHELL_ALIGN(sizeof(struct nfile)), + [NTO ] = SHELL_ALIGN(sizeof(struct nfile)),
+#if ENABLE_ASH_BASH_COMPAT
+ [NTO2 ] = SHELL_ALIGN(sizeof(struct nfile)), + [NTO2 ] = SHELL_ALIGN(sizeof(struct nfile)),
+#endif
+ [NCLOBBER ] = SHELL_ALIGN(sizeof(struct nfile)), + [NCLOBBER ] = SHELL_ALIGN(sizeof(struct nfile)),
+ [NFROM ] = SHELL_ALIGN(sizeof(struct nfile)), + [NFROM ] = SHELL_ALIGN(sizeof(struct nfile)),
+ [NFROMTO ] = SHELL_ALIGN(sizeof(struct nfile)), + [NFROMTO ] = SHELL_ALIGN(sizeof(struct nfile)),