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

Commit a patch by Larry Doolittle which fixes recursive calls to file_peek,

Browse Source 
and improves some debugging messages.
This commit is contained in:
Matt Kraai
2001-05-23 17:43:00 +00:00
parent 774d135b66
commit bdd4eced84
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hush.c
View File

@@ -278,6 +278,7 @@ typedef struct {
* available? Where is it documented? */ * available? Where is it documented? */
struct in_str { struct in_str {
const char *p; const char *p;
char peek_buf[2];
int __promptme; int __promptme;
int promptmode; int promptmode;
FILE *file; FILE *file;
@@ -932,12 +933,11 @@ static int file_peek(struct in_str *i)
if (i->p && *i->p) { if (i->p && *i->p) {
return *i->p; return *i->p;
} else { } else {
static char buffer[2]; i->peek_buf[0] = fgetc(i->file);
buffer[0] = fgetc(i->file); i->peek_buf[1] = '\0';
buffer[1] = '\0'; i->p = i->peek_buf;
i->p = buffer;
debug_printf("b_peek: got a %d\n", *i->p); debug_printf("b_peek: got a %d\n", *i->p);
return *i->p; return *i->p;
} }
} }
@@ -1513,8 +1513,8 @@ static int run_list_real(struct pipe *pi)
perror_msg("tcsetpgrp-4"); perror_msg("tcsetpgrp-4");
} else { } else {
rcode = pipe_wait(pi); rcode = pipe_wait(pi);
debug_printf("pipe_wait returned %d\n",rcode);
} }
debug_printf("pipe_wait returned %d\n",rcode);
} }
last_return_code=rcode; last_return_code=rcode;
if ( rmode == RES_IF || rmode == RES_ELIF ) if ( rmode == RES_IF || rmode == RES_ELIF )
@@ -2347,7 +2347,7 @@ int parse_stream(o_string *dest, struct p_context *ctx,
done_pipe(ctx,PIPE_SEQ); done_pipe(ctx,PIPE_SEQ);
} }
if (ch == end_trigger && !dest->quote && ctx->w==RES_NONE) { if (ch == end_trigger && !dest->quote && ctx->w==RES_NONE) {
debug_printf("leaving parse_stream\n"); debug_printf("leaving parse_stream (triggered)\n");
return 0; return 0;
} }
#if 0 #if 0
@@ -2471,6 +2471,7 @@ int parse_stream(o_string *dest, struct p_context *ctx,
* that is, we were really supposed to get end_trigger, and never got * that is, we were really supposed to get end_trigger, and never got
* one before the EOF. Can't use the standard "syntax error" return code, * one before the EOF. Can't use the standard "syntax error" return code,
* so that parse_stream_outer can distinguish the EOF and exit smoothly. */ * so that parse_stream_outer can distinguish the EOF and exit smoothly. */
debug_printf("leaving parse_stream (EOF)\n");
if (end_trigger != '\0') return -1; if (end_trigger != '\0') return -1;
return 0; return 0;
} }

15
shell/hush.c
View File

@@ -278,6 +278,7 @@ typedef struct {
* available? Where is it documented? */ * available? Where is it documented? */
struct in_str { struct in_str {
const char *p; const char *p;
char peek_buf[2];
int __promptme; int __promptme;
int promptmode; int promptmode;
FILE *file; FILE *file;
@@ -932,12 +933,11 @@ static int file_peek(struct in_str *i)
if (i->p && *i->p) { if (i->p && *i->p) {
return *i->p; return *i->p;
} else { } else {
static char buffer[2]; i->peek_buf[0] = fgetc(i->file);
buffer[0] = fgetc(i->file); i->peek_buf[1] = '\0';
buffer[1] = '\0'; i->p = i->peek_buf;
i->p = buffer;
debug_printf("b_peek: got a %d\n", *i->p); debug_printf("b_peek: got a %d\n", *i->p);
return *i->p; return *i->p;
} }
} }
@@ -1513,8 +1513,8 @@ static int run_list_real(struct pipe *pi)
perror_msg("tcsetpgrp-4"); perror_msg("tcsetpgrp-4");
} else { } else {
rcode = pipe_wait(pi); rcode = pipe_wait(pi);
debug_printf("pipe_wait returned %d\n",rcode);
} }
debug_printf("pipe_wait returned %d\n",rcode);
} }
last_return_code=rcode; last_return_code=rcode;
if ( rmode == RES_IF || rmode == RES_ELIF ) if ( rmode == RES_IF || rmode == RES_ELIF )
@@ -2347,7 +2347,7 @@ int parse_stream(o_string *dest, struct p_context *ctx,
done_pipe(ctx,PIPE_SEQ); done_pipe(ctx,PIPE_SEQ);
} }
if (ch == end_trigger && !dest->quote && ctx->w==RES_NONE) { if (ch == end_trigger && !dest->quote && ctx->w==RES_NONE) {
debug_printf("leaving parse_stream\n"); debug_printf("leaving parse_stream (triggered)\n");
return 0; return 0;
} }
#if 0 #if 0
@@ -2471,6 +2471,7 @@ int parse_stream(o_string *dest, struct p_context *ctx,
* that is, we were really supposed to get end_trigger, and never got * that is, we were really supposed to get end_trigger, and never got
* one before the EOF. Can't use the standard "syntax error" return code, * one before the EOF. Can't use the standard "syntax error" return code,
* so that parse_stream_outer can distinguish the EOF and exit smoothly. */ * so that parse_stream_outer can distinguish the EOF and exit smoothly. */
debug_printf("leaving parse_stream (EOF)\n");
if (end_trigger != '\0') return -1; if (end_trigger != '\0') return -1;
return 0; return 0;
} }