You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
61 lines
2.3 KiB
61 lines
2.3 KiB
21 years ago
|
--- 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.
|