* available? Where is it documented? */
struct in_str {
const char *p;
+ char peek_buf[2];
int __promptme;
int promptmode;
FILE *file;
static void close_all();
/* "run" the final data structures: */
static char *indenter(int i);
-static int run_list_test(struct pipe *head, int indent);
-static int run_pipe_test(struct pipe *pi, int indent);
+static int free_pipe_list(struct pipe *head, int indent);
+static int free_pipe(struct pipe *pi, int indent);
/* really run the final data structures: */
static int setup_redirects(struct child_prog *prog, int squirrel[]);
static int pipe_wait(struct pipe *pi);
static void checkjobs();
static void insert_bg_job(struct pipe *pi);
static void remove_bg_job(struct pipe *pi);
-static void free_pipe(struct pipe *pi);
/* local variable support */
static char *get_local_var(const char *var);
static void unset_local_var(const char *name);
if (i->p && *i->p) {
return *i->p;
} else {
- static char buffer[2];
- buffer[0] = fgetc(i->file);
- buffer[1] = '\0';
- i->p = buffer;
+ i->peek_buf[0] = fgetc(i->file);
+ i->peek_buf[1] = '\0';
+ i->p = i->peek_buf;
debug_printf("b_peek: got a %d\n", *i->p);
- return *i->p;
+ return *i->p;
}
}
for (x = bltins; x->cmd; x++) {
if (strcmp(child->argv[0], x->cmd) == 0 ) {
debug_printf("builtin exec %s\n", child->argv[0]);
- _exit(x->function(child));
+ rcode = x->function(child);
+ fflush(stdout);
+ _exit(rcode);
}
}
debug_printf("runtime nesting to group\n");
interactive=0; /* crucial!!!! */
rcode = run_list_real(child->group);
- /* OK to leak memory by not calling run_list_test,
+ /* OK to leak memory by not calling free_pipe_list,
* since this process is about to exit */
_exit(rcode);
} else {
prev_pipe->next = pi->next;
}
- free_pipe(pi);
+ free_pipe(pi, 0);
free(pi);
}
-/* free up all memory from a pipe */
-static void free_pipe(struct pipe *pi)
-{
- int i;
-
- for (i = 0; i < pi->num_progs; i++) {
- free(pi->progs[i].argv);
- if (pi->progs[i].redirects)
- free(pi->progs[i].redirects);
- }
- if (pi->progs)
- free(pi->progs);
- if (pi->text)
- free(pi->text);
- if (pi->cmdbuf)
- free(pi->cmdbuf);
- memset(pi, 0, sizeof(struct pipe));
-}
-
-
/* Checks to see if any background processes have exited -- if they
have, figure out why and see if a job has completed */
static void checkjobs()
break;
}
+ if(pi==NULL) {
+ debug_printf("checkjobs: pid %d was not in our list!\n", childpid);
+ continue;
+ }
+
if (WIFEXITED(status) || WIFSIGNALED(status)) {
/* child exited */
pi->running_progs--;
remove_bg_job(pi);
}
} else {
- if(pi==NULL)
- break;
/* child stopped */
pi->stopped_progs++;
pi->progs[prognum].is_stopped = 1;
if (i!=0 && child->argv[i]==NULL) {
/* assignments, but no command: set the local environment */
for (i=0; child->argv[i]!=NULL; i++) {
- set_local_var(child->argv[i], 0);
+
+ /* Ok, this case is tricky. We have to decide if this is a
+ * local variable, or an already exported variable. If it is
+ * already exported, we have to export the new value. If it is
+ * not exported, we need only set this as a local variable.
+ * This junk is all to decide whether or not to export this
+ * variable. */
+ int export_me=0;
+ char *name, *value;
+ name = strdup(child->argv[i]);
+ value = strchr(name, '=');
+ if (value)
+ *value=0;
+ if ( get_local_var(name)) {
+ export_me=1;
+ }
+ free(name);
+ set_local_var(child->argv[i], export_me);
}
return EXIT_SUCCESS; /* don't worry about errors in set_local_var() yet */
}
perror_msg("tcsetpgrp-4");
} else {
rcode = pipe_wait(pi);
- debug_printf("pipe_wait returned %d\n",rcode);
}
+ debug_printf("pipe_wait returned %d\n",rcode);
}
last_return_code=rcode;
if ( rmode == RES_IF || rmode == RES_ELIF )
}
/* return code is the exit status of the pipe */
-static int run_pipe_test(struct pipe *pi, int indent)
+static int free_pipe(struct pipe *pi, int indent)
{
char **p;
struct child_prog *child;
child->argv=NULL;
} else if (child->group) {
final_printf("%s begin group (subshell:%d)\n",ind, child->subshell);
- ret_code = run_list_test(child->group,indent+3);
+ ret_code = free_pipe_list(child->group,indent+3);
final_printf("%s end group\n",ind);
} else {
final_printf("%s (nil)\n",ind);
return ret_code;
}
-static int run_list_test(struct pipe *head, int indent)
+static int free_pipe_list(struct pipe *head, int indent)
{
int rcode=0; /* if list has no members */
struct pipe *pi, *next;
char *ind = indenter(indent);
for (pi=head; pi; pi=next) {
- if (pi->num_progs == 0) break;
final_printf("%s pipe reserved mode %d\n", ind, pi->r_mode);
- rcode = run_pipe_test(pi, indent);
+ rcode = free_pipe(pi, indent);
final_printf("%s pipe followup code %d\n", ind, pi->followup);
next=pi->next;
pi->next=NULL;
if (fake_mode==0) {
rcode = run_list_real(pi);
}
- /* run_list_test has the side effect of clearing memory
+ /* free_pipe_list has the side effect of clearing memory
* In the long run that function can be merged with run_list_real,
* but doing that now would hobble the debugging effort. */
- run_list_test(pi,0);
+ free_pipe_list(pi,0);
return rcode;
}
char *name, *value;
int result=0;
struct variables *cur;
- char *newval = 0;
name=strdup(s);
* NAME=VALUE format. So the first order of business is to
* split 's' on the '=' into 'name' and 'value' */
value = strchr(name, '=');
- if (value==0 || (newval = strdup(value+1))==0) {
- result = -1;
- } else {
- *value++ = 0;
+ if (value==0 && ++value==0) {
+ free(name);
+ return -1;
+ }
+ *value++ = 0;
- for(cur = top_vars; cur; cur = cur->next) {
- if(strcmp(cur->name, name)==0)
- break;
- }
+ for(cur = top_vars; cur; cur = cur->next) {
+ if(strcmp(cur->name, name)==0)
+ break;
+ }
- if(cur) {
- if(strcmp(cur->value, value)==0) {
- if(flg_export>0 && cur->flg_export==0)
- cur->flg_export=flg_export;
- else
- result++;
+ if(cur) {
+ if(strcmp(cur->value, value)==0) {
+ if(flg_export>0 && cur->flg_export==0)
+ cur->flg_export=flg_export;
+ else
+ result++;
+ } else {
+ if(cur->flg_read_only) {
+ error_msg("%s: readonly variable", name);
+ result = -1;
} else {
- if(cur->flg_read_only) {
- result = -1;
- error_msg("%s: readonly variable", name);
- } else {
- if(flg_export>0 || cur->flg_export>1)
- cur->flg_export=1;
- free(cur->value);
- cur->value = newval;
- newval = 0; /* protect free */
- }
+ if(flg_export>0 || cur->flg_export>1)
+ cur->flg_export=1;
+ free(cur->value);
+
+ cur->value = strdup(value);
}
+ }
+ } else {
+ cur = malloc(sizeof(struct variables));
+ if(!cur) {
+ result = -1;
} else {
- cur = malloc(sizeof(struct variables));
- if(cur==0) {
+ cur->name = strdup(name);
+ if(cur->name == 0) {
+ free(cur);
result = -1;
} else {
- cur->name = strdup(name);
- if(cur->name == 0) {
- free(cur);
- result = -1;
- } else {
- struct variables *bottom = top_vars;
- cur->value = newval;
- newval = 0; /* protect free */
- cur->next = 0;
- cur->flg_export = flg_export;
- cur->flg_read_only = 0;
- while(bottom->next) bottom=bottom->next;
- bottom->next = cur;
- }
+ struct variables *bottom = top_vars;
+ cur->value = strdup(value);
+ cur->next = 0;
+ cur->flg_export = flg_export;
+ cur->flg_read_only = 0;
+ while(bottom->next) bottom=bottom->next;
+ bottom->next = cur;
}
}
}
if(result>0) /* equivalent to previous set */
result = 0;
}
- free(newval);
return result;
}
pf = fdopen(channel[0],"r");
debug_printf("pipe on FILE *%p\n",pf);
#else
- run_list_test(head,0);
+ free_pipe_list(head,0);
pf=popen("echo surrogate response","r");
debug_printf("started fake pipe on FILE *%p\n",pf);
#endif
* to the KISS philosophy of this program. */
mark_closed(fileno(p));
retcode=pclose(p);
+ free_pipe_list(inner.list_head,0);
debug_printf("pclosed, retcode=%d\n",retcode);
/* XXX this process fails to trim a single trailing newline */
return retcode;
done_pipe(ctx,PIPE_SEQ);
}
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;
}
#if 0
* 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,
* 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;
return 0;
}
* The map[] array only really needs two bits each, and on most machines
* that would be faster because of the reduced L1 cache footprint.
*/
- memset(map,0,sizeof(map)); /* most characters flow through always */
- mapset("\\$'\"`", 3); /* never flow through */
- mapset("<>;&|(){}#", 1); /* flow through if quoted */
- mapset(ifs, 2); /* also flow through if quoted */
+ memset(map,0,sizeof(map)); /* most characters flow through always */
+ mapset("\\$'\"`", 3); /* never flow through */
+ mapset("<>;&|(){}#", 1); /* flow through if quoted */
+ mapset(ifs, 2); /* also flow through if quoted */
}
/* most recursion does not come through here, the exeception is
done_word(&temp, &ctx);
done_pipe(&ctx,PIPE_SEQ);
run_list(ctx.list_head);
+ b_free(&temp);
} while (rcode != -1); /* loop on syntax errors, return on EOF */
return 0;
}
* shell_main(), therefore we cannot rely on the BSS to zero out this
* stuff. Reset these to 0 every time. */
ifs = NULL;
- memset(map,0,sizeof(map));
+ /* map[] is taken care of with call to update_ifs_map() */
fake_mode = 0;
interactive = 0;
close_me_head = NULL;
opt = parse_file_outer(input);
#ifdef BB_FEATURE_CLEAN_UP
- fclose(input.file);
+ fclose(input);
+ if (cwd && cwd != unknown)
+ free((char*)cwd);
+ {
+ struct variables *cur, *tmp;
+ for(cur = top_vars; cur; cur = tmp) {
+ tmp = cur->next;
+ if (!cur->flg_read_only) {
+ free(cur->name);
+ free(cur->value);
+ free(cur);
+ }
+ }
+ }
#endif
final_return:
projects / oweals / busybox.git / blobdiff