#define applet_name "hush"
#include "standalone.h"
#define shell_main main
-#define BB_FEATURE_SH_SIMPLE_PROMPT
+#undef BB_FEATURE_SH_FANCY_PROMPT
#endif
typedef enum {
static struct jobset *job_list;
static unsigned int last_bg_pid;
static char *PS1;
-static char PS2[] = "> ";
-
+static char *PS2;
struct variables shell_ver = { "HUSH_VERSION", "0.01", 1, 1, 0 };
-
struct variables *top_vars = &shell_ver;
#define B_CHUNK (100)
* 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 int run_list_real(struct pipe *pi);
static void pseudo_exec(struct child_prog *child) __attribute__ ((noreturn));
+int controlling_tty(int check_pgrp);
static int run_pipe_real(struct pipe *pi);
/* extended glob support: */
static int globhack(const char *src, int flags, glob_t *pglob);
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);
name = strdup(name);
if(name) {
- char *value = strchr(name, '=');
-
- if (!value) {
- char *tmp;
- /* They are exporting something without an =VALUE */
-
- value = get_local_var(name);
- if (value) {
- size_t ln = strlen(name);
-
- tmp = realloc(name, ln+strlen(value)+2);
- if(tmp==NULL)
- res = -1;
- else {
- sprintf(tmp+ln, "=%s", value);
- name = tmp;
+ char *value = strchr(name, '=');
+
+ if (!value) {
+ char *tmp;
+ /* They are exporting something without an =VALUE */
+
+ value = get_local_var(name);
+ if (value) {
+ size_t ln = strlen(name);
+
+ tmp = realloc(name, ln+strlen(value)+2);
+ if(tmp==NULL)
+ res = -1;
+ else {
+ sprintf(tmp+ln, "=%s", value);
+ name = tmp;
+ }
+ } else {
+ /* bash does not return an error when trying to export
+ * an undefined variable. Do likewise. */
+ res = 1;
}
- } else {
- /* bash not put error and set error code
- if exporting not defined variable */
- res = 1;
}
- }
}
if (res<0)
perror_msg("export");
signal(SIGTTOU, SIG_IGN);
/* suppress messages when run from /linuxrc mag@sysgo.de */
if (tcsetpgrp(0, pi->pgrp) && errno != ENOTTY)
- perror_msg("tcsetpgrp");
+ perror_msg("tcsetpgrp-1");
signal(SIGTTOU, SIG_DFL);
job_list->fg = pi;
}
char string[BUFSIZ];
char *var = 0;
- string[0] = 0; /* for correct work if stdin have "only EOF" */
+ string[0] = 0; /* In case stdin has only EOF */
/* read string */
fgets(string, sizeof(string), stdin);
chomp(string);
sprintf(var, "%s=%s", child->argv[1], string);
res = set_local_var(var, 0);
} else
- res = -1;
+ res = -1;
if (res)
fprintf(stderr, "read: %m\n");
- free(var); /* not move up - saved errno */
+ free(var); /* So not move up to avoid breaking errno */
return res;
} else {
do res=getchar(); while(res!='\n' && res!=EOF);
static inline void cmdedit_set_initial_prompt(void)
{
-#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
+#ifndef BB_FEATURE_SH_FANCY_PROMPT
PS1 = NULL;
#else
PS1 = getenv("PS1");
static inline void setup_prompt_string(int promptmode, char **prompt_str)
{
debug_printf("setup_prompt_string %d ",promptmode);
-#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
+#ifndef BB_FEATURE_SH_FANCY_PROMPT
/* Set up the prompt */
if (promptmode == 1) {
if (PS1)
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;
}
}
return rcode;
}
-/* very simple version for testing */
+/* never returns */
+/* XXX no exit() here. If you don't exec, use _exit instead.
+ * The at_exit handlers apparently confuse the calling process,
+ * in particular stdin handling. Not sure why? */
static void pseudo_exec(struct child_prog *child)
{
int i, rcode;
struct built_in_command *x;
if (child->argv) {
for (i=0; is_assignment(child->argv[i]); i++) {
+ debug_printf("pid %d environment modification: %s\n",getpid(),child->argv[i]);
putenv(strdup(child->argv[i]));
}
child->argv+=i; /* XXX this hack isn't so horrible, since we are about
/* If a variable is assigned in a forest, and nobody listens,
* was it ever really set?
*/
- if (child->argv[0] == NULL) exit(EXIT_SUCCESS);
+ if (child->argv[0] == NULL) {
+ _exit(EXIT_SUCCESS);
+ }
/*
* Check if the command matches any of the builtins.
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);
}
}
#endif
debug_printf("exec of %s\n",child->argv[0]);
execvp(child->argv[0],child->argv);
- perror("execvp");
- exit(1);
+ perror_msg("couldn't exec: %s",child->argv[0]);
+ _exit(1);
} else if (child->group) {
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);
+ _exit(rcode);
} else {
/* Can happen. See what bash does with ">foo" by itself. */
debug_printf("trying to pseudo_exec null command\n");
- exit(EXIT_SUCCESS);
+ _exit(EXIT_SUCCESS);
}
}
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()
{
- int status;
+ int status, ctty;
int prognum = 0;
struct pipe *pi;
pid_t childpid;
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;
perror_msg("waitpid");
/* move the shell to the foreground */
- if (tcsetpgrp(0, getpgrp()) && errno != ENOTTY)
- perror_msg("tcsetpgrp");
+ if (interactive && (ctty=controlling_tty(0))!=-1) {
+ if (tcsetpgrp(ctty, getpgrp()))
+ perror_msg("tcsetpgrp-2");
+ }
+}
+
+/* Figure out our controlling tty, checking in order stderr,
+ * stdin, and stdout. If check_pgrp is set, also check that
+ * we belong to the foreground process group associated with
+ * that tty. The value of ctty is needed in order to call
+ * tcsetpgrp(ctty, ...); */
+int controlling_tty(int check_pgrp)
+{
+ pid_t curpgrp;
+ int ctty;
+
+ if ((curpgrp = tcgetpgrp(ctty = 2)) < 0
+ && (curpgrp = tcgetpgrp(ctty = 0)) < 0
+ && (curpgrp = tcgetpgrp(ctty = 1)) < 0)
+ return errno = ENOTTY, -1;
+
+ if (check_pgrp && curpgrp != getpgrp())
+ return errno = EPERM, -1;
+
+ return ctty;
}
/* run_pipe_real() starts all the jobs, but doesn't wait for anything
ctty = -1;
nextin = 0;
- pi->pgrp = 0;
+ pi->pgrp = -1;
/* Check if we are supposed to run in the foreground */
if (interactive && pi->followup!=PIPE_BG) {
- if ((pi->pgrp = tcgetpgrp(ctty = 2)) < 0
- && (pi->pgrp = tcgetpgrp(ctty = 0)) < 0
- && (pi->pgrp = tcgetpgrp(ctty = 1)) < 0)
- return errno = ENOTTY, -1;
-
- if (pi->pgrp < 0 && pi->pgrp != getpgrp())
- return errno = EPERM, -1;
+ if ((ctty = controlling_tty(pi->pgrp<0)) < 0) return -1;
}
/* Check if this is a simple builtin (not part of a pipe).
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 */
}
* and the pipe fd is available for dup'ing. */
setup_redirects(child,NULL);
- if (pi->followup!=PIPE_BG) {
+ if (interactive && pi->followup!=PIPE_BG) {
/* If we (the child) win the race, put ourselves in the process
* group whose leader is the first process in this pipe. */
if (pi->pgrp < 0) {
- pi->pgrp = child->pid;
+ pi->pgrp = getpid();
}
if (setpgid(0, pi->pgrp) == 0) {
signal(SIGTTOU, SIG_IGN);
if (interactive) {
/* move the new process group into the foreground */
/* suppress messages when run from /linuxrc mag@sysgo.de */
+ /* XXX probably this "0" should come from controlling_tty() */
if (tcsetpgrp(0, pi->pgrp) && errno != ENOTTY)
- perror_msg("tcsetpgrp");
+ perror_msg("tcsetpgrp-3");
rcode = pipe_wait(pi);
if (tcsetpgrp(0, getpgrp()) && errno != ENOTTY)
- perror_msg("tcsetpgrp");
+ perror_msg("tcsetpgrp-4");
} else {
rcode = pipe_wait(pi);
}
+ 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)
+ for(cur = top_vars; cur; cur = cur->next) {
+ if(strcmp(cur->name, name)==0)
break;
+ }
- if(cur) {
- if(strcmp(cur->value, value)==0) {
- result = cur->flg_export == flg_export;
+ 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 {
- 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 && flg_export==1) || (result>0 && cur->flg_export>0)) {
+ if(result==0 && cur->flg_export==1) {
*(value-1) = '=';
result = putenv(name);
} else {
- free(name);
+ free(name);
if(result>0) /* equivalent to previous set */
result = 0;
}
- free(newval);
return result;
}
struct variables *cur;
if (name) {
- for (cur = top_vars; cur; cur=cur->next)
+ for (cur = top_vars; cur; cur=cur->next) {
if(strcmp(cur->name, name)==0)
break;
+ }
if(cur!=0) {
struct variables *next = top_vars;
- if(cur==next)
- return;
- else {
+ if(cur->flg_read_only) {
+ error_msg("%s: readonly variable", name);
+ return;
+ } else {
if(cur->flg_export)
unsetenv(cur->name);
free(cur->name);
#if 0
#define SURROGATE "surrogate response"
write(1,SURROGATE,sizeof(SURROGATE));
- exit(run_list(head));
+ _exit(run_list(head));
#else
- exit(run_list_real(head)); /* leaks memory */
+ _exit(run_list_real(head)); /* leaks memory */
#endif
}
debug_printf("forked child %d\n",pid);
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,256); /* 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;
}
return rcode;
}
+
+/* I think Erik wrote this. It looks imperfect at best */
+void grab_tty_control(void)
+{
+ pid_t initialpgrp;
+ do {
+ initialpgrp = tcgetpgrp(fileno(stderr));
+ if (initialpgrp < 0) {
+ error_msg("sh: can't access tty; job control disabled\n");
+ }
+ if (initialpgrp == -1)
+ initialpgrp = getpgrp();
+ else if (initialpgrp != getpgrp()) {
+ killpg(initialpgrp, SIGTTIN);
+ continue;
+ }
+ } while (0);
+}
+
int shell_main(int argc, char **argv)
{
int opt;
struct jobset joblist_end = { NULL, NULL };
char **e = environ;
- /* initialize globals */
+ /* XXX what should these be while sourcing /etc/profile? */
+ global_argc = argc;
+ global_argv = argv;
+
+ /* (re?) initialize globals. Sometimes shell_main() ends up calling
+ * shell_main(), therefore we cannot rely on the BSS to zero out this
+ * stuff. Reset these to 0 every time. */
+ ifs = NULL;
+ /* map[] is taken care of with call to update_ifs_map() */
+ fake_mode = 0;
+ interactive = 0;
+ close_me_head = NULL;
+ last_bg_pid = 0;
+
+ /* Initialize some more globals to non-zero values */
+ set_cwd();
+ job_list = &joblist_end;
+#ifdef BB_FEATURE_COMMAND_EDITING
+ cmdedit_set_initial_prompt();
+#else
+ PS1 = NULL;
+#endif
+ PS2 = "> ";
+
+ /* initialize our shell local variables with the values
+ * currently living in the environment */
if (e) {
for (; *e; e++)
set_local_var(*e, 2); /* without call putenv() */
}
- job_list = &joblist_end;
last_return_code=EXIT_SUCCESS;
- /* XXX what should these be while sourcing /etc/profile? */
- global_argc = argc;
- global_argv = argv;
/* If we get started under a job aware app (like bash
* for example), make sure we are now in charge so we
* don't fight over who gets the foreground */
- do {
- pid_t initialpgrp;
- initialpgrp = tcgetpgrp(fileno(stderr));
- if (initialpgrp < 0) {
- error_msg_and_die("sh: can't access tty; job control disabled\n");
- }
- if (initialpgrp == -1)
- initialpgrp = getpgrp();
- else if (initialpgrp != getpgrp()) {
- killpg(initialpgrp, SIGTTIN);
- continue;
- }
- } while (0);
/* don't pay any attention to this signal; it just confuses
things and isn't really meant for shells anyway */
signal(SIGTTOU, SIG_IGN);
}
input=stdin;
- /* initialize the cwd -- this is never freed...*/
- cwd = xgetcwd(0);
- if (!cwd)
- cwd = unknown;
-#ifdef BB_FEATURE_COMMAND_EDITING
- cmdedit_set_initial_prompt();
-#else
- PS1 = NULL;
-#endif
-
while ((opt = getopt(argc, argv, "c:xif")) > 0) {
switch (opt) {
case 'c':
if (interactive) {
/* Looks like they want an interactive shell */
fprintf(stdout, "\nhush -- the humble shell v0.01 (testing)\n\n");
+ grab_tty_control();
+ }
+ if (argv[optind]==NULL) {
opt=parse_file_outer(stdin);
goto final_return;
}
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