From: Brad House Date: Tue, 9 Dec 2003 20:52:40 +0000 (+0000) Subject: stuff X-Git-Tag: v3.4.10.902~734 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f92fcd821cd9140e4cef3f3b38c7e89ea587d28;p=genkernel.git stuff git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@18 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- diff --git a/pkg/busybox-1.00-pre2-decl.patch b/pkg/busybox-1.00-pre2-decl.patch new file mode 100644 index 0000000..7f62ee5 --- /dev/null +++ b/pkg/busybox-1.00-pre2-decl.patch @@ -0,0 +1,60 @@ +--- busybox-1.00-pre2/shell/ash.c.orig 2003-08-24 16:31:08.000000000 -0700 ++++ busybox-1.00-pre2/shell/ash.c 2003-08-24 16:32:41.000000000 -0700 +@@ -543,6 +543,28 @@ + static int parsenleft; /* copy of parsefile->nleft */ + static int parselleft; /* copy of parsefile->lleft */ + ++struct strpush { ++ struct strpush *prev; /* preceding string on stack */ ++ char *prevstring; ++ int prevnleft; ++#ifdef CONFIG_ASH_ALIAS ++ struct alias *ap; /* if push was associated with an alias */ ++#endif ++ char *string; /* remember the string since it may change */ ++}; ++ ++struct parsefile { ++ struct parsefile *prev; /* preceding file on stack */ ++ int linno; /* current line */ ++ int fd; /* file descriptor (or -1 if string) */ ++ int nleft; /* number of chars left in this line */ ++ int lleft; /* number of chars left in this buffer */ ++ char *nextc; /* next char in buffer */ ++ char *buf; /* input buffer */ ++ struct strpush *strpush; /* for pushing strings at this level */ ++ struct strpush basestrpush; /* so pushing one is fast */ ++}; ++ + /* next character in input buffer */ + static char *parsenextc; /* copy of parsefile->nextc */ + static struct parsefile basepf; /* top level input file */ +@@ -1577,28 +1599,6 @@ + + static int loopnest; /* current loop nesting level */ + +-struct strpush { +- struct strpush *prev; /* preceding string on stack */ +- char *prevstring; +- int prevnleft; +-#ifdef CONFIG_ASH_ALIAS +- struct alias *ap; /* if push was associated with an alias */ +-#endif +- char *string; /* remember the string since it may change */ +-}; +- +-struct parsefile { +- struct parsefile *prev; /* preceding file on stack */ +- int linno; /* current line */ +- int fd; /* file descriptor (or -1 if string) */ +- int nleft; /* number of chars left in this line */ +- int lleft; /* number of chars left in this buffer */ +- char *nextc; /* next char in buffer */ +- char *buf; /* input buffer */ +- struct strpush *strpush; /* for pushing strings at this level */ +- struct strpush basestrpush; /* so pushing one is fast */ +-}; +- + /* + * The parsefile structure pointed to by the global variable parsefile + * contains information about the current file being read.