/*
* lash -- the BusyBox Lame-Ass SHell
*
- * Copyright (C) 2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
*
* Based in part on ladsh.c by Michael K. Johnson and Erik W. Troan, which is
* under the following liberal license: "We have placed this source code in the
*
*/
-#include "internal.h"
+/* This shell's parsing engine is officially at a dead-end. Future
+ * work shell work should be done using hush, msh, or ash. This is
+ * still a very useful, small shell -- it just don't need any more
+ * features beyond what it already has...
+ */
+
+//For debugging/development on the shell only...
+//#define DEBUG_SHELL
+
+
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
-#include <glob.h>
#include <signal.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/wait.h>
#include <unistd.h>
-#ifdef BB_FEATURE_SH_COMMAND_EDITING
+#include <getopt.h>
+#include <termios.h>
+#include "busybox.h"
#include "cmdedit.h"
+
+#ifdef CONFIG_LOCALE_SUPPORT
+#include <locale.h>
#endif
-#define MAX_READ 128 /* size of input buffer for `read' builtin */
+#include <glob.h>
+#define expand_t glob_t
+
+/* Always enable for the moment... */
+#define CONFIG_LASH_PIPE_N_REDIRECTS
+#define CONFIG_LASH_JOB_CONTROL
+
+static const int MAX_READ = 128; /* size of input buffer for `read' builtin */
#define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n"
-enum redirectionType { REDIRECT_INPUT, REDIRECT_OVERWRITE,
+#ifdef CONFIG_LASH_PIPE_N_REDIRECTS
+enum redir_type { REDIRECT_INPUT, REDIRECT_OVERWRITE,
REDIRECT_APPEND
};
+#endif
-struct jobSet {
- struct job *head; /* head of list of running jobs */
- struct job *fg; /* current foreground job */
-};
+static const unsigned int DEFAULT_CONTEXT=0x1;
+static const unsigned int IF_TRUE_CONTEXT=0x2;
+static const unsigned int IF_FALSE_CONTEXT=0x4;
+static const unsigned int THEN_EXP_CONTEXT=0x8;
+static const unsigned int ELSE_EXP_CONTEXT=0x10;
-struct redirectionSpecifier {
- enum redirectionType type; /* type of redirection */
+#ifdef CONFIG_LASH_PIPE_N_REDIRECTS
+struct redir_struct {
+ enum redir_type type; /* type of redirection */
int fd; /* file descriptor being redirected */
char *filename; /* file to redirect fd to */
};
+#endif
-struct childProgram {
+struct child_prog {
pid_t pid; /* 0 if exited */
char **argv; /* program name and arguments */
- int numRedirections; /* elements in redirection array */
- struct redirectionSpecifier *redirections; /* I/O redirections */
- glob_t globResult; /* result of parameter globbing */
- int freeGlob; /* should we globfree(&globResult)? */
- int isStopped; /* is the program currently running? */
+ int num_redirects; /* elements in redirection array */
+ int is_stopped; /* is the program currently running? */
+ struct job *family; /* pointer back to the child's parent job */
+#ifdef CONFIG_LASH_PIPE_N_REDIRECTS
+ struct redir_struct *redirects; /* I/O redirects */
+#endif
+};
+
+struct jobset {
+ struct job *head; /* head of list of running jobs */
+ struct job *fg; /* current foreground job */
};
struct job {
- int jobId; /* job number */
- int numProgs; /* total number of programs in job */
- int runningProgs; /* number of programs running */
+ int jobid; /* job number */
+ int num_progs; /* total number of programs in job */
+ int running_progs; /* number of programs running */
char *text; /* name of job */
- char *cmdBuf; /* buffer various argv's point into */
+ char *cmdbuf; /* buffer various argv's point into */
pid_t pgrp; /* process group ID for the job */
- struct childProgram *progs; /* array of programs in job */
+ struct child_prog *progs; /* array of programs in job */
struct job *next; /* to track background commands */
- int stoppedProgs; /* number of programs alive, but stopped */
+ int stopped_progs; /* number of programs alive, but stopped */
+ unsigned int job_context; /* bitmask defining current context */
+ struct jobset *job_list;
};
-struct builtInCommand {
+struct built_in_command {
char *cmd; /* name */
char *descr; /* description */
- char *usage; /* usage */
- int (*function) (struct job *, struct jobSet * jobList); /* function ptr */
+ int (*function) (struct child_prog *); /* function ptr */
+};
+
+struct close_me {
+ int fd;
+ struct close_me *next;
};
/* function prototypes for builtins */
-static int builtin_cd(struct job *cmd, struct jobSet *junk);
-static int builtin_env(struct job *dummy, struct jobSet *junk);
-static int builtin_exit(struct job *cmd, struct jobSet *junk);
-static int builtin_fg_bg(struct job *cmd, struct jobSet *jobList);
-static int builtin_help(struct job *cmd, struct jobSet *junk);
-static int builtin_jobs(struct job *dummy, struct jobSet *jobList);
-static int builtin_pwd(struct job *dummy, struct jobSet *junk);
-static int builtin_export(struct job *cmd, struct jobSet *junk);
-static int builtin_source(struct job *cmd, struct jobSet *jobList);
-static int builtin_unset(struct job *cmd, struct jobSet *junk);
-static int builtin_read(struct job *cmd, struct jobSet *junk);
+static int builtin_cd(struct child_prog *cmd);
+static int builtin_exec(struct child_prog *cmd);
+static int builtin_exit(struct child_prog *cmd);
+static int builtin_fg_bg(struct child_prog *cmd);
+static int builtin_help(struct child_prog *cmd);
+static int builtin_jobs(struct child_prog *dummy);
+static int builtin_pwd(struct child_prog *dummy);
+static int builtin_export(struct child_prog *cmd);
+static int builtin_source(struct child_prog *cmd);
+static int builtin_unset(struct child_prog *cmd);
+static int builtin_read(struct child_prog *cmd);
/* function prototypes for shell stuff */
-static void checkJobs(struct jobSet *jobList);
-static int getCommand(FILE * source, char *command);
-static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobList, int *isBg);
-static int setupRedirections(struct childProgram *prog);
-static int runCommand(struct job *newJob, struct jobSet *jobList, int inBg);
+static void mark_open(int fd);
+static void mark_closed(int fd);
+static void close_all(void);
+static void checkjobs(struct jobset *job_list);
+static void remove_job(struct jobset *j_list, struct job *job);
+static int get_command(FILE * source, char *command);
+static int parse_command(char **command_ptr, struct job *job, int *inbg);
+static int run_command(struct job *newjob, int inbg, int outpipe[2]);
+static int pseudo_exec(struct child_prog *cmd) __attribute__ ((noreturn));
static int busy_loop(FILE * input);
/* Table of built-in functions (these are non-forking builtins, meaning they
* can change global variables in the parent shell process but they will not
* work with pipes and redirects; 'unset foo | whatever' will not work) */
-static struct builtInCommand bltins[] = {
- {"bg", "Resume a job in the background", "bg [%%job]", builtin_fg_bg},
- {"cd", "Change working directory", "cd [dir]", builtin_cd},
- {"exit", "Exit from shell()", "exit", builtin_exit},
- {"fg", "Bring job into the foreground", "fg [%%job]", builtin_fg_bg},
- {"jobs", "Lists the active jobs", "jobs", builtin_jobs},
- {"export", "Set environment variable", "export [VAR=value]", builtin_export},
- {"unset", "Unset environment variable", "unset VAR", builtin_unset},
- {"read", "Input environment variable", "read [VAR]", builtin_read},
- {NULL, NULL, NULL, NULL}
+static struct built_in_command bltins[] = {
+ {"bg", "Resume a job in the background", builtin_fg_bg},
+ {"cd", "Change working directory", builtin_cd},
+ {"exec", "Exec command, replacing this shell with the exec'd process", builtin_exec},
+ {"exit", "Exit from shell()", builtin_exit},
+ {"fg", "Bring job into the foreground", builtin_fg_bg},
+ {"jobs", "Lists the active jobs", builtin_jobs},
+ {"export", "Set environment variable", builtin_export},
+ {"unset", "Unset environment variable", builtin_unset},
+ {"read", "Input environment variable", builtin_read},
+ {".", "Source-in and run commands in a file", builtin_source},
+ /* to do: add ulimit */
+ {NULL, NULL, NULL}
};
/* Table of forking built-in functions (things that fork cannot change global
* variables in the parent process, such as the current working directory) */
-static struct builtInCommand bltins_forking[] = {
- {"env", "Print all environment variables", "env", builtin_env},
- {"pwd", "Print current directory", "pwd", builtin_pwd},
- {".", "Source-in and run commands in a file", ". filename", builtin_source},
- {"help", "List shell built-in commands", "help", builtin_help},
- {NULL, NULL, NULL, NULL}
+static struct built_in_command bltins_forking[] = {
+ {"pwd", "Print current directory", builtin_pwd},
+ {"help", "List shell built-in commands", builtin_help},
+ {NULL, NULL, NULL}
};
-static const char shell_usage[] =
- "sh [FILE]...\n"
- " or: sh -c command [args]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nlash: The BusyBox command interpreter (shell).\n\n"
-#endif
- ;
-static char *prompt = "# ";
-static char *cwd = NULL;
-static char *local_pending_command = NULL;
+static int shell_context; /* Type prompt trigger (PS1 or PS2) */
-#ifdef BB_FEATURE_SH_COMMAND_EDITING
-void win_changed(int junk)
+
+/* Globals that are static to this file */
+static const char *cwd;
+static char *local_pending_command = NULL;
+static struct jobset job_list = { NULL, NULL };
+static int argc;
+static char **argv;
+static struct close_me *close_me_head;
+static int last_return_code;
+static int last_bg_pid;
+static unsigned int last_jobid;
+static int shell_terminal;
+static char *PS1;
+static char *PS2 = "> ";
+
+
+#ifdef DEBUG_SHELL
+static inline void debug_printf(const char *format, ...)
{
- struct winsize win = { 0, 0, 0, 0 };
- ioctl(0, TIOCGWINSZ, &win);
- if (win.ws_col > 0) {
- cmdedit_setwidth( win.ws_col - 1);
- }
+ va_list args;
+ va_start(args, format);
+ vfprintf(stderr, format, args);
+ va_end(args);
}
+#else
+static inline void debug_printf(const char *format, ...) { }
#endif
+/*
+ Most builtins need access to the struct child_prog that has
+ their arguments, previously coded as cmd->progs[0]. That coding
+ can exhibit a bug, if the builtin is not the first command in
+ a pipeline: "echo foo | exec sort" will attempt to exec foo.
+
+builtin previous use notes
+------ ----------------- ---------
+cd cmd->progs[0]
+exec cmd->progs[0] squashed bug: didn't look for applets or forking builtins
+exit cmd->progs[0]
+fg_bg cmd->progs[0], job_list->head, job_list->fg
+help 0
+jobs job_list->head
+pwd 0
+export cmd->progs[0]
+source cmd->progs[0]
+unset cmd->progs[0]
+read cmd->progs[0]
+
+I added "struct job *family;" to struct child_prog,
+and switched API to builtin_foo(struct child_prog *child);
+So cmd->text becomes child->family->text
+ cmd->job_context becomes child->family->job_context
+ cmd->progs[0] becomes *child
+ job_list becomes child->family->job_list
+ */
/* built-in 'cd <path>' handler */
-static int builtin_cd(struct job *cmd, struct jobSet *junk)
+static int builtin_cd(struct child_prog *child)
{
char *newdir;
- if (!cmd->progs[0].argv[1] == 1)
+ if (child->argv[1] == NULL)
newdir = getenv("HOME");
else
- newdir = cmd->progs[0].argv[1];
+ newdir = child->argv[1];
if (chdir(newdir)) {
- printf("cd: %s: %s\n", newdir, strerror(errno));
- return FALSE;
+ printf("cd: %s: %m\n", newdir);
+ return EXIT_FAILURE;
}
- getcwd(cwd, sizeof(cwd));
-
- return TRUE;
+ cwd = xgetcwd((char *)cwd);
+ if (!cwd)
+ cwd = bb_msg_unknown;
+ return EXIT_SUCCESS;
}
-/* built-in 'env' handler */
-static int builtin_env(struct job *dummy, struct jobSet *junk)
+/* built-in 'exec' handler */
+static int builtin_exec(struct child_prog *child)
{
- char **e;
-
- for (e = environ; *e; e++) {
- fprintf(stdout, "%s\n", *e);
- }
- return (0);
+ if (child->argv[1] == NULL)
+ return EXIT_SUCCESS; /* Really? */
+ child->argv++;
+ close_all();
+ pseudo_exec(child);
+ /* never returns */
}
/* built-in 'exit' handler */
-static int builtin_exit(struct job *cmd, struct jobSet *junk)
+static int builtin_exit(struct child_prog *child)
{
- if (!cmd->progs[0].argv[1] == 1)
- exit TRUE;
+ if (child->argv[1] == NULL)
+ exit(EXIT_SUCCESS);
- return(atoi(cmd->progs[0].argv[1]));
+ exit (atoi(child->argv[1]));
}
/* built-in 'fg' and 'bg' handler */
-static int builtin_fg_bg(struct job *cmd, struct jobSet *jobList)
+static int builtin_fg_bg(struct child_prog *child)
{
- int i, jobNum;
+ int i, jobnum;
struct job *job=NULL;
- if (!jobList->head) {
- if (!cmd->progs[0].argv[1] || cmd->progs[0].argv[2]) {
- errorMsg("%s: exactly one argument is expected\n",
- cmd->progs[0].argv[0]);
- return FALSE;
- }
- if (sscanf(cmd->progs[0].argv[1], "%%%d", &jobNum) != 1) {
- errorMsg("%s: bad argument '%s'\n",
- cmd->progs[0].argv[0], cmd->progs[0].argv[1]);
- return FALSE;
- for (job = jobList->head; job; job = job->next) {
- if (job->jobId == jobNum) {
- break;
- }
+ /* If they gave us no args, assume they want the last backgrounded task */
+ if (!child->argv[1]) {
+ for (job = child->family->job_list->head; job; job = job->next) {
+ if (job->jobid == last_jobid) {
+ break;
}
}
+ if (!job) {
+ bb_error_msg("%s: no current job", child->argv[0]);
+ return EXIT_FAILURE;
+ }
} else {
- job = jobList->head;
+ if (sscanf(child->argv[1], "%%%d", &jobnum) != 1) {
+ bb_error_msg("%s: bad argument '%s'", child->argv[0], child->argv[1]);
+ return EXIT_FAILURE;
+ }
+ for (job = child->family->job_list->head; job; job = job->next) {
+ if (job->jobid == jobnum) {
+ break;
+ }
+ }
+ if (!job) {
+ bb_error_msg("%s: %d: no such job", child->argv[0], jobnum);
+ return EXIT_FAILURE;
+ }
}
- if (!job) {
- errorMsg("%s: unknown job %d\n",
- cmd->progs[0].argv[0], jobNum);
- return FALSE;
- }
+ if (*child->argv[0] == 'f') {
+ /* Put the job into the foreground. */
+ tcsetpgrp(shell_terminal, job->pgrp);
- if (*cmd->progs[0].argv[0] == 'f') {
- /* Make this job the foreground job */
- /* suppress messages when run from /linuxrc mag@sysgo.de */
- if (tcsetpgrp(0, job->pgrp) && errno != ENOTTY)
- perror("tcsetpgrp");
- jobList->fg = job;
+ child->family->job_list->fg = job;
}
/* Restart the processes in the job */
- for (i = 0; i < job->numProgs; i++)
- job->progs[i].isStopped = 0;
+ for (i = 0; i < job->num_progs; i++)
+ job->progs[i].is_stopped = 0;
- kill(-job->pgrp, SIGCONT);
+ job->stopped_progs = 0;
- job->stoppedProgs = 0;
+ if ( (i=kill(- job->pgrp, SIGCONT)) < 0) {
+ if (i == ESRCH) {
+ remove_job(&job_list, job);
+ } else {
+ bb_perror_msg("kill (SIGCONT)");
+ }
+ }
- return TRUE;
+ return EXIT_SUCCESS;
}
/* built-in 'help' handler */
-static int builtin_help(struct job *dummy, struct jobSet *junk)
+static int builtin_help(struct child_prog *dummy)
{
- struct builtInCommand *x;
+ struct built_in_command *x;
- fprintf(stdout, "\nBuilt-in commands:\n");
- fprintf(stdout, "-------------------\n");
+ printf("\nBuilt-in commands:\n");
+ printf("-------------------\n");
for (x = bltins; x->cmd; x++) {
- fprintf(stdout, "%s\t%s\n", x->cmd, x->descr);
+ if (x->descr==NULL)
+ continue;
+ printf("%s\t%s\n", x->cmd, x->descr);
}
for (x = bltins_forking; x->cmd; x++) {
- fprintf(stdout, "%s\t%s\n", x->cmd, x->descr);
+ if (x->descr==NULL)
+ continue;
+ printf("%s\t%s\n", x->cmd, x->descr);
}
- fprintf(stdout, "\n\n");
- return TRUE;
+ printf("\n\n");
+ return EXIT_SUCCESS;
}
/* built-in 'jobs' handler */
-static int builtin_jobs(struct job *dummy, struct jobSet *jobList)
+static int builtin_jobs(struct child_prog *child)
{
struct job *job;
- char *statusString;
+ char *status_string;
- for (job = jobList->head; job; job = job->next) {
- if (job->runningProgs == job->stoppedProgs)
- statusString = "Stopped";
+ for (job = child->family->job_list->head; job; job = job->next) {
+ if (job->running_progs == job->stopped_progs)
+ status_string = "Stopped";
else
- statusString = "Running";
+ status_string = "Running";
- printf(JOB_STATUS_FORMAT, job->jobId, statusString, job->text);
+ printf(JOB_STATUS_FORMAT, job->jobid, status_string, job->text);
}
- return TRUE;
+ return EXIT_SUCCESS;
}
/* built-in 'pwd' handler */
-static int builtin_pwd(struct job *dummy, struct jobSet *junk)
+static int builtin_pwd(struct child_prog *dummy)
{
- getcwd(cwd, sizeof(cwd));
- fprintf(stdout, "%s\n", cwd);
- return TRUE;
+ cwd = xgetcwd((char *)cwd);
+ if (!cwd)
+ cwd = bb_msg_unknown;
+ puts(cwd);
+ return EXIT_SUCCESS;
}
/* built-in 'export VAR=value' handler */
-static int builtin_export(struct job *cmd, struct jobSet *junk)
+static int builtin_export(struct child_prog *child)
{
int res;
+ char *v = child->argv[1];
- if (!cmd->progs[0].argv[1] == 1) {
- return (builtin_env(cmd, junk));
+ if (v == NULL) {
+ char **e;
+ for (e = environ; *e; e++) {
+ puts(*e);
+ }
+ return 0;
}
- res = putenv(cmd->progs[0].argv[1]);
+ res = putenv(v);
if (res)
- fprintf(stdout, "export: %s\n", strerror(errno));
+ fprintf(stderr, "export: %m\n");
+#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
+ if (strncmp(v, "PS1=", 4)==0)
+ PS1 = getenv("PS1");
+#endif
+
+#ifdef CONFIG_LOCALE_SUPPORT
+ if(strncmp(v, "LC_ALL=", 7)==0)
+ setlocale(LC_ALL, getenv("LC_ALL"));
+ if(strncmp(v, "LC_CTYPE=", 9)==0)
+ setlocale(LC_CTYPE, getenv("LC_CTYPE"));
+#endif
+
return (res);
}
/* built-in 'read VAR' handler */
-static int builtin_read(struct job *cmd, struct jobSet *junk)
+static int builtin_read(struct child_prog *child)
{
int res = 0, len, newlen;
char *s;
char string[MAX_READ];
- if (cmd->progs[0].argv[1]) {
+ if (child->argv[1]) {
/* argument (VAR) given: put "VAR=" into buffer */
- strcpy(string, cmd->progs[0].argv[1]);
+ safe_strncpy(string, child->argv[1], MAX_READ-1);
len = strlen(string);
string[len++] = '=';
string[len] = '\0';
if((s = strdup(string)))
res = putenv(s);
if (res)
- fprintf(stdout, "read: %s\n", strerror(errno));
+ fprintf(stderr, "read: %m\n");
}
else
fgets(string, sizeof(string), stdin);
}
/* Built-in '.' handler (read-in and execute commands from file) */
-static int builtin_source(struct job *cmd, struct jobSet *junk)
+static int builtin_source(struct child_prog *child)
{
FILE *input;
int status;
+ int fd;
- if (!cmd->progs[0].argv[1] == 1)
- return FALSE;
+ if (child->argv[1] == NULL)
+ return EXIT_FAILURE;
- input = fopen(cmd->progs[0].argv[1], "r");
+ input = fopen(child->argv[1], "r");
if (!input) {
- fprintf(stdout, "Couldn't open file '%s'\n",
- cmd->progs[0].argv[1]);
- return FALSE;
+ printf( "Couldn't open file '%s'\n", child->argv[1]);
+ return EXIT_FAILURE;
}
+ fd=fileno(input);
+ mark_open(fd);
/* Now run the file */
status = busy_loop(input);
+ fclose(input);
+ mark_closed(fd);
return (status);
}
/* built-in 'unset VAR' handler */
-static int builtin_unset(struct job *cmd, struct jobSet *junk)
+static int builtin_unset(struct child_prog *child)
{
- if (!cmd->progs[0].argv[1] == 1) {
- fprintf(stdout, "unset: parameter required.\n");
- return FALSE;
+ if (child->argv[1] == NULL) {
+ printf( "unset: parameter required.\n");
+ return EXIT_FAILURE;
}
- unsetenv(cmd->progs[0].argv[1]);
- return TRUE;
+ unsetenv(child->argv[1]);
+ return EXIT_SUCCESS;
+}
+
+static void mark_open(int fd)
+{
+ struct close_me *new = xmalloc(sizeof(struct close_me));
+ new->fd = fd;
+ new->next = close_me_head;
+ close_me_head = new;
}
+static void mark_closed(int fd)
+{
+ struct close_me *tmp;
+ if (close_me_head == NULL || close_me_head->fd != fd)
+ bb_error_msg_and_die("corrupt close_me");
+ tmp = close_me_head;
+ close_me_head = close_me_head->next;
+ free(tmp);
+}
+
+static void close_all()
+{
+ struct close_me *c, *tmp;
+ for (c=close_me_head; c; c=tmp) {
+ close(c->fd);
+ tmp=c->next;
+ free(c);
+ }
+ close_me_head = NULL;
+}
+
+
+#ifdef CONFIG_LASH_JOB_CONTROL
/* free up all memory from a job */
-static void freeJob(struct job *cmd)
+static void free_job(struct job *cmd)
{
int i;
+ struct jobset *keep;
- for (i = 0; i < cmd->numProgs; i++) {
+ for (i = 0; i < cmd->num_progs; i++) {
free(cmd->progs[i].argv);
- if (cmd->progs[i].redirections)
- free(cmd->progs[i].redirections);
- if (cmd->progs[i].freeGlob)
- globfree(&cmd->progs[i].globResult);
+#ifdef CONFIG_LASH_PIPE_N_REDIRECTS
+ if (cmd->progs[i].redirects)
+ free(cmd->progs[i].redirects);
+#endif
}
free(cmd->progs);
- if (cmd->text)
- free(cmd->text);
- free(cmd->cmdBuf);
+ free(cmd->text);
+ free(cmd->cmdbuf);
+ keep = cmd->job_list;
memset(cmd, 0, sizeof(struct job));
+ cmd->job_list = keep;
}
-/* remove a job from the jobList */
-static void removeJob(struct jobSet *jobList, struct job *job)
+/* remove a job from a jobset */
+static void remove_job(struct jobset *j_list, struct job *job)
{
- struct job *prevJob;
+ struct job *prevjob;
- freeJob(job);
- if (job == jobList->head) {
- jobList->head = job->next;
+ free_job(job);
+ if (job == j_list->head) {
+ j_list->head = job->next;
} else {
- prevJob = jobList->head;
- while (prevJob->next != job)
- prevJob = prevJob->next;
- prevJob->next = job->next;
+ prevjob = j_list->head;
+ while (prevjob->next != job)
+ prevjob = prevjob->next;
+ prevjob->next = job->next;
}
+ if (j_list->head)
+ last_jobid = j_list->head->jobid;
+ else
+ last_jobid = 0;
+
free(job);
}
-/* Checks to see if any background processes have exited -- if they
+/* 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(struct jobSet *jobList)
+static void checkjobs(struct jobset *j_list)
{
struct job *job;
pid_t childpid;
int status;
- int progNum = 0;
+ int prognum = 0;
while ((childpid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) {
- for (job = jobList->head; job; job = job->next) {
- progNum = 0;
- while (progNum < job->numProgs &&
- job->progs[progNum].pid != childpid) progNum++;
- if (progNum < job->numProgs)
+ for (job = j_list->head; job; job = job->next) {
+ prognum = 0;
+ while (prognum < job->num_progs &&
+ job->progs[prognum].pid != childpid) prognum++;
+ if (prognum < job->num_progs)
break;
}
+ /* This happens on backticked commands */
+ if(job==NULL)
+ return;
+
if (WIFEXITED(status) || WIFSIGNALED(status)) {
/* child exited */
- job->runningProgs--;
- job->progs[progNum].pid = 0;
+ job->running_progs--;
+ job->progs[prognum].pid = 0;
- if (!job->runningProgs) {
- printf(JOB_STATUS_FORMAT, job->jobId, "Done", job->text);
- removeJob(jobList, job);
+ if (!job->running_progs) {
+ printf(JOB_STATUS_FORMAT, job->jobid, "Done", job->text);
+ last_jobid=0;
+ remove_job(j_list, job);
}
} else {
/* child stopped */
- job->stoppedProgs++;
- job->progs[progNum].isStopped = 1;
-
- if (job->stoppedProgs == job->numProgs) {
- printf(JOB_STATUS_FORMAT, job->jobId, "Stopped",
+ job->stopped_progs++;
+ job->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 (job->stopped_progs == job->num_progs) {
+ printf(JOB_STATUS_FORMAT, job->jobid, "Stopped",
job->text);
}
+#endif
}
}
if (childpid == -1 && errno != ECHILD)
- perror("waitpid");
+ bb_perror_msg("waitpid");
+}
+#else
+static void checkjobs(struct jobset *j_list)
+{
+}
+static void free_job(struct job *cmd)
+{
}
+static void remove_job(struct jobset *j_list, struct job *job)
+{
+}
+#endif
-static int getCommand(FILE * source, char *command)
+#ifdef CONFIG_LASH_PIPE_N_REDIRECTS
+/* squirrel != NULL means we squirrel away copies of stdin, stdout,
+ * and stderr if they are redirected. */
+static int setup_redirects(struct child_prog *prog, int squirrel[])
{
+ int i;
+ int openfd;
+ int mode = O_RDONLY;
+ struct redir_struct *redir = prog->redirects;
+
+ for (i = 0; i < prog->num_redirects; i++, redir++) {
+ switch (redir->type) {
+ case REDIRECT_INPUT:
+ mode = O_RDONLY;
+ break;
+ case REDIRECT_OVERWRITE:
+ mode = O_WRONLY | O_CREAT | O_TRUNC;
+ break;
+ case REDIRECT_APPEND:
+ mode = O_WRONLY | O_CREAT | O_APPEND;
+ break;
+ }
+
+ openfd = open(redir->filename, mode, 0666);
+ if (openfd < 0) {
+ /* this could get lost if stderr has been redirected, but
+ bash and ash both lose it as well (though zsh doesn't!) */
+ bb_perror_msg("error opening %s", redir->filename);
+ return 1;
+ }
+
+ if (openfd != redir->fd) {
+ if (squirrel && redir->fd < 3) {
+ squirrel[redir->fd] = dup(redir->fd);
+ }
+ dup2(openfd, redir->fd);
+ close(openfd);
+ }
+ }
+
+ return 0;
+}
+
+static void restore_redirects(int squirrel[])
+{
+ int i, fd;
+ for (i=0; i<3; i++) {
+ fd = squirrel[i];
+ if (fd != -1) {
+ /* No error checking. I sure wouldn't know what
+ * to do with an error if I found one! */
+ dup2(fd, i);
+ close(fd);
+ }
+ }
+}
+#else
+static inline int setup_redirects(struct child_prog *prog, int squirrel[])
+{
+ return 0;
+}
+static inline void restore_redirects(int squirrel[])
+{
+}
+#endif
+
+static inline void cmdedit_set_initial_prompt(void)
+{
+#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
+ PS1 = NULL;
+#else
+ PS1 = getenv("PS1");
+ if(PS1==0)
+ PS1 = "\\w \\$ ";
+#endif
+}
+
+static inline void setup_prompt_string(char **prompt_str)
+{
+#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
+ /* Set up the prompt */
+ if (shell_context == 0) {
+ free(PS1);
+ PS1=xmalloc(strlen(cwd)+4);
+ sprintf(PS1, "%s %s", cwd, ( geteuid() != 0 ) ? "$ ":"# ");
+ *prompt_str = PS1;
+ } else {
+ *prompt_str = PS2;
+ }
+#else
+ *prompt_str = (shell_context==0)? PS1 : PS2;
+#endif
+}
+
+static int get_command(FILE * source, char *command)
+{
+ char *prompt_str;
+
if (source == NULL) {
if (local_pending_command) {
/* a command specified (-c option): return it & mark it done */
}
if (source == stdin) {
-#ifdef BB_FEATURE_SH_COMMAND_EDITING
- int len;
- char *promptStr;
- len=fprintf(stdout, "%s %s", cwd, prompt);
- fflush(stdout);
- promptStr=(char*)xmalloc(sizeof(char)*(len+1));
- sprintf(promptStr, "%s %s", cwd, prompt);
- cmdedit_read_input(promptStr, command);
- free( promptStr);
+ setup_prompt_string(&prompt_str);
+
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
+ /*
+ ** enable command line editing only while a command line
+ ** is actually being read; otherwise, we'll end up bequeathing
+ ** atexit() handlers and other unwanted stuff to our
+ ** child processes (rob@sysgo.de)
+ */
+ cmdedit_read_input(prompt_str, command);
return 0;
#else
- fprintf(stdout, "%s %s", cwd, prompt);
- fflush(stdout);
+ fputs(prompt_str, stdout);
#endif
}
return 1;
}
- /* remove trailing newline */
- command[strlen(command) - 1] = '\0';
-
return 0;
}
-static void globLastArgument(struct childProgram *prog, int *argcPtr,
- int *argcAllocedPtr)
+static char* itoa(register int i)
{
- int argc = *argcPtr;
- int argcAlloced = *argcAllocedPtr;
- int rc;
- int flags;
- int i;
+ static char a[7]; /* Max 7 ints */
+ register char *b = a + sizeof(a) - 1;
+ int sign = (i < 0);
+
+ if (sign)
+ i = -i;
+ *b = 0;
+ do
+ {
+ *--b = '0' + (i % 10);
+ i /= 10;
+ }
+ while (i);
+ if (sign)
+ *--b = '-';
+ return b;
+}
+
+char * strsep_space( char *string, int * ix)
+{
+ char *token, *begin;
+
+ begin = string;
+
+ /* Short circuit the trivial case */
+ if ( !string || ! string[*ix])
+ return NULL;
+
+ /* Find the end of the token. */
+ while( string && string[*ix] && !isspace(string[*ix]) ) {
+ (*ix)++;
+ }
+
+ /* Find the end of any whitespace trailing behind
+ * the token and let that be part of the token */
+ while( string && string[*ix] && isspace(string[*ix]) ) {
+ (*ix)++;
+ }
+
+ if (! string && *ix==0) {
+ /* Nothing useful was found */
+ return NULL;
+ }
+
+ token = xmalloc(*ix+1);
+ token[*ix] = '\0';
+ strncpy(token, string, *ix);
+
+ return token;
+}
+
+static int expand_arguments(char *command)
+{
+ int total_length=0, length, i, retval, ix = 0;
+ expand_t expand_result;
+ char *tmpcmd, *cmd, *cmd_copy;
char *src, *dst, *var;
+ const char *out_of_space = "out of space during expansion";
+ int flags = GLOB_NOCHECK
+#ifdef GLOB_BRACE
+ | GLOB_BRACE
+#endif
+#ifdef GLOB_TILDE
+ | GLOB_TILDE
+#endif
+ ;
- if (argc > 1) { /* cmd->globResult is already initialized */
- flags = GLOB_APPEND;
- i = prog->globResult.gl_pathc;
- } else {
- prog->freeGlob = 1;
- flags = 0;
- i = 0;
+ /* get rid of the terminating \n */
+ chomp(command);
+
+ /* Fix up escape sequences to be the Real Thing(tm) */
+ while( command && command[ix]) {
+ if (command[ix] == '\\') {
+ const char *tmp = command+ix+1;
+ command[ix] = bb_process_escape_sequence( &tmp );
+ memmove(command+ix + 1, tmp, strlen(tmp)+1);
+ }
+ ix++;
}
- /* do shell variable substitution */
- if(*prog->argv[argc - 1] == '$' && (var = getenv(prog->argv[argc - 1] + 1)))
- prog->argv[argc - 1] = var;
-
- rc = glob(prog->argv[argc - 1], flags, NULL, &prog->globResult);
- if (rc == GLOB_NOSPACE) {
- errorMsg("out of space during glob operation\n");
- return;
- } else if (rc == GLOB_NOMATCH ||
- (!rc && (prog->globResult.gl_pathc - i) == 1 &&
- !strcmp(prog->argv[argc - 1],
- prog->globResult.gl_pathv[i]))) {
- /* we need to remove whatever \ quoting is still present */
- src = dst = prog->argv[argc - 1];
- while (*src) {
- if (*src != '\\')
- *dst++ = *src;
- src++;
+ /* Use glob and then fixup environment variables and such */
+
+ /* It turns out that glob is very stupid. We have to feed it one word at a
+ * time since it can't cope with a full string. Here we convert command
+ * (char*) into cmd (char**, one word per string) */
+
+ /* We need a clean copy, so strsep can mess up the copy while
+ * we write stuff into the original (in a minute) */
+ cmd = cmd_copy = bb_xstrdup(command);
+ *command = '\0';
+ for (ix = 0, tmpcmd = cmd;
+ (tmpcmd = strsep_space(cmd, &ix)) != NULL; cmd += ix, ix=0) {
+ if (*tmpcmd == '\0')
+ break;
+ /* we need to trim() the result for glob! */
+ trim(tmpcmd);
+ retval = glob(tmpcmd, flags, NULL, &expand_result);
+ free(tmpcmd); /* Free mem allocated by strsep_space */
+ if (retval == GLOB_NOSPACE) {
+ /* Mem may have been allocated... */
+ globfree (&expand_result);
+ bb_error_msg(out_of_space);
+ return FALSE;
+ } else if (retval != 0) {
+ /* Some other error. GLOB_NOMATCH shouldn't
+ * happen because of the GLOB_NOCHECK flag in
+ * the glob call. */
+ bb_error_msg("syntax error");
+ return FALSE;
+ } else {
+ /* Convert from char** (one word per string) to a simple char*,
+ * but don't overflow command which is BUFSIZ in length */
+ for (i=0; i < expand_result.gl_pathc; i++) {
+ length=strlen(expand_result.gl_pathv[i]);
+ if (total_length+length+1 >= BUFSIZ) {
+ bb_error_msg(out_of_space);
+ return FALSE;
+ }
+ strcat(command+total_length, " ");
+ total_length+=1;
+ strcat(command+total_length, expand_result.gl_pathv[i]);
+ total_length+=length;
+ }
+ globfree (&expand_result);
+ }
+ }
+ free(cmd_copy);
+ trim(command);
+
+ /* Now do the shell variable substitutions which
+ * wordexp can't do for us, namely $? and $! */
+ src = command;
+ while((dst = strchr(src,'$')) != NULL){
+ var = NULL;
+ switch(*(dst+1)) {
+ case '?':
+ var = itoa(last_return_code);
+ break;
+ case '!':
+ if (last_bg_pid==-1)
+ *(var)='\0';
+ else
+ var = itoa(last_bg_pid);
+ break;
+ /* Everything else like $$, $#, $[0-9], etc. should all be
+ * expanded by wordexp(), so we can in theory skip that stuff
+ * here, but just to be on the safe side (i.e., since uClibc
+ * wordexp doesn't do this stuff yet), lets leave it in for
+ * now. */
+ case '$':
+ var = itoa(getpid());
+ break;
+ case '#':
+ var = itoa(argc-1);
+ break;
+ case '0':case '1':case '2':case '3':case '4':
+ case '5':case '6':case '7':case '8':case '9':
+ {
+ int ixx=*(dst+1)-48+1;
+ if (ixx >= argc) {
+ var='\0';
+ } else {
+ var = argv[ixx];
+ }
+ }
+ break;
+
+ }
+ if (var) {
+ /* a single character construction was found, and
+ * already handled in the case statement */
+ src=dst+2;
+ } else {
+ /* Looks like an environment variable */
+ char delim_hold;
+ int num_skip_chars=0;
+ int dstlen = strlen(dst);
+ /* Is this a ${foo} type variable? */
+ if (dstlen >=2 && *(dst+1) == '{') {
+ src=strchr(dst+1, '}');
+ num_skip_chars=1;
+ } else {
+ src=dst+1;
+ while(isalnum(*src) || *src=='_') src++;
+ }
+ if (src == NULL) {
+ src = dst+dstlen;
+ }
+ delim_hold=*src;
+ *src='\0'; /* temporary */
+ var = getenv(dst + 1 + num_skip_chars);
+ *src=delim_hold;
+ src += num_skip_chars;
+ }
+ if (var == NULL) {
+ /* Seems we got an un-expandable variable. So delete it. */
+ var = "";
+ }
+ {
+ int subst_len = strlen(var);
+ int trail_len = strlen(src);
+ if (dst+subst_len+trail_len >= command+BUFSIZ) {
+ bb_error_msg(out_of_space);
+ return FALSE;
+ }
+ /* Move stuff to the end of the string to accommodate
+ * filling the created gap with the new stuff */
+ memmove(dst+subst_len, src, trail_len+1);
+ /* Now copy in the new stuff */
+ memcpy(dst, var, subst_len);
+ src = dst+subst_len;
}
- *dst = '\0';
- } else if (!rc) {
- argcAlloced += (prog->globResult.gl_pathc - i);
- prog->argv =
- realloc(prog->argv, argcAlloced * sizeof(*prog->argv));
- memcpy(prog->argv + (argc - 1), prog->globResult.gl_pathv + i,
- sizeof(*(prog->argv)) * (prog->globResult.gl_pathc - i));
- argc += (prog->globResult.gl_pathc - i - 1);
}
- *argcAllocedPtr = argcAlloced;
- *argcPtr = argc;
+ return TRUE;
}
-/* Return cmd->numProgs as 0 if no command is present (e.g. an empty
- line). If a valid command is found, commandPtr is set to point to
- the beginning of the next command (if the original command had more
- then one job associated with it) or NULL if no more commands are
+/* Return cmd->num_progs as 0 if no command is present (e.g. an empty
+ line). If a valid command is found, command_ptr is set to point to
+ the beginning of the next command (if the original command had more
+ then one job associated with it) or NULL if no more commands are
present. */
-static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobList, int *isBg)
+static int parse_command(char **command_ptr, struct job *job, int *inbg)
{
char *command;
- char *returnCommand = NULL;
- char *src, *buf, *chptr;
- int argc = 0;
+ char *return_command = NULL;
+ char *src, *buf;
+ int argc_l = 0;
int done = 0;
- int argvAlloced;
- int i;
+ int argv_alloced;
+ int saw_quote = 0;
char quote = '\0';
int count;
- struct childProgram *prog;
+ struct child_prog *prog;
+#ifdef CONFIG_LASH_PIPE_N_REDIRECTS
+ int i;
+ char *chptr;
+#endif
/* skip leading white space */
- while (**commandPtr && isspace(**commandPtr))
- (*commandPtr)++;
+ while (**command_ptr && isspace(**command_ptr))
+ (*command_ptr)++;
/* this handles empty lines or leading '#' characters */
- if (!**commandPtr || (**commandPtr == '#')) {
- job->numProgs=0;
+ if (!**command_ptr || (**command_ptr == '#')) {
+ job->num_progs=0;
return 0;
}
- *isBg = 0;
- job->numProgs = 1;
+ *inbg = 0;
+ job->num_progs = 1;
job->progs = xmalloc(sizeof(*job->progs));
- /* We set the argv elements to point inside of this string. The
- memory is freed by freeJob(). Allocate twice the original
+ /* We set the argv elements to point inside of this string. The
+ memory is freed by free_job(). Allocate twice the original
length in case we need to quote every single character.
- Getting clean memory relieves us of the task of NULL
- terminating things and makes the rest of this look a bit
+ Getting clean memory relieves us of the task of NULL
+ terminating things and makes the rest of this look a bit
cleaner (though it is, admittedly, a tad less efficient) */
- job->cmdBuf = command = calloc(1, 2*strlen(*commandPtr) + 1);
+ job->cmdbuf = command = xcalloc(2*strlen(*command_ptr) + 1, sizeof(char));
job->text = NULL;
prog = job->progs;
- prog->numRedirections = 0;
- prog->redirections = NULL;
- prog->freeGlob = 0;
- prog->isStopped = 0;
+ prog->num_redirects = 0;
+ prog->is_stopped = 0;
+ prog->family = job;
+#ifdef CONFIG_LASH_PIPE_N_REDIRECTS
+ prog->redirects = NULL;
+#endif
- argvAlloced = 5;
- prog->argv = xmalloc(sizeof(*prog->argv) * argvAlloced);
- prog->argv[0] = job->cmdBuf;
+ argv_alloced = 5;
+ prog->argv = xmalloc(sizeof(*prog->argv) * argv_alloced);
+ prog->argv[0] = job->cmdbuf;
buf = command;
- src = *commandPtr;
+ src = *command_ptr;
while (*src && !done) {
if (quote == *src) {
quote = '\0';
if (*src == '\\') {
src++;
if (!*src) {
- errorMsg("character expected after \\\n");
- freeJob(job);
+ bb_error_msg("character expected after \\");
+ free_job(job);
return 1;
}
/* in shell, "\'" should yield \' */
- if (*src != quote)
+ if (*src != quote) {
+ *buf++ = '\\';
*buf++ = '\\';
+ }
} else if (*src == '*' || *src == '?' || *src == '[' ||
*src == ']') *buf++ = '\\';
*buf++ = *src;
} else if (isspace(*src)) {
- if (*prog->argv[argc]) {
- buf++, argc++;
+ if (*prog->argv[argc_l] || saw_quote) {
+ buf++, argc_l++;
/* +1 here leaves room for the NULL which ends argv */
- if ((argc + 1) == argvAlloced) {
- argvAlloced += 5;
- prog->argv = realloc(prog->argv,
- sizeof(*prog->argv) *
- argvAlloced);
+ if ((argc_l + 1) == argv_alloced) {
+ argv_alloced += 5;
+ prog->argv = xrealloc(prog->argv,
+ sizeof(*prog->argv) *
+ argv_alloced);
}
- globLastArgument(prog, &argc, &argvAlloced);
- prog->argv[argc] = buf;
+ prog->argv[argc_l] = buf;
+ saw_quote = 0;
}
} else
switch (*src) {
case '"':
case '\'':
quote = *src;
+ saw_quote = 1;
break;
case '#': /* comment */
- done = 1;
+ if (*(src-1)== '$')
+ *buf++ = *src;
+ else
+ done = 1;
break;
- case '>': /* redirections */
+#ifdef CONFIG_LASH_PIPE_N_REDIRECTS
+ case '>': /* redirects */
case '<':
- i = prog->numRedirections++;
- prog->redirections = realloc(prog->redirections,
- sizeof(*prog->redirections) *
- (i + 1));
-
- prog->redirections[i].fd = -1;
- if (buf != prog->argv[argc]) {
- /* the stuff before this character may be the file number
+ i = prog->num_redirects++;
+ prog->redirects = xrealloc(prog->redirects,
+ sizeof(*prog->redirects) *
+ (i + 1));
+
+ prog->redirects[i].fd = -1;
+ if (buf != prog->argv[argc_l]) {
+ /* the stuff before this character may be the file number
being redirected */
- prog->redirections[i].fd =
- strtol(prog->argv[argc], &chptr, 10);
+ prog->redirects[i].fd =
+ strtol(prog->argv[argc_l], &chptr, 10);
- if (*chptr && *prog->argv[argc]) {
- buf++, argc++;
- globLastArgument(prog, &argc, &argvAlloced);
- prog->argv[argc] = buf;
+ if (*chptr && *prog->argv[argc_l]) {
+ buf++, argc_l++;
+ prog->argv[argc_l] = buf;
}
}
- if (prog->redirections[i].fd == -1) {
+ if (prog->redirects[i].fd == -1) {
if (*src == '>')
- prog->redirections[i].fd = 1;
+ prog->redirects[i].fd = 1;
else
- prog->redirections[i].fd = 0;
+ prog->redirects[i].fd = 0;
}
if (*src++ == '>') {
if (*src == '>')
- prog->redirections[i].type =
+ prog->redirects[i].type =
REDIRECT_APPEND, src++;
else
- prog->redirections[i].type = REDIRECT_OVERWRITE;
+ prog->redirects[i].type = REDIRECT_OVERWRITE;
} else {
- prog->redirections[i].type = REDIRECT_INPUT;
+ prog->redirects[i].type = REDIRECT_INPUT;
}
/* This isn't POSIX sh compliant. Oh well. */
chptr++;
if (!*chptr) {
- errorMsg("file name expected after %c\n", *src);
- freeJob(job);
- job->numProgs=0;
+ bb_error_msg("file name expected after %c", *(src-1));
+ free_job(job);
+ job->num_progs=0;
return 1;
}
- prog->redirections[i].filename = buf;
+ prog->redirects[i].filename = buf;
while (*chptr && !isspace(*chptr))
*buf++ = *chptr++;
src = chptr - 1; /* we src++ later */
- prog->argv[argc] = ++buf;
+ prog->argv[argc_l] = ++buf;
break;
case '|': /* pipe */
/* finish this command */
- if (*prog->argv[argc])
- argc++;
- if (!argc) {
- errorMsg("empty command in pipe1\n");
- freeJob(job);
- job->numProgs=0;
+ if (*prog->argv[argc_l] || saw_quote)
+ argc_l++;
+ if (!argc_l) {
+ bb_error_msg("empty command in pipe");
+ free_job(job);
+ job->num_progs=0;
return 1;
}
- prog->argv[argc] = NULL;
+ prog->argv[argc_l] = NULL;
/* and start the next */
- job->numProgs++;
- job->progs = realloc(job->progs,
- sizeof(*job->progs) * job->numProgs);
- prog = job->progs + (job->numProgs - 1);
- prog->numRedirections = 0;
- prog->redirections = NULL;
- prog->freeGlob = 0;
- argc = 0;
-
- argvAlloced = 5;
- prog->argv = xmalloc(sizeof(*prog->argv) * argvAlloced);
+ job->num_progs++;
+ job->progs = xrealloc(job->progs,
+ sizeof(*job->progs) * job->num_progs);
+ prog = job->progs + (job->num_progs - 1);
+ prog->num_redirects = 0;
+ prog->redirects = NULL;
+ prog->is_stopped = 0;
+ prog->family = job;
+ argc_l = 0;
+
+ argv_alloced = 5;
+ prog->argv = xmalloc(sizeof(*prog->argv) * argv_alloced);
prog->argv[0] = ++buf;
src++;
src++;
if (!*src) {
- errorMsg("empty command in pipe2\n");
- freeJob(job);
- job->numProgs=0;
+ bb_error_msg("empty command in pipe");
+ free_job(job);
+ job->num_progs=0;
return 1;
}
src--; /* we'll ++ it at the end of the loop */
break;
+#endif
+#ifdef CONFIG_LASH_JOB_CONTROL
case '&': /* background */
- *isBg = 1;
+ *inbg = 1;
+#endif
case ';': /* multiple commands */
done = 1;
- returnCommand = *commandPtr + (src - *commandPtr) + 1;
+ return_command = *command_ptr + (src - *command_ptr) + 1;
break;
case '\\':
src++;
if (!*src) {
- errorMsg("character expected after \\\n");
- freeJob(job);
+ bb_error_msg("character expected after \\");
+ free_job(job);
return 1;
}
if (*src == '*' || *src == '[' || *src == ']'
|| *src == '?') *buf++ = '\\';
/* fallthrough */
- case '`':
- /* Exec a backtick-ed command */
- {
- char* newcmd=NULL;
- char* ptr=NULL;
- struct job newJob;
-
- ptr=strchr(++src, '`');
- if (ptr==NULL) {
- fprintf(stderr, "Unmatched '`' in command\n");
- freeJob(job);
- return 1;
- }
-
- newcmd = xmalloc(1+ptr-src);
- snprintf(newcmd, 1+ptr-src, src);
-
- if (!parseCommand(&newcmd, &newJob, jobList, isBg) &&
- newJob.numProgs) {
- runCommand(&newJob, jobList, *isBg);
- }
-
- /* Clip out the the backticked command from the string */
- memmove(--src, ptr, strlen(ptr)+1);
- free(newcmd);
- }
- break;
default:
*buf++ = *src;
}
src++;
}
- if (*prog->argv[argc]) {
- argc++;
- globLastArgument(prog, &argc, &argvAlloced);
+ if (*prog->argv[argc_l] || saw_quote) {
+ argc_l++;
}
- if (!argc) {
- freeJob(job);
+ if (!argc_l) {
+ free_job(job);
return 0;
}
- prog->argv[argc] = NULL;
+ prog->argv[argc_l] = NULL;
- if (!returnCommand) {
- job->text = xmalloc(strlen(*commandPtr) + 1);
- strcpy(job->text, *commandPtr);
+ if (!return_command) {
+ job->text = xmalloc(strlen(*command_ptr) + 1);
+ strcpy(job->text, *command_ptr);
} else {
/* This leaves any trailing spaces, which is a bit sloppy */
- count = returnCommand - *commandPtr;
+ count = return_command - *command_ptr;
job->text = xmalloc(count + 1);
- strncpy(job->text, *commandPtr, count);
+ strncpy(job->text, *command_ptr, count);
job->text[count] = '\0';
}
- *commandPtr = returnCommand;
+ *command_ptr = return_command;
return 0;
}
+/* Run the child_prog, no matter what kind of command it uses.
+ */
+static int pseudo_exec(struct child_prog *child)
+{
+ struct built_in_command *x;
+#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
+ char *name;
+#endif
+
+ /* Check if the command matches any of the non-forking builtins.
+ * Depending on context, this might be redundant. But it's
+ * easier to waste a few CPU cycles than it is to figure out
+ * if this is one of those cases.
+ */
+ for (x = bltins; x->cmd; x++) {
+ if (strcmp(child->argv[0], x->cmd) == 0 ) {
+ _exit(x->function(child));
+ }
+ }
+
+ /* Check if the command matches any of the forking builtins. */
+ for (x = bltins_forking; x->cmd; x++) {
+ if (strcmp(child->argv[0], x->cmd) == 0) {
+ bb_applet_name=x->cmd;
+ _exit (x->function(child));
+ }
+ }
+#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
+ /* Check if the command matches any busybox internal
+ * commands ("applets") here. Following discussions from
+ * November 2000 on busybox@busybox.net, don't use
+ * bb_get_last_path_component(). This way explicit (with
+ * slashes) filenames will never be interpreted as an
+ * applet, just like with builtins. This way the user can
+ * override an applet with an explicit filename reference.
+ * The only downside to this change is that an explicit
+ * /bin/foo invocation will fork and exec /bin/foo, even if
+ * /bin/foo is a symlink to busybox.
+ */
+ name = child->argv[0];
+
+ {
+ char** argv_l=child->argv;
+ int argc_l;
+ for(argc_l=0;*argv_l!=NULL; argv_l++, argc_l++);
+ optind = 1;
+ run_applet_by_name(name, argc_l, child->argv);
+ }
+#endif
+
+ execvp(child->argv[0], child->argv);
-static int runCommand(struct job *newJob, struct jobSet *jobList, int inBg)
+ /* Do not use bb_perror_msg_and_die() here, since we must not
+ * call exit() but should call _exit() instead */
+ fprintf(stderr, "%s: %m\n", child->argv[0]);
+ _exit(EXIT_FAILURE);
+}
+
+static void insert_job(struct job *newjob, int inbg)
{
- struct job *job;
+ struct job *thejob;
+ struct jobset *j_list=newjob->job_list;
+
+ /* find the ID for thejob to use */
+ newjob->jobid = 1;
+ for (thejob = j_list->head; thejob; thejob = thejob->next)
+ if (thejob->jobid >= newjob->jobid)
+ newjob->jobid = thejob->jobid + 1;
+
+ /* add thejob to the list of running jobs */
+ if (!j_list->head) {
+ thejob = j_list->head = xmalloc(sizeof(*thejob));
+ } else {
+ for (thejob = j_list->head; thejob->next; thejob = thejob->next) /* nothing */;
+ thejob->next = xmalloc(sizeof(*thejob));
+ thejob = thejob->next;
+ }
+
+ *thejob = *newjob; /* physically copy the struct job */
+ thejob->next = NULL;
+ thejob->running_progs = thejob->num_progs;
+ thejob->stopped_progs = 0;
+
+#ifdef CONFIG_LASH_JOB_CONTROL
+ if (inbg) {
+ /* we don't wait for background thejobs to return -- append it
+ to the list of backgrounded thejobs and leave it alone */
+ printf("[%d] %d\n", thejob->jobid,
+ newjob->progs[newjob->num_progs - 1].pid);
+ last_jobid = newjob->jobid;
+ last_bg_pid=newjob->progs[newjob->num_progs - 1].pid;
+ } else {
+ newjob->job_list->fg = thejob;
+
+ /* move the new process group into the foreground */
+ /* suppress messages when run from /linuxrc mag@sysgo.de */
+ if (tcsetpgrp(shell_terminal, newjob->pgrp) && errno != ENOTTY)
+ bb_perror_msg("tcsetpgrp");
+ }
+#endif
+}
+
+static int run_command(struct job *newjob, int inbg, int outpipe[2])
+{
+ /* struct job *thejob; */
int i;
int nextin, nextout;
int pipefds[2]; /* pipefd[0] is for reading */
- struct builtInCommand *x;
-#ifdef BB_FEATURE_SH_STANDALONE_SHELL
- const struct BB_applet *a = applets;
-#endif
-
+ struct built_in_command *x;
+ struct child_prog *child;
nextin = 0, nextout = 1;
- for (i = 0; i < newJob->numProgs; i++) {
- if ((i + 1) < newJob->numProgs) {
- pipe(pipefds);
+ for (i = 0; i < newjob->num_progs; i++) {
+ child = & (newjob->progs[i]);
+
+ if ((i + 1) < newjob->num_progs) {
+ if (pipe(pipefds)<0) bb_perror_msg_and_die("pipe");
nextout = pipefds[1];
} else {
- nextout = 1;
+ if (outpipe[1]!=-1) {
+ nextout = outpipe[1];
+ } else {
+ nextout = 1;
+ }
}
- /* Check if the command matches any non-forking builtins */
- for (x = bltins; x->cmd; x++) {
- if (!strcmp(newJob->progs[i].argv[0], x->cmd)) {
- return (x->function(newJob, jobList));
+
+ /* Check if the command matches any non-forking builtins,
+ * but only if this is a simple command.
+ * Non-forking builtins within pipes have to fork anyway,
+ * and are handled in pseudo_exec. "echo foo | read bar"
+ * is doomed to failure, and doesn't work on bash, either.
+ */
+ if (newjob->num_progs == 1) {
+ for (x = bltins; x->cmd; x++) {
+ if (strcmp(child->argv[0], x->cmd) == 0 ) {
+ int rcode;
+ int squirrel[] = {-1, -1, -1};
+ setup_redirects(child, squirrel);
+ rcode = x->function(child);
+ restore_redirects(squirrel);
+ return rcode;
+ }
}
}
- if (!(newJob->progs[i].pid = fork())) {
+#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
+ if (!(child->pid = fork()))
+#else
+ if (!(child->pid = vfork()))
+#endif
+ {
+ /* Set the handling for job control signals back to the default. */
+ signal(SIGINT, SIG_DFL);
+ signal(SIGQUIT, SIG_DFL);
+ signal(SIGTSTP, SIG_DFL);
+ signal(SIGTTIN, SIG_DFL);
signal(SIGTTOU, SIG_DFL);
+ signal(SIGCHLD, SIG_DFL);
+
+ close_all();
+ if (outpipe[1]!=-1) {
+ close(outpipe[0]);
+ }
if (nextin != 0) {
dup2(nextin, 0);
close(nextin);
if (nextout != 1) {
dup2(nextout, 1);
+ dup2(nextout, 2); /* Really? */
close(nextout);
+ close(pipefds[0]);
}
- /* explicit redirections override pipes */
- setupRedirections(newJob->progs + i);
+ /* explicit redirects override pipes */
+ setup_redirects(child,NULL);
- /* Check if the command matches any of the other builtins */
- for (x = bltins_forking; x->cmd; x++) {
- if (!strcmp(newJob->progs[i].argv[0], x->cmd)) {
- exit (x->function(newJob, jobList));
- }
- }
-#ifdef BB_FEATURE_SH_STANDALONE_SHELL
- /* Check if the command matches any busybox internal commands here */
- /* TODO: Add matching when paths are appended (i.e. 'cat' currently
- * works, but '/bin/cat' doesn't ) */
- while (a->name != 0) {
- if (strcmp(newJob->progs[i].argv[0], a->name) == 0) {
- int argc;
- char** argv=newJob->progs[i].argv;
- for(argc=0;*argv!=NULL; argv++, argc++);
- exit((*(a->main)) (argc, newJob->progs[i].argv));
- }
- a++;
- }
-#endif
-
- execvp(newJob->progs[i].argv[0], newJob->progs[i].argv);
- fatalError("%s: %s\n", newJob->progs[i].argv[0],
- strerror(errno));
+ pseudo_exec(child);
+ }
+ if (outpipe[1]!=-1) {
+ close(outpipe[1]);
}
/* put our child in the process group whose leader is the
first process in this pipe */
- setpgid(newJob->progs[i].pid, newJob->progs[0].pid);
-
+ setpgid(child->pid, newjob->progs[0].pid);
if (nextin != 0)
close(nextin);
if (nextout != 1)
close(nextout);
- /* If there isn't another process, nextin is garbage
+ /* If there isn't another process, nextin is garbage
but it doesn't matter */
nextin = pipefds[0];
}
- newJob->pgrp = newJob->progs[0].pid;
+ newjob->pgrp = newjob->progs[0].pid;
- /* find the ID for the job to use */
- newJob->jobId = 1;
- for (job = jobList->head; job; job = job->next)
- if (job->jobId >= newJob->jobId)
- newJob->jobId = job->jobId + 1;
-
- /* add the job to the list of running jobs */
- if (!jobList->head) {
- job = jobList->head = xmalloc(sizeof(*job));
- } else {
- for (job = jobList->head; job->next; job = job->next);
- job->next = xmalloc(sizeof(*job));
- job = job->next;
- }
-
- *job = *newJob;
- job->next = NULL;
- job->runningProgs = job->numProgs;
- job->stoppedProgs = 0;
-
- if (inBg) {
- /* we don't wait for background jobs to return -- append it
- to the list of backgrounded jobs and leave it alone */
- printf("[%d] %d\n", job->jobId,
- newJob->progs[newJob->numProgs - 1].pid);
- } else {
- jobList->fg = job;
-
- /* move the new process group into the foreground */
- /* suppress messages when run from /linuxrc mag@sysgo.de */
- if (tcsetpgrp(0, newJob->pgrp) && errno != ENOTTY)
- perror("tcsetpgrp");
- }
+ insert_job(newjob, inbg);
return 0;
}
-static int setupRedirections(struct childProgram *prog)
-{
- int i;
- int openfd;
- int mode = O_RDONLY;
- struct redirectionSpecifier *redir = prog->redirections;
-
- for (i = 0; i < prog->numRedirections; i++, redir++) {
- switch (redir->type) {
- case REDIRECT_INPUT:
- mode = O_RDONLY;
- break;
- case REDIRECT_OVERWRITE:
- mode = O_RDWR | O_CREAT | O_TRUNC;
- break;
- case REDIRECT_APPEND:
- mode = O_RDWR | O_CREAT | O_APPEND;
- break;
- }
-
- openfd = open(redir->filename, mode, 0666);
- if (openfd < 0) {
- /* this could get lost if stderr has been redirected, but
- bash and ash both lose it as well (though zsh doesn't!) */
- errorMsg("error opening %s: %s\n", redir->filename,
- strerror(errno));
- return 1;
- }
-
- if (openfd != redir->fd) {
- dup2(openfd, redir->fd);
- close(openfd);
- }
- }
-
- return 0;
-}
-
-
static int busy_loop(FILE * input)
{
char *command;
- char *nextCommand = NULL;
- struct jobSet jobList = { NULL, NULL };
- struct job newJob;
- pid_t parent_pgrp;
+ char *next_command = NULL;
+ struct job newjob;
int i;
+ int inbg;
int status;
- int inBg;
-
+#ifdef CONFIG_LASH_JOB_CONTROL
+ pid_t parent_pgrp;
/* save current owner of TTY so we can restore it on exit */
- parent_pgrp = tcgetpgrp(0);
-
- command = (char *) calloc(BUFSIZ, sizeof(char));
+ parent_pgrp = tcgetpgrp(shell_terminal);
+#endif
+ newjob.job_list = &job_list;
+ newjob.job_context = DEFAULT_CONTEXT;
- /* don't pay any attention to this signal; it just confuses
- things and isn't really meant for shells anyway */
- signal(SIGTTOU, SIG_IGN);
+ command = (char *) xcalloc(BUFSIZ, sizeof(char));
while (1) {
- if (!jobList.fg) {
+ if (!job_list.fg) {
/* no job is in the foreground */
/* see if any background processes have exited */
- checkJobs(&jobList);
+ checkjobs(&job_list);
- if (!nextCommand) {
- if (getCommand(input, command))
+ if (!next_command) {
+ if (get_command(input, command))
break;
- nextCommand = command;
+ next_command = command;
}
- if (!parseCommand(&nextCommand, &newJob, &jobList, &inBg) &&
- newJob.numProgs) {
- runCommand(&newJob, &jobList, inBg);
- } else {
- nextCommand=NULL;
+ if (! expand_arguments(next_command)) {
+ free(command);
+ command = (char *) xcalloc(BUFSIZ, sizeof(char));
+ next_command = NULL;
+ continue;
+ }
+
+ if (!parse_command(&next_command, &newjob, &inbg) &&
+ newjob.num_progs) {
+ int pipefds[2] = {-1,-1};
+ debug_printf( "job=%p fed to run_command by busy_loop()'\n",
+ &newjob);
+ run_command(&newjob, inbg, pipefds);
+ }
+ else {
+ free(command);
+ command = (char *) xcalloc(BUFSIZ, sizeof(char));
+ next_command = NULL;
}
} else {
/* a job is running in the foreground; wait for it */
i = 0;
- while (!jobList.fg->progs[i].pid ||
- jobList.fg->progs[i].isStopped) i++;
+ while (!job_list.fg->progs[i].pid ||
+ job_list.fg->progs[i].is_stopped == 1) i++;
- waitpid(jobList.fg->progs[i].pid, &status, WUNTRACED);
+ if (waitpid(job_list.fg->progs[i].pid, &status, WUNTRACED)<0) {
+ if (errno != ECHILD) {
+ bb_perror_msg_and_die("waitpid(%d)",job_list.fg->progs[i].pid);
+ }
+ }
if (WIFEXITED(status) || WIFSIGNALED(status)) {
/* the child exited */
- jobList.fg->runningProgs--;
- jobList.fg->progs[i].pid = 0;
+ job_list.fg->running_progs--;
+ job_list.fg->progs[i].pid = 0;
- if (!jobList.fg->runningProgs) {
- /* child exited */
+ last_return_code=WEXITSTATUS(status);
- removeJob(&jobList, jobList.fg);
- jobList.fg = NULL;
+ if (!job_list.fg->running_progs) {
+ /* child exited */
+ remove_job(&job_list, job_list.fg);
+ job_list.fg = NULL;
}
- } else {
+ }
+#ifdef CONFIG_LASH_JOB_CONTROL
+ else {
/* the child was stopped */
- jobList.fg->stoppedProgs++;
- jobList.fg->progs[i].isStopped = 1;
+ job_list.fg->stopped_progs++;
+ job_list.fg->progs[i].is_stopped = 1;
- if (jobList.fg->stoppedProgs == jobList.fg->runningProgs) {
- printf("\n" JOB_STATUS_FORMAT, jobList.fg->jobId,
- "Stopped", jobList.fg->text);
- jobList.fg = NULL;
+ if (job_list.fg->stopped_progs == job_list.fg->running_progs) {
+ printf("\n" JOB_STATUS_FORMAT, job_list.fg->jobid,
+ "Stopped", job_list.fg->text);
+ job_list.fg = NULL;
}
}
- if (!jobList.fg) {
+ if (!job_list.fg) {
/* move the shell to the foreground */
/* suppress messages when run from /linuxrc mag@sysgo.de */
- if (tcsetpgrp(0, getpid()) && errno != ENOTTY)
- perror("tcsetpgrp");
+ if (tcsetpgrp(shell_terminal, getpgrp()) && errno != ENOTTY)
+ bb_perror_msg("tcsetpgrp");
}
+#endif
}
}
free(command);
+#ifdef CONFIG_LASH_JOB_CONTROL
/* return controlling TTY back to parent process group before exiting */
- if (tcsetpgrp(0, parent_pgrp))
- perror("tcsetpgrp");
+ if (tcsetpgrp(shell_terminal, parent_pgrp) && errno != ENOTTY)
+ bb_perror_msg("tcsetpgrp");
+#endif
/* return exit status if called with "-c" */
if (input == NULL && WIFEXITED(status))
return WEXITSTATUS(status);
-
+
return 0;
}
-
-int shell_main(int argc, char **argv)
+#ifdef CONFIG_FEATURE_CLEAN_UP
+void free_memory(void)
{
- FILE *input = stdin;
-
- /* initialize the cwd */
- cwd = (char *) calloc(BUFSIZ, sizeof(char));
- if (cwd == 0) {
- fatalError("out of memory\n");
+ if (cwd && cwd!=bb_msg_unknown) {
+ free((char*)cwd);
}
- getcwd(cwd, sizeof(char)*BUFSIZ);
+ if (local_pending_command)
+ free(local_pending_command);
-#ifdef BB_FEATURE_SH_COMMAND_EDITING
- cmdedit_init();
- signal(SIGWINCH, win_changed);
- win_changed(0);
+ if (job_list.fg && !job_list.fg->running_progs) {
+ remove_job(&job_list, job_list.fg);
+ }
+}
#endif
- //if (argv[0] && argv[0][0] == '-') {
- // builtin_source("/etc/profile");
- //}
+#ifdef CONFIG_LASH_JOB_CONTROL
+/* 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(void)
+{
+ int status;
+ pid_t shell_pgrp;
- if (argc < 2) {
- fprintf(stdout, "\n\nBusyBox v%s (%s) Built-in shell\n", BB_VER, BB_BT);
- fprintf(stdout, "Enter 'help' for a list of built-in commands.\n\n");
- } else {
- if (argv[1][0]=='-' && argv[1][1]=='c') {
- int i;
- local_pending_command = (char *) calloc(BUFSIZ, sizeof(char));
- if (local_pending_command == 0) {
- fatalError("out of memory\n");
- }
- for(i=2; i<argc; i++)
- {
- if (strlen(local_pending_command) + strlen(argv[i]) >= BUFSIZ) {
- local_pending_command = realloc(local_pending_command,
- strlen(local_pending_command) + strlen(argv[i]));
- if (local_pending_command==NULL)
- fatalError("commands for -c option too long\n");
- }
- strcat(local_pending_command, argv[i]);
- if ( (i + 1) < argc)
- strcat(local_pending_command, " ");
- }
- input = NULL;
-
+ /* Loop until we are in the foreground. */
+ while ((status = tcgetpgrp (shell_terminal)) >= 0) {
+ if (status == (shell_pgrp = getpgrp ())) {
+ break;
}
- else if (argv[1][0]=='-') {
- usage(shell_usage);
+ kill (- shell_pgrp, SIGTTIN);
+ }
+
+ /* Ignore interactive and job-control signals. */
+ signal(SIGINT, SIG_IGN);
+ signal(SIGQUIT, 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);
+}
+#else
+static inline void setup_job_control(void)
+{
+}
+#endif
+
+int lash_main(int argc_l, char **argv_l)
+{
+ int opt, interactive=FALSE;
+ FILE *input = stdin;
+ argc = argc_l;
+ argv = argv_l;
+
+ /* These variables need re-initializing when recursing */
+ last_jobid = 0;
+ local_pending_command = NULL;
+ close_me_head = NULL;
+ job_list.head = NULL;
+ job_list.fg = NULL;
+ last_return_code=1;
+
+ if (argv[0] && argv[0][0] == '-') {
+ FILE *prof_input;
+ prof_input = fopen("/etc/profile", "r");
+ if (prof_input) {
+ int tmp_fd = fileno(prof_input);
+ mark_open(tmp_fd);
+ /* Now run the file */
+ busy_loop(prof_input);
+ fclose(prof_input);
+ mark_closed(tmp_fd);
}
- else {
- input = fopen(argv[1], "r");
- if (!input) {
- fatalError("Couldn't open file '%s': %s\n", argv[1],
- strerror(errno));
- }
+ }
+
+ while ((opt = getopt(argc_l, argv_l, "cxi")) > 0) {
+ switch (opt) {
+ case 'c':
+ input = NULL;
+ if (local_pending_command != 0)
+ bb_error_msg_and_die("multiple -c arguments");
+ local_pending_command = bb_xstrdup(argv[optind]);
+ optind++;
+ argv = argv+optind;
+ break;
+ case 'i':
+ interactive = TRUE;
+ break;
+ default:
+ bb_show_usage();
}
}
+ /* A shell is interactive if the `-i' flag was given, or if all of
+ * the following conditions are met:
+ * no -c command
+ * no arguments remaining or the -s flag given
+ * standard input is a terminal
+ * standard output is a terminal
+ * Refer to Posix.2, the description of the `sh' utility. */
+ if (argv[optind]==NULL && input==stdin &&
+ isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) {
+ interactive=TRUE;
+ }
+ setup_job_control();
+ if (interactive==TRUE) {
+ //printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]);
+ /* Looks like they want an interactive shell */
+#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET
+ printf( "\n\n" BB_BANNER " Built-in shell (lash)\n");
+ printf( "Enter 'help' for a list of built-in commands.\n\n");
+#endif
+ } else if (local_pending_command==NULL) {
+ //printf( "optind=%d argv[optind]='%s'\n", optind, argv[optind]);
+ input = bb_xfopen(argv[optind], "r");
+ mark_open(fileno(input)); /* be lazy, never mark this closed */
+ }
+
+ /* initialize the cwd -- this is never freed...*/
+ cwd = xgetcwd(0);
+ if (!cwd)
+ cwd = bb_msg_unknown;
+
+#ifdef CONFIG_FEATURE_CLEAN_UP
+ atexit(free_memory);
+#endif
+
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
+ cmdedit_set_initial_prompt();
+#else
+ PS1 = NULL;
+#endif
return (busy_loop(input));
}
projects / oweals / busybox.git / blobdiff