emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: fix debug machinery a bit

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-07-23 22:07:07 +02:00
parent 7cc5a50465
commit 86e83ec487
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
shell/ash.c
View File

@ -640,6 +640,12 @@ union node {
struct nnot nnot; struct nnot nnot;
}; };
/*
* NODE_EOF is returned by parsecmd when it encounters an end of file.
* It must be distinct from NULL.
*/
#define NODE_EOF ((union node *) -1L)
struct nodelist { struct nodelist {
struct nodelist *next; struct nodelist *next;
union node *n; union node *n;
@ -954,6 +960,12 @@ shtree(union node *n, int ind, char *pfx, FILE *fp)
return; return;
indent(ind, pfx, fp); indent(ind, pfx, fp);
if (n == NODE_EOF) {
fputs("<EOF>", fp);
return;
}
switch (n->type) { switch (n->type) {
case NSEMI: case NSEMI:
s = "; "; s = "; ";
@ -10143,12 +10155,6 @@ static char *wordtext; /* text of last word returned by readtoke
static struct nodelist *backquotelist; static struct nodelist *backquotelist;
static union node *redirnode; static union node *redirnode;
static struct heredoc *heredoc; static struct heredoc *heredoc;
/*
* NEOF is returned by parsecmd when it encounters an end of file. It
* must be distinct from NULL, so we use the address of a variable that
* happens to be handy.
*/
#define NEOF ((union node *)&tokpushback)
/* /*
* Called when an unexpected token is read during the parse. The argument * Called when an unexpected token is read during the parse. The argument
@ -11680,8 +11686,8 @@ peektoken(void)
} }
/* /*
* Read and parse a command. Returns NEOF on end of file. (NULL is a * Read and parse a command. Returns NODE_EOF on end of file.
* valid parse tree indicating a blank line.) * (NULL is a valid parse tree indicating a blank line.)
*/ */
static union node * static union node *
parsecmd(int interact) parsecmd(int interact)
@ -11695,7 +11701,7 @@ parsecmd(int interact)
needprompt = 0; needprompt = 0;
t = readtoken(); t = readtoken();
if (t == TEOF) if (t == TEOF)
return NEOF; return NODE_EOF;
if (t == TNL) if (t == TNL)
return NULL; return NULL;
tokpushback = 1; tokpushback = 1;
@ -11770,7 +11776,7 @@ evalstring(char *s, int mask)
setstackmark(&smark); setstackmark(&smark);
skip = 0; skip = 0;
while ((n = parsecmd(0)) != NEOF) { while ((n = parsecmd(0)) != NODE_EOF) {
evaltree(n, 0); evaltree(n, 0);
popstackmark(&smark); popstackmark(&smark);
skip = evalskip; skip = evalskip;
@ -11844,10 +11850,10 @@ cmdloop(int top)
} }
n = parsecmd(inter); n = parsecmd(inter);
#if DEBUG > 2 #if DEBUG > 2
if (debug && (n != NEOF)) if (debug && (n != NODE_EOF))
showtree(n); showtree(n);
#endif #endif
if (n == NEOF) { if (n == NODE_EOF) {
if (!top || numeof >= 50) if (!top || numeof >= 50)
break; break;
if (!stoppedjobs()) { if (!stoppedjobs()) {