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

ash: rename parsefile->fd to ->pf_fd

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-06-03 04:29:08 +02:00
parent 08d8b3cee1
commit 79b3d42e13
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
shell/ash.c
View File

@ -1044,7 +1044,7 @@ struct strpush {
struct parsefile { struct parsefile {
struct parsefile *prev; /* preceding file on stack */ struct parsefile *prev; /* preceding file on stack */
int linno; /* current line */ int linno; /* current line */
int fd; /* file descriptor (or -1 if string) */ int pf_fd; /* file descriptor (or -1 if string) */
int left_in_line; /* number of chars left in this line */ int left_in_line; /* number of chars left in this line */
int left_in_buffer; /* number of chars left in this buffer past the line */ int left_in_buffer; /* number of chars left in this buffer past the line */
char *next_to_pgetc; /* next char in buffer */ char *next_to_pgetc; /* next char in buffer */
@ -1070,7 +1070,7 @@ ash_vmsg(const char *msg, va_list ap)
if (commandname) { if (commandname) {
if (strcmp(arg0, commandname)) if (strcmp(arg0, commandname))
fprintf(stderr, "%s: ", commandname); fprintf(stderr, "%s: ", commandname);
if (!iflag || g_parsefile->fd > 0) if (!iflag || g_parsefile->pf_fd > 0)
fprintf(stderr, "line %d: ", startlinno); fprintf(stderr, "line %d: ", startlinno);
} }
vfprintf(stderr, msg, ap); vfprintf(stderr, msg, ap);
@ -5066,15 +5066,15 @@ static int is_hidden_fd(struct redirtab *rp, int fd)
/* Check open scripts' fds */ /* Check open scripts' fds */
pf = g_parsefile; pf = g_parsefile;
while (pf) { while (pf) {
/* We skip fd == 0 case because of the following case: /* We skip pf_fd == 0 case because of the following case:
* $ ash # running ash interactively * $ ash # running ash interactively
* $ . ./script.sh * $ . ./script.sh
* and in script.sh: "exec 9>&0". * and in script.sh: "exec 9>&0".
* Even though top-level fd _is_ 0, * Even though top-level pf_fd _is_ 0,
* it's still ok to use it: "read" builtin uses it, * it's still ok to use it: "read" builtin uses it,
* why should we cripple "exec" builtin? * why should we cripple "exec" builtin?
*/ */
if (pf->fd > 0 && fd == pf->fd) { if (pf->pf_fd > 0 && fd == pf->pf_fd) {
return 1; return 1;
} }
pf = pf->prev; pf = pf->prev;
@ -9456,8 +9456,8 @@ preadfd(void)
g_parsefile->next_to_pgetc = buf; g_parsefile->next_to_pgetc = buf;
#if ENABLE_FEATURE_EDITING #if ENABLE_FEATURE_EDITING
retry: retry:
if (!iflag || g_parsefile->fd != STDIN_FILENO) if (!iflag || g_parsefile->pf_fd != STDIN_FILENO)
nr = nonblock_safe_read(g_parsefile->fd, buf, IBUFSIZ - 1); nr = nonblock_safe_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1);
else { else {
#if ENABLE_FEATURE_TAB_COMPLETION #if ENABLE_FEATURE_TAB_COMPLETION
line_input_state->path_lookup = pathval(); line_input_state->path_lookup = pathval();
@ -9706,7 +9706,7 @@ pushfile(void)
pf = ckzalloc(sizeof(*pf)); pf = ckzalloc(sizeof(*pf));
pf->prev = g_parsefile; pf->prev = g_parsefile;
pf->fd = -1; pf->pf_fd = -1;
/*pf->strpush = NULL; - ckzalloc did it */ /*pf->strpush = NULL; - ckzalloc did it */
/*pf->basestrpush.prev = NULL;*/ /*pf->basestrpush.prev = NULL;*/
g_parsefile = pf; g_parsefile = pf;
@ -9718,8 +9718,8 @@ popfile(void)
struct parsefile *pf = g_parsefile; struct parsefile *pf = g_parsefile;
INT_OFF; INT_OFF;
if (pf->fd >= 0) if (pf->pf_fd >= 0)
close(pf->fd); close(pf->pf_fd);
free(pf->buf); free(pf->buf);
while (pf->strpush) while (pf->strpush)
popstring(); popstring();
@ -9746,9 +9746,9 @@ static void
closescript(void) closescript(void)
{ {
popallfiles(); popallfiles();
if (g_parsefile->fd > 0) { if (g_parsefile->pf_fd > 0) {
close(g_parsefile->fd); close(g_parsefile->pf_fd);
g_parsefile->fd = 0; g_parsefile->pf_fd = 0;
} }
} }
@ -9764,7 +9764,7 @@ setinputfd(int fd, int push)
pushfile(); pushfile();
g_parsefile->buf = NULL; g_parsefile->buf = NULL;
} }
g_parsefile->fd = fd; g_parsefile->pf_fd = fd;
if (g_parsefile->buf == NULL) if (g_parsefile->buf == NULL)
g_parsefile->buf = ckmalloc(IBUFSIZ); g_parsefile->buf = ckmalloc(IBUFSIZ);
g_parsefile->left_in_buffer = 0; g_parsefile->left_in_buffer = 0;
@ -13008,7 +13008,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
* Ensure we don't falsely claim that 0 (stdin) * Ensure we don't falsely claim that 0 (stdin)
* is one of stacked source fds. * is one of stacked source fds.
* Testcase: ash -c 'exec 1>&0' must not complain. */ * Testcase: ash -c 'exec 1>&0' must not complain. */
// if (!sflag) g_parsefile->fd = -1; // if (!sflag) g_parsefile->pf_fd = -1;
// ^^ not necessary since now we special-case fd 0 // ^^ not necessary since now we special-case fd 0
// in is_hidden_fd() to not be considered "hidden fd" // in is_hidden_fd() to not be considered "hidden fd"
evalstring(minusc, 0); evalstring(minusc, 0);