#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)
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);
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)
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));
+ _exit(x->function(child));
}
}
#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,
* 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);
}
}
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;
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).
* 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;
} else {
*value++ = 0;
- for(cur = top_vars; cur; cur = cur->next)
+ for(cur = top_vars; cur; cur = cur->next) {
if(strcmp(cur->name, name)==0)
- break;
+ break;
+ }
if(cur) {
if(strcmp(cur->value, value)==0) {
- result = cur->flg_export == flg_export;
+ if(flg_export>0 && cur->flg_export==0)
+ cur->flg_export=flg_export;
+ else
+ result++;
} else {
if(cur->flg_read_only) {
- result = -1;
+ 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 */
- }
- }
+ }
+ }
} else {
cur = malloc(sizeof(struct variables));
if(cur==0) {
cur->name = strdup(name);
if(cur->name == 0) {
free(cur);
- result = -1;
+ result = -1;
} else {
struct variables *bottom = top_vars;
-
cur->value = newval;
newval = 0; /* protect free */
cur->next = 0;
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;
}
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);
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 */
+ /* FIXME */
+ fprintf(stderr, "sizeof(map)=%d\n", sizeof(map));
+
+
+ /* 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;
+ memset(map,0,sizeof(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;
}