reserved_style r_mode; /* supports if, for, while, until */
};
-struct jobset {
- struct pipe *head; /* head of list of running jobs */
- struct pipe *fg; /* current foreground job */
-};
-
struct close_me {
int fd;
struct close_me *next;
unsigned int last_return_code;
extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */
-/* Variables we export */
-unsigned int shell_context; /* Used in cmdedit.c to reset the
- * context when someone hits ^C */
-
/* "globals" within this file */
static char *ifs;
static char map[256];
static int interactive;
static struct close_me *close_me_head;
static const char *cwd;
-static struct jobset *job_list;
+static struct pipe *job_list;
static unsigned int last_bg_pid;
+static unsigned int last_jobid;
+static unsigned int shell_terminal;
static char *PS1;
static char *PS2;
struct variables shell_ver = { "HUSH_VERSION", "0.01", 1, 1, 0 };
struct variables *top_vars = &shell_ver;
+
#define B_CHUNK (100)
#define B_NOSPAC 1
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 int parse_string_outer(const char *s);
static int parse_file_outer(FILE *f);
/* job management: */
-static void checkjobs();
+static int checkjobs(struct pipe* fg_pipe);
static void insert_bg_job(struct pipe *pi);
static void remove_bg_job(struct pipe *pi);
/* local variable support */
static void unset_local_var(const char *name);
static int set_local_var(const char *s, int flg_export);
-
/* Table of built-in functions. They can be forked or not, depending on
* context: within pipes, they fork. As simple commands, they do not.
* When used in non-forking context, they can change global variables
int i, jobnum;
struct pipe *pi=NULL;
+ if (!interactive)
+ return EXIT_FAILURE;
/* If they gave us no args, assume they want the last backgrounded task */
if (!child->argv[1]) {
- for (pi = job_list->head; pi; pi = pi->next) {
- if (pi->progs && pi->progs->pid == last_bg_pid) {
+ for (pi = job_list; pi; pi = pi->next) {
+ if (pi->jobid == last_jobid) {
break;
}
}
error_msg("%s: bad argument '%s'", child->argv[0], child->argv[1]);
return EXIT_FAILURE;
}
-
- for (pi = job_list->head; pi; pi = pi->next) {
+ for (pi = job_list; pi; pi = pi->next) {
if (pi->jobid == jobnum) {
break;
}
return EXIT_FAILURE;
}
}
+
if (*child->argv[0] == 'f') {
- /* Make this job the foreground job */
- signal(SIGTTOU, SIG_IGN);
- /* suppress messages when run from /linuxrc mag@sysgo.de */
- if (tcsetpgrp(0, pi->pgrp) && errno != ENOTTY)
- perror_msg("tcsetpgrp-1");
- signal(SIGTTOU, SIG_DFL);
- job_list->fg = pi;
+ /* Put the job into the foreground. */
+ tcsetpgrp(shell_terminal, pi->pgrp);
}
/* Restart the processes in the job */
for (i = 0; i < pi->num_progs; i++)
pi->progs[i].is_stopped = 0;
- kill(-pi->pgrp, SIGCONT);
+ if ( (i=kill(- pi->pgrp, SIGCONT)) < 0) {
+ if (i == ESRCH) {
+ remove_bg_job(pi);
+ } else {
+ perror_msg("kill (SIGCONT)");
+ }
+ }
pi->stopped_progs = 0;
return EXIT_SUCCESS;
struct pipe *job;
char *status_string;
- for (job = job_list->head; job; job = job->next) {
+ for (job = job_list; job; job = job->next) {
if (job->running_progs == job->stopped_progs)
status_string = "Stopped";
else
status_string = "Running";
+
printf(JOB_STATUS_FORMAT, job->jobid, status_string, job->text);
}
return EXIT_SUCCESS;
*prompt_str = PS2;
}
#else
- *prompt_str = (promptmode==0)? PS1 : PS2;
+ *prompt_str = (promptmode==1)? PS1 : PS2;
#endif
debug_printf("result %s\n",*prompt_str);
}
** child processes (rob@sysgo.de)
*/
cmdedit_read_input(prompt_str, the_command);
- cmdedit_terminate();
#else
fputs(prompt_str, stdout);
fflush(stdout);
the_command[0]=fgetc(i->file);
the_command[1]='\0';
#endif
+ fflush(stdout);
i->p = the_command;
}
/* need to double check i->file because we might be doing something
* more complicated by now, like sourcing or substituting. */
if (i->__promptme && interactive && i->file == stdin) {
- get_user_input(i);
+ while(! i->p || (interactive && strlen(i->p)==0) ) {
+ get_user_input(i);
+ }
i->promptmode=2;
i->__promptme = 0;
if (i->p && *i->p) {
struct redir_struct *redir;
for (redir=prog->redirects; redir; redir=redir->next) {
+ if (redir->dup == -1 && redir->word.gl_pathv == NULL) {
+ /* something went wrong in the parse. Pretend it didn't happen */
+ continue;
+ }
if (redir->dup == -1) {
mode=redir_table[redir->type].mode;
openfd = open(redir->word.gl_pathv[0], mode, 0666);
close(openfd);
} else {
dup2(openfd, redir->fd);
- close(openfd);
+ if (redir->dup == -1)
+ close (openfd);
}
}
}
}
}
-/* XXX this definitely needs some more thought, work, and
- * cribbing from other shells */
-static int pipe_wait(struct pipe *pi)
-{
- int rcode=0, i, pid, running, status;
- running = pi->num_progs;
- while (running) {
- pid=waitpid(-1, &status, 0);
- if (pid < 0) perror_msg_and_die("waitpid");
- for (i=0; i < pi->num_progs; i++) {
- if (pi->progs[i].pid == pid) {
- if (i==pi->num_progs-1) rcode=WEXITSTATUS(status);
- pi->progs[i].pid = 0;
- running--;
- break;
- }
- }
- }
- return rcode;
-}
-
/* never returns */
/* XXX no exit() here. If you don't exec, use _exit instead.
* The at_exit handlers apparently confuse the calling process,
/* Linear search for the ID of the job to use */
pi->jobid = 1;
- for (thejob = job_list->head; thejob; thejob = thejob->next)
+ for (thejob = job_list; thejob; thejob = thejob->next)
if (thejob->jobid >= pi->jobid)
pi->jobid = thejob->jobid + 1;
/* add thejob to the list of running jobs */
- if (!job_list->head) {
- thejob = job_list->head = xmalloc(sizeof(*thejob));
+ if (!job_list) {
+ thejob = job_list = xmalloc(sizeof(*thejob));
} else {
- for (thejob = job_list->head; thejob->next; thejob = thejob->next) /* nothing */;
+ for (thejob = job_list; thejob->next; thejob = thejob->next) /* nothing */;
thejob->next = xmalloc(sizeof(*thejob));
thejob = thejob->next;
}
to the list of backgrounded thejobs and leave it alone */
printf("[%d] %d\n", thejob->jobid, thejob->progs[0].pid);
last_bg_pid = thejob->progs[0].pid;
+ last_jobid = thejob->jobid;
}
-/* remove a backgrounded job from a jobset */
+/* remove a backgrounded job */
static void remove_bg_job(struct pipe *pi)
{
struct pipe *prev_pipe;
- if (pi == job_list->head) {
- job_list->head = pi->next;
+ if (pi == job_list) {
+ job_list = pi->next;
} else {
- prev_pipe = job_list->head;
+ prev_pipe = job_list;
while (prev_pipe->next != pi)
prev_pipe = prev_pipe->next;
prev_pipe->next = pi->next;
}
+ if (job_list)
+ last_jobid = job_list->jobid;
+ else
+ last_jobid = 0;
+ pi->stopped_progs = 0;
free_pipe(pi, 0);
free(pi);
}
-/* Checks to see if any background processes have exited -- if they
+/* Checks to see if any processes have exited -- if they
have, figure out why and see if a job has completed */
-static void checkjobs()
+static int checkjobs(struct pipe* fg_pipe)
{
- int status, ctty;
+ int attributes;
+ int status;
int prognum = 0;
struct pipe *pi;
pid_t childpid;
- while ((childpid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) {
- for (pi = job_list->head; pi; pi = pi->next) {
+ attributes = WUNTRACED;
+ if (fg_pipe==NULL) {
+ attributes |= WNOHANG;
+ }
+
+ while ((childpid = waitpid(-1, &status, attributes)) > 0) {
+ if (fg_pipe) {
+ int i, rcode = 0;
+ for (i=0; i < fg_pipe->num_progs; i++) {
+ if (fg_pipe->progs[i].pid == childpid) {
+ if (i==fg_pipe->num_progs-1)
+ rcode=WEXITSTATUS(status);
+ (fg_pipe->num_progs)--;
+ return(rcode);
+ }
+ }
+ }
+
+ for (pi = job_list; pi; pi = pi->next) {
prognum = 0;
- while (prognum < pi->num_progs &&
- pi->progs[prognum].pid != childpid) prognum++;
+ while (prognum < pi->num_progs && pi->progs[prognum].pid != childpid) {
+ prognum++;
+ }
if (prognum < pi->num_progs)
break;
}
pi->stopped_progs++;
pi->progs[prognum].is_stopped = 1;
+#if 0
+ /* Printing this stuff is a pain, since it tends to
+ * overwrite the prompt an inconveinient moments. So
+ * don't do that. */
if (pi->stopped_progs == pi->num_progs) {
- printf(JOB_STATUS_FORMAT, pi->jobid, "Stopped", pi->text);
+ printf("\n"JOB_STATUS_FORMAT, pi->jobid, "Stopped", pi->text);
}
+#endif
}
}
perror_msg("waitpid");
/* move the shell to the foreground */
- if (interactive && (ctty=controlling_tty(0))!=-1) {
- if (tcsetpgrp(ctty, getpgrp()))
- perror_msg("tcsetpgrp-2");
- }
+ //if (interactive && tcsetpgrp(shell_terminal, getpgid(0)))
+ // perror_msg("tcsetpgrp-2");
+ return -1;
}
/* 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)
+ * that tty. The value of shell_terminal is needed in order to call
+ * tcsetpgrp(shell_terminal, ...); */
+void 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 ((curpgrp = tcgetpgrp(shell_terminal = 2)) < 0
+ && (curpgrp = tcgetpgrp(shell_terminal = 0)) < 0
+ && (curpgrp = tcgetpgrp(shell_terminal = 1)) < 0)
+ goto shell_terminal_error;
+
+ if (check_pgrp && curpgrp != getpgid(0))
+ goto shell_terminal_error;
- if (check_pgrp && curpgrp != getpgrp())
- return errno = EPERM, -1;
+ return;
- return ctty;
+shell_terminal_error:
+ shell_terminal = -1;
+ return;
}
/* run_pipe_real() starts all the jobs, but doesn't wait for anything
- * to finish. See pipe_wait().
+ * to finish. See checkjobs().
*
* return code is normally -1, when the caller has to wait for children
* to finish to determine the exit status of the pipe. If the pipe
static int run_pipe_real(struct pipe *pi)
{
int i;
- int ctty;
int nextin, nextout;
int pipefds[2]; /* pipefds[0] is for reading */
struct child_prog *child;
struct built_in_command *x;
- ctty = -1;
nextin = 0;
pi->pgrp = -1;
- /* Check if we are supposed to run in the foreground */
- if (interactive && pi->followup!=PIPE_BG) {
- if ((ctty = controlling_tty(pi->pgrp<0)) < 0) return -1;
- }
-
/* Check if this is a simple builtin (not part of a pipe).
* Builtins within pipes have to fork anyway, and are handled in
* pseudo_exec. "echo foo | read bar" doesn't work on bash, either.
*/
- if (pi->num_progs == 1 && pi->progs[0].argv != NULL) {
- child = & (pi->progs[0]);
- if (child->group && ! child->subshell) {
- int squirrel[] = {-1, -1, -1};
- int rcode;
- debug_printf("non-subshell grouping\n");
- setup_redirects(child, squirrel);
- /* XXX could we merge code with following builtin case,
- * by creating a pseudo builtin that calls run_list_real? */
- rcode = run_list_real(child->group);
- restore_redirects(squirrel);
- return rcode;
- }
+ if (pi->num_progs == 1) child = & (pi->progs[0]);
+ if (pi->num_progs == 1 && child->group && child->subshell == 0) {
+ int squirrel[] = {-1, -1, -1};
+ int rcode;
+ debug_printf("non-subshell grouping\n");
+ setup_redirects(child, squirrel);
+ /* XXX could we merge code with following builtin case,
+ * by creating a pseudo builtin that calls run_list_real? */
+ rcode = run_list_real(child->group);
+ restore_redirects(squirrel);
+ return rcode;
+ } else if (pi->num_progs == 1 && pi->progs[0].argv != NULL) {
for (i=0; is_assignment(child->argv[i]); i++) { /* nothing */ }
if (i!=0 && child->argv[i]==NULL) {
/* assignments, but no command: set the local environment */
* variable. */
int export_me=0;
char *name, *value;
- name = strdup(child->argv[i]);
+ name = xstrdup(child->argv[i]);
+ debug_printf("Local environment set: %s\n", name);
value = strchr(name, '=');
if (value)
*value=0;
/* XXX test for failed fork()? */
if (!(child->pid = fork())) {
-
+ /* Set the handling for job control signals back to the default. */
+ signal(SIGINT, SIG_DFL);
+ signal(SIGQUIT, SIG_DFL);
+ signal(SIGTERM, SIG_DFL);
+ signal(SIGTSTP, SIG_DFL);
+ signal(SIGTTIN, SIG_DFL);
signal(SIGTTOU, SIG_DFL);
+ signal(SIGCHLD, SIG_DFL);
close_all();
/* Like bash, explicit redirects override pipes,
* and the pipe fd is available for dup'ing. */
setup_redirects(child,NULL);
-
+
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. */
pi->pgrp = getpid();
}
if (setpgid(0, pi->pgrp) == 0) {
- signal(SIGTTOU, SIG_IGN);
- tcsetpgrp(ctty, pi->pgrp);
- signal(SIGTTOU, SIG_DFL);
+ tcsetpgrp(2, pi->pgrp);
}
}
pseudo_exec(child);
}
- /* Put our child in the process group whose leader is the
- * first process in this pipe. */
+
+
+ /* put our child in the process group whose leader is the
+ first process in this pipe */
if (pi->pgrp < 0) {
pi->pgrp = child->pid;
}
if (rmode == RES_ELIF && !if_code) continue;
if (pi->num_progs == 0) continue;
rcode = run_pipe_real(pi);
+ debug_printf("run_pipe_real returned %d\n",rcode);
if (rcode!=-1) {
/* We only ran a builtin: rcode was set by the return value
* of run_pipe_real(), and we don't need to wait for anything. */
insert_bg_job(pi);
rcode = EXIT_SUCCESS;
} else {
-
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)
+ if (tcsetpgrp(shell_terminal, pi->pgrp) && errno != ENOTTY)
perror_msg("tcsetpgrp-3");
- rcode = pipe_wait(pi);
- if (tcsetpgrp(0, getpgrp()) && errno != ENOTTY)
+ rcode = checkjobs(pi);
+ /* move the shell to the foreground */
+ if (tcsetpgrp(shell_terminal, getpgid(0)) && errno != ENOTTY)
perror_msg("tcsetpgrp-4");
} else {
- rcode = pipe_wait(pi);
+ rcode = checkjobs(pi);
}
- debug_printf("pipe_wait returned %d\n",rcode);
+ debug_printf("checkjobs returned %d\n",rcode);
}
last_return_code=rcode;
if ( rmode == RES_IF || rmode == RES_ELIF )
if ( (rcode==EXIT_SUCCESS && pi->followup==PIPE_OR) ||
(rcode!=EXIT_SUCCESS && pi->followup==PIPE_AND) )
skip_more_in_this_rmode=rmode;
+ checkjobs(NULL);
}
- checkjobs();
return rcode;
}
struct redir_struct *r, *rnext;
int a, i, ret_code=0;
char *ind = indenter(indent);
+
+ if (pi->stopped_progs > 0)
+ return ret_code;
final_printf("%s run pipe: (pid %d)\n",ind,getpid());
for (i=0; i<pi->num_progs; i++) {
child = &pi->progs[i];
for (r=child->redirects; r; r=rnext) {
final_printf("%s redirect %d%s", ind, r->fd, redir_table[r->type].descrip);
if (r->dup == -1) {
- final_printf(" %s\n", *r->word.gl_pathv);
- globfree(&r->word);
+ /* guard against the case >$FOO, where foo is unset or blank */
+ if (r->word.gl_pathv) {
+ final_printf(" %s\n", *r->word.gl_pathv);
+ globfree(&r->word);
+ }
} else {
final_printf("&%d\n", r->dup);
}
*/
static int globhack(const char *src, int flags, glob_t *pglob)
{
- int cnt, pathc;
+ int cnt=0, pathc;
const char *s;
char *dest;
- for (cnt=1, s=src; *s; s++) {
+ for (cnt=1, s=src; s && *s; s++) {
if (*s == '\\') s++;
cnt++;
}
if (pglob->gl_pathv == NULL) return GLOB_NOSPACE;
pglob->gl_pathv[pathc-1]=dest;
pglob->gl_pathv[pathc]=NULL;
- for (s=src; *s; s++, dest++) {
+ for (s=src; s && *s; s++, dest++) {
if (*s == '\\') s++;
*dest = *s;
}
}
redir = xmalloc(sizeof(struct redir_struct));
redir->next=NULL;
+ redir->word.gl_pathv=NULL;
if (last_redir) {
last_redir->next=redir;
} else {
debug_printf("pop stack\n");
old = ctx->stack;
old->child->group = ctx->list_head;
+ old->child->subshell = 0;
*ctx = *old; /* physical copy */
free(old);
}
return rcode;
}
-
-/* I think Erik wrote this. It looks imperfect at best */
-void grab_tty_control(void)
+/* Make sure we have a controlling tty. 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 */
+static void setup_job_control()
{
- 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);
+ static pid_t shell_pgrp;
+ /* Loop until we are in the foreground. */
+ while (tcgetpgrp (shell_terminal) != (shell_pgrp = getpgrp ()))
+ kill (- shell_pgrp, SIGTTIN);
+
+ /* Ignore interactive and job-control signals. */
+ signal(SIGINT, SIG_IGN);
+ signal(SIGQUIT, SIG_IGN);
+ signal(SIGTERM, SIG_IGN);
+ signal(SIGTSTP, SIG_IGN);
+ signal(SIGTTIN, SIG_IGN);
+ signal(SIGTTOU, SIG_IGN);
+ signal(SIGCHLD, SIG_IGN);
+
+ /* Put ourselves in our own process group. */
+ setsid();
+ shell_pgrp = getpid ();
+ setpgid (shell_pgrp, shell_pgrp);
+
+ /* Grab control of the terminal. */
+ tcsetpgrp(shell_terminal, shell_pgrp);
}
int shell_main(int argc, char **argv)
{
int opt;
FILE *input;
- struct jobset joblist_end = { NULL, NULL };
char **e = environ;
/* XXX what should these be while sourcing /etc/profile? */
interactive = 0;
close_me_head = NULL;
last_bg_pid = 0;
+ job_list = NULL;
+ last_jobid = 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
last_return_code=EXIT_SUCCESS;
- /* 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 */
- /* don't pay any attention to this signal; it just confuses
- things and isn't really meant for shells anyway */
- signal(SIGTTOU, SIG_IGN);
- setpgid(0, getpid());
- tcsetpgrp(fileno(stderr), getpid());
-
if (argv[0] && argv[0][0] == '-') {
debug_printf("\nsourcing /etc/profile\n");
- input = xfopen("/etc/profile", "r");
- mark_open(fileno(input));
- parse_file_outer(input);
- mark_closed(fileno(input));
- fclose(input);
+ if ((input = fopen("/etc/profile", "r")) != NULL) {
+ mark_open(fileno(input));
+ parse_file_outer(input);
+ mark_closed(fileno(input));
+ fclose(input);
+ }
}
input=stdin;
if (interactive) {
/* Looks like they want an interactive shell */
fprintf(stdout, "\nhush -- the humble shell v0.01 (testing)\n\n");
- grab_tty_control();
+ setup_job_control();
}
+
if (argv[optind]==NULL) {
opt=parse_file_outer(stdin);
goto final_return;