/*
* lash -- the BusyBox Lame-Ass SHell
*
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
+ * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.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
*
*/
-/* The parsing engine of this program is officially at a dead-end.
- * Future work in that direction should move to the work posted
- * at http://doolittle.faludi.com/~larry/parser.html .
- * A start on the integration of that work with the rest of sh.c
- * is at http://codepoet.org/sh.c .
+/* 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...
*/
-//
-//This works pretty well now, and is now on by default.
-#define BB_FEATURE_SH_ENVIRONMENT
-//
-//Backtick support has some problems, use at your own risk!
-//#define BB_FEATURE_SH_BACKTICKS
-//
-//If, then, else, etc. support.. This should now behave basically
-//like any other Bourne shell...
-#define BB_FEATURE_SH_IF_EXPRESSIONS
-//
-/* This is currently a little broken... */
-//#define HANDLE_CONTINUATION_CHARS
-//
+
//For debugging/development on the shell only...
//#define DEBUG_SHELL
#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>
#include <getopt.h>
+#include <termios.h>
#include "busybox.h"
#include "cmdedit.h"
-static const int MAX_LINE = 256; /* size of input buffer for cwd data */
+#ifdef CONFIG_LOCALE_SUPPORT
+#include <locale.h>
+#endif
+
+#include <glob.h>
+#define expand_t glob_t
+
+
static const int MAX_READ = 128; /* size of input buffer for `read' builtin */
#define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n"
char **argv; /* program name and arguments */
int num_redirects; /* elements in redirection array */
struct redir_struct *redirects; /* I/O redirects */
- glob_t glob_result; /* result of parameter globbing */
- int free_glob; /* should we globfree(&glob_result)? */
int is_stopped; /* is the program currently running? */
struct job *family; /* pointer back to the child's parent job */
};
/* function prototypes for builtins */
static int builtin_cd(struct child_prog *cmd);
-static int builtin_env(struct child_prog *dummy);
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_source(struct child_prog *cmd);
static int builtin_unset(struct child_prog *cmd);
static int builtin_read(struct child_prog *cmd);
-#ifdef BB_FEATURE_SH_IF_EXPRESSIONS
-static int builtin_if(struct child_prog *cmd);
-static int builtin_then(struct child_prog *cmd);
-static int builtin_else(struct child_prog *cmd);
-static int builtin_fi(struct child_prog *cmd);
-/* function prototypes for shell stuff */
-static int run_command_predicate(char *cmd);
-#endif
/* function prototypes for shell stuff */
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]);
{"read", "Input environment variable", builtin_read},
{".", "Source-in and run commands in a file", builtin_source},
/* to do: add ulimit */
-#ifdef BB_FEATURE_SH_IF_EXPRESSIONS
- {"if", NULL, builtin_if},
- {"then", NULL, builtin_then},
- {"else", NULL, builtin_else},
- {"fi", NULL, builtin_fi},
-#endif
{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 built_in_command bltins_forking[] = {
- {"env", "Print all environment variables", builtin_env},
{"pwd", "Print current directory", builtin_pwd},
{"help", "List shell built-in commands", builtin_help},
{NULL, NULL, NULL}
};
-/* Variables we export */
-unsigned int shell_context; /* Used in cmdedit.c to reset the
- context when someone hits ^C */
+static int shell_context; /* Type prompt trigger (PS1 or PS2) */
/* Globals that are static to this file */
-static char *cwd;
+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 = NULL;
-#ifdef BB_FEATURE_SH_ENVIRONMENT
-static int last_bg_pid=-1;
-static int last_return_code=-1;
-static int show_x_trace=FALSE;
-#endif
-#ifdef BB_FEATURE_SH_IF_EXPRESSIONS
-static char syntax_err[]="syntax error near unexpected token";
-#endif
+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 pid_t shell_pgrp;
+static char *PS1;
+static char *PS2 = "> ";
+
#ifdef DEBUG_SHELL
static inline void debug_printf(const char *format, ...)
builtin previous use notes
------ ----------------- ---------
cd cmd->progs[0]
-env 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] passes cmd, job_list to builtin_env(), which ignores them
+export cmd->progs[0]
source cmd->progs[0]
unset cmd->progs[0]
read cmd->progs[0]
-if cmd->job_context, cmd->text
-then cmd->job_context, cmd->text
-else cmd->job_context, cmd->text
-fi cmd->job_context
-
-The use of cmd->text by if/then/else/fi is hopelessly hacky.
-Would it work to increment cmd->progs[0]->argv and recurse,
-somewhat like builtin_exec does?
I added "struct job *family;" to struct child_prog,
and switched API to builtin_foo(struct child_prog *child);
else
newdir = child->argv[1];
if (chdir(newdir)) {
- printf("cd: %s: %s\n", newdir, strerror(errno));
+ printf("cd: %s: %m\n", newdir);
return EXIT_FAILURE;
}
- getcwd(cwd, sizeof(char)*MAX_LINE);
-
+ cwd = xgetcwd((char *)cwd);
+ if (!cwd)
+ cwd = unknown;
return EXIT_SUCCESS;
}
-/* built-in 'env' handler */
-static int builtin_env(struct child_prog *dummy)
-{
- char **e;
-
- for (e = environ; *e; e++) {
- printf( "%s\n", *e);
- }
- return (0);
-}
-
/* built-in 'exec' handler */
static int builtin_exec(struct child_prog *child)
{
/* built-in 'fg' and 'bg' handler */
static int builtin_fg_bg(struct child_prog *child)
{
- int i, jobNum;
+ int i, jobnum;
struct job *job=NULL;
-
- if (!child->argv[1] || child->argv[2]) {
- error_msg("%s: exactly one argument is expected",
- child->argv[0]);
- return EXIT_FAILURE;
- }
-
- if (sscanf(child->argv[1], "%%%d", &jobNum) != 1) {
- 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 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) {
+ error_msg("%s: no current job", child->argv[0]);
+ return EXIT_FAILURE;
+ }
+ } else {
+ if (sscanf(child->argv[1], "%%%d", &jobnum) != 1) {
+ 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) {
+ error_msg("%s: %d: no such job", child->argv[0], jobnum);
+ return EXIT_FAILURE;
}
- }
-
- if (!job) {
- error_msg("%s: unknown job %d",
- child->argv[0], jobNum);
- return EXIT_FAILURE;
}
if (*child->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_msg("tcsetpgrp");
+ /* Put the job into the foreground. */
+ tcsetpgrp(shell_terminal, job->pgrp);
+
child->family->job_list->fg = job;
}
for (i = 0; i < job->num_progs; i++)
job->progs[i].is_stopped = 0;
- kill(-job->pgrp, SIGCONT);
-
job->stopped_progs = 0;
+ if ( (i=kill(- job->pgrp, SIGCONT)) < 0) {
+ if (i == ESRCH) {
+ remove_job(&job_list, job);
+ } else {
+ perror_msg("kill (SIGCONT)");
+ }
+ }
+
return EXIT_SUCCESS;
}
/* built-in 'pwd' handler */
static int builtin_pwd(struct child_prog *dummy)
{
- getcwd(cwd, MAX_LINE);
- printf( "%s\n", cwd);
+ cwd = xgetcwd((char *)cwd);
+ if (!cwd)
+ cwd = unknown;
+ puts(cwd);
return EXIT_SUCCESS;
}
static int builtin_export(struct child_prog *child)
{
int res;
+ char *v = child->argv[1];
- if (child->argv[1] == NULL) {
- return (builtin_env(child));
+ if (v == NULL) {
+ char **e;
+ for (e = environ; *e; e++) {
+ puts(*e);
+ }
+ return 0;
}
- res = putenv(child->argv[1]);
+ res = putenv(v);
if (res)
- fprintf(stderr, "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);
}
if((s = strdup(string)))
res = putenv(s);
if (res)
- fprintf(stderr, "read: %s\n", strerror(errno));
+ fprintf(stderr, "read: %m\n");
}
else
fgets(string, sizeof(string), stdin);
return (res);
}
-#ifdef BB_FEATURE_SH_IF_EXPRESSIONS
-/* Built-in handler for 'if' commands */
-static int builtin_if(struct child_prog *child)
-{
- struct job *cmd = child->family;
- int status;
- char* charptr1=cmd->text+3; /* skip over the leading 'if ' */
-
- /* Now run the 'if' command */
- debug_printf( "job=%p entering builtin_if ('%s')-- context=%d\n", cmd, charptr1, cmd->job_context);
- status = run_command_predicate(charptr1);
- debug_printf( "if test returned ");
- if (status == 0) {
- debug_printf( "TRUE\n");
- cmd->job_context |= IF_TRUE_CONTEXT;
- } else {
- debug_printf( "FALSE\n");
- cmd->job_context |= IF_FALSE_CONTEXT;
- }
- debug_printf("job=%p builtin_if set job context to %x\n", cmd, cmd->job_context);
- shell_context++;
-
- return status;
-}
-
-/* Built-in handler for 'then' (part of the 'if' command) */
-static int builtin_then(struct child_prog *child)
-{
- struct job *cmd = child->family;
- char* charptr1=cmd->text+5; /* skip over the leading 'then ' */
-
- debug_printf( "job=%p entering builtin_then ('%s')-- context=%d\n", cmd, charptr1, cmd->job_context);
- if (! (cmd->job_context & (IF_TRUE_CONTEXT|IF_FALSE_CONTEXT))) {
- shell_context = 0; /* Reset the shell's context on an error */
- error_msg("%s `then'", syntax_err);
- return EXIT_FAILURE;
- }
-
- cmd->job_context |= THEN_EXP_CONTEXT;
- debug_printf("job=%p builtin_then set job context to %x\n", cmd, cmd->job_context);
-
- /* If the if result was FALSE, skip the 'then' stuff */
- if (cmd->job_context & IF_FALSE_CONTEXT) {
- return EXIT_SUCCESS;
- }
-
- /* Seems the if result was TRUE, so run the 'then' command */
- debug_printf( "'then' now running '%s'\n", charptr1);
-
- return(run_command_predicate(charptr1));
-}
-
-/* Built-in handler for 'else' (part of the 'if' command) */
-static int builtin_else(struct child_prog *child)
-{
- struct job *cmd = child->family;
- char* charptr1=cmd->text+5; /* skip over the leading 'else ' */
-
- debug_printf( "job=%p entering builtin_else ('%s')-- context=%d\n", cmd, charptr1, cmd->job_context);
-
- if (! (cmd->job_context & THEN_EXP_CONTEXT)) {
- shell_context = 0; /* Reset the shell's context on an error */
- error_msg("%s `else'", syntax_err);
- return EXIT_FAILURE;
- }
- /* If the if result was TRUE, skip the 'else' stuff */
- if (cmd->job_context & IF_TRUE_CONTEXT) {
- return EXIT_SUCCESS;
- }
-
- cmd->job_context |= ELSE_EXP_CONTEXT;
- debug_printf("job=%p builtin_else set job context to %x\n", cmd, cmd->job_context);
-
- /* Now run the 'else' command */
- debug_printf( "'else' now running '%s'\n", charptr1);
- return(run_command_predicate(charptr1));
-}
-
-/* Built-in handler for 'fi' (part of the 'if' command) */
-static int builtin_fi(struct child_prog *child)
-{
- struct job *cmd = child->family;
- debug_printf( "job=%p entering builtin_fi ('%s')-- context=%d\n", cmd, "", cmd->job_context);
- if (! (cmd->job_context & (IF_TRUE_CONTEXT|IF_FALSE_CONTEXT))) {
- shell_context = 0; /* Reset the shell's context on an error */
- error_msg("%s `fi'", syntax_err);
- return EXIT_FAILURE;
- }
- /* Clear out the if and then context bits */
- cmd->job_context &= ~(IF_TRUE_CONTEXT|IF_FALSE_CONTEXT|THEN_EXP_CONTEXT|ELSE_EXP_CONTEXT);
- debug_printf("job=%p builtin_fi set job context to %x\n", cmd, cmd->job_context);
- shell_context--;
- return EXIT_SUCCESS;
-}
-#endif
-
/* Built-in '.' handler (read-in and execute commands from file) */
static int builtin_source(struct child_prog *child)
{
return EXIT_SUCCESS;
}
-#ifdef BB_FEATURE_SH_IF_EXPRESSIONS
-/* currently used by if/then/else.
- *
- * Reparsing the command line for this purpose is gross,
- * incorrect, and fundamentally unfixable; in particular,
- * think about what happens with command substitution.
- * We really need to pull out the run, wait, return status
- * functionality out of busy_loop so we can child->argv++
- * and use that, without going back through parse_command.
- */
-static int run_command_predicate(char *cmd)
-{
- int n=strlen(cmd);
- local_pending_command = xmalloc(n+1);
- strncpy(local_pending_command, cmd, n);
- local_pending_command[n]='\0';
- return( busy_loop(NULL));
-}
-#endif
-
static void mark_open(int fd)
{
struct close_me *new = xmalloc(sizeof(struct close_me));
static void close_all()
{
- struct close_me *c;
- for (c=close_me_head; c; c=c->next) {
+ 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;
}
static void free_job(struct job *cmd)
{
int i;
+ struct jobset *keep;
for (i = 0; i < cmd->num_progs; i++) {
free(cmd->progs[i].argv);
if (cmd->progs[i].redirects)
free(cmd->progs[i].redirects);
- if (cmd->progs[i].free_glob)
- globfree(&cmd->progs[i].glob_result);
}
- free(cmd->progs);
+ if (cmd->progs)
+ free(cmd->progs);
if (cmd->text)
free(cmd->text);
- free(cmd->cmdbuf);
+ if (cmd->cmdbuf)
+ free(cmd->cmdbuf);
+ keep = cmd->job_list;
memset(cmd, 0, sizeof(struct job));
+ cmd->job_list = keep;
}
-/* remove a job from the job_list */
-static void remove_job(struct jobset *job_list, struct job *job)
+/* remove a job from a jobset */
+static void remove_job(struct jobset *j_list, struct job *job)
{
struct job *prevjob;
free_job(job);
- if (job == job_list->head) {
- job_list->head = job->next;
+ if (job == j_list->head) {
+ j_list->head = job->next;
} else {
- prevjob = job_list->head;
+ 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
have, figure out why and see if a job has completed */
-static void checkjobs(struct jobset *job_list)
+static void checkjobs(struct jobset *j_list)
{
struct job *job;
pid_t childpid;
int prognum = 0;
while ((childpid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) {
- for (job = job_list->head; job; job = job->next) {
+ for (job = j_list->head; job; job = job->next) {
prognum = 0;
while (prognum < job->num_progs &&
job->progs[prognum].pid != childpid) prognum++;
if (!job->running_progs) {
printf(JOB_STATUS_FORMAT, job->jobid, "Done", job->text);
- remove_job(job_list, job);
+ last_jobid=0;
+ remove_job(j_list, job);
}
} else {
/* child 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 (openfd < 0) {
/* this could get lost if stderr has been redirected, but
bash and ash both lose it as well (though zsh doesn't!) */
- error_msg("error opening %s: %s", redir->filename,
- strerror(errno));
+ perror_msg("error opening %s", redir->filename);
return 1;
}
}
}
-#if defined(BB_FEATURE_SH_SIMPLE_PROMPT)
-static char* setup_prompt_string(int state)
+static inline void cmdedit_set_initial_prompt(void)
{
- char prompt_str[BUFSIZ];
-
- /* Set up the prompt */
- if (state == 0) {
- /* simple prompt */
- sprintf(prompt_str, "%s %s", cwd, ( geteuid() != 0 ) ? "$ ":"# ");
- } else {
- strcpy(prompt_str,"> ");
- }
-
- return(strdup(prompt_str)); /* Must free this memory */
-}
-
+#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
+ PS1 = NULL;
#else
+ PS1 = getenv("PS1");
+ if(PS1==0)
+ PS1 = "\\w \\$ ";
+#endif
+}
-static char* setup_prompt_string(int state)
+static inline void setup_prompt_string(char **prompt_str)
{
- char user[9],buf[255],*s;
- char prompt[3];
- char prompt_str[BUFSIZ];
-
+#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
/* Set up the prompt */
- if (state == 0) {
- /* get User Name and setup prompt */
- strcpy(prompt,( geteuid() != 0 ) ? "$ ":"# ");
- my_getpwuid(user, geteuid());
-
- /* get HostName */
- gethostname(buf, 255);
- s = strchr(buf, '.');
- if (s) {
- *s = 0;
- }
- } else {
- strcpy(prompt,"> ");
- }
-
- if (state == 0) {
- snprintf(prompt_str, BUFSIZ-1, "[%s@%s %s]%s", user, buf,
- get_last_path_component(cwd), prompt);
+ if (shell_context == 0) {
+ if (PS1)
+ free(PS1);
+ PS1=xmalloc(strlen(cwd)+4);
+ sprintf(PS1, "%s %s", cwd, ( geteuid() != 0 ) ? "$ ":"# ");
+ *prompt_str = PS1;
} else {
- sprintf(prompt_str, "%s", prompt);
+ *prompt_str = PS2;
}
- return(strdup(prompt_str)); /* Must free this memory */
+#else
+ *prompt_str = (shell_context==0)? PS1 : PS2;
+#endif
}
-#endif
-
static int get_command(FILE * source, char *command)
{
char *prompt_str;
}
if (source == stdin) {
- prompt_str = setup_prompt_string(shell_context);
+ setup_prompt_string(&prompt_str);
-#ifdef BB_FEATURE_SH_COMMAND_EDITING
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
/*
** enable command line editing only while a command line
** is actually being read; otherwise, we'll end up bequeathing
** child processes (rob@sysgo.de)
*/
cmdedit_read_input(prompt_str, command);
- cmdedit_terminate();
- free(prompt_str);
return 0;
#else
fputs(prompt_str, stdout);
- free(prompt_str);
#endif
}
return 1;
}
- /* remove trailing newline */
- command[strlen(command) - 1] = '\0';
-
return 0;
}
-#ifdef BB_FEATURE_SH_ENVIRONMENT
static char* itoa(register int i)
{
static char a[7]; /* Max 7 ints */
*--b = '-';
return b;
}
-#endif
-static void expand_argument(struct child_prog *prog, int *argcPtr,
- int *argv_alloced_ptr)
+char * strsep_space( char *string, int * ix)
{
- int argc_l = *argcPtr;
- int argv_alloced = *argv_alloced_ptr;
- int rc;
- int flags;
- int i;
- char *src, *dst, *var;
+ char *token, *begin;
- if (argc_l > 1) { /* cmd->glob_result is already initialized */
- flags = GLOB_APPEND;
- i = prog->glob_result.gl_pathc;
- } else {
- prog->free_glob = 1;
- flags = 0;
- i = 0;
+ 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)++;
}
-#ifdef BB_FEATURE_SH_ENVIRONMENT
- /* do shell variable substitution */
- src = prog->argv[argc_l - 1];
- while((dst = strchr(src,'$')) != NULL){
- if (!(var = getenv(dst + 1))) {
- switch(*(dst+1)) {
- case '?':
- var = itoa(last_return_code);
- break;
- case '$':
- var = itoa(getpid());
- break;
- case '#':
- var = itoa(argc-1);
- break;
- case '!':
- if (last_bg_pid==-1)
- *(var)='\0';
- else
- var = itoa(last_bg_pid);
- break;
- case '0':case '1':case '2':case '3':case '4':
- case '5':case '6':case '7':case '8':case '9':
- {
- int index=*(dst + 1)-48;
- if (index >= argc) {
- var='\0';
- } else {
- var = argv[index];
- }
- }
- break;
- }
+
+ /* 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
+ ;
+
+ /* 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] = process_escape_sequence( &tmp );
+ memmove(command+ix + 1, tmp, strlen(tmp)+1);
}
- if (var) {
- int offset = dst-src;
-#warning I have a memory leak which needs to be plugged somehow
- src = (char*)xmalloc(strlen(src)-strlen(dst)+strlen(var)+1);
- strncpy(src, prog->argv[argc_l -1], offset);
- safe_strncpy(src+offset, var, strlen(var)+1);
- /* If there are any remaining $ variables in the src string, put them back */
- if ((dst = strchr(prog->argv[argc_l -1]+offset+1,'$')) != NULL) {
- offset=strlen(src);
- safe_strncpy(src+strlen(src), dst, strlen(dst)+1);
- }
- prog->argv[argc_l -1] = src;
+ ix++;
+ }
+ /* 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 = strdup(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);
+ 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. */
+ error_msg("syntax error");
+ return FALSE;
} else {
- memset(dst, 0, strlen(src)-strlen(dst));
+ /* 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) {
+ 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);
}
}
-#endif
+ free(cmd_copy);
+ trim(command);
- if (strpbrk(prog->argv[argc_l - 1],"*[]?")!= NULL){
- rc = glob(prog->argv[argc_l - 1], flags, NULL, &prog->glob_result);
- if (rc == GLOB_NOSPACE) {
- error_msg("out of space during glob operation");
- return;
- } else if (rc == GLOB_NOMATCH ||
- (!rc && (prog->glob_result.gl_pathc - i) == 1 &&
- strcmp(prog->argv[argc_l - 1],
- prog->glob_result.gl_pathv[i]) == 0)) {
- /* we need to remove whatever \ quoting is still present */
- src = dst = prog->argv[argc_l - 1];
- while (*src) {
- if (*src == '\\') {
- src++;
- *dst++ = process_escape_sequence(&src);
- } else {
- *dst++ = *src;
- src++;
+ /* 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;
+ 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++;
}
- *dst = '\0';
- } else if (!rc) {
- argv_alloced += (prog->glob_result.gl_pathc - i);
- prog->argv = xrealloc(prog->argv, argv_alloced * sizeof(*prog->argv));
- memcpy(prog->argv + (argc_l - 1), prog->glob_result.gl_pathv + i,
- sizeof(*(prog->argv)) * (prog->glob_result.gl_pathc - i));
- argc_l += (prog->glob_result.gl_pathc - i - 1);
+ 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;
}
- }else{
- src = dst = prog->argv[argc_l - 1];
- while (*src) {
- if (*src == '\\') {
- src++;
- *dst++ = process_escape_sequence(&src);
- } else {
- *dst++ = *src;
- src++;
- }
+ 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) {
+ error_msg(out_of_space);
+ return FALSE;
}
- *dst = '\0';
-
- prog->glob_result.gl_pathc=0;
- if (flags==0)
- prog->glob_result.gl_pathv=NULL;
+ /* 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;
+ }
}
- *argv_alloced_ptr = argv_alloced;
- *argcPtr = argc_l;
+
+ return TRUE;
}
/* Return cmd->num_progs as 0 if no command is present (e.g. an empty
int argc_l = 0;
int done = 0;
int argv_alloced;
- int i;
+ int i, saw_quote = 0;
char quote = '\0';
int count;
struct child_prog *prog;
prog = job->progs;
prog->num_redirects = 0;
prog->redirects = NULL;
- prog->free_glob = 0;
prog->is_stopped = 0;
prog->family = job;
*src == ']') *buf++ = '\\';
*buf++ = *src;
} else if (isspace(*src)) {
- if (*prog->argv[argc_l]) {
+ if (*prog->argv[argc_l] || saw_quote) {
buf++, argc_l++;
/* +1 here leaves room for the NULL which ends argv */
if ((argc_l + 1) == argv_alloced) {
sizeof(*prog->argv) *
argv_alloced);
}
- expand_argument(prog, &argc_l, &argv_alloced);
prog->argv[argc_l] = buf;
+ saw_quote = 0;
}
} else
switch (*src) {
case '"':
case '\'':
quote = *src;
+ saw_quote = 1;
break;
case '#': /* comment */
if (*chptr && *prog->argv[argc_l]) {
buf++, argc_l++;
- expand_argument(prog, &argc_l, &argv_alloced);
prog->argv[argc_l] = buf;
}
}
chptr++;
if (!*chptr) {
- error_msg("file name expected after %c", *src);
+ error_msg("file name expected after %c", *(src-1));
free_job(job);
job->num_progs=0;
return 1;
case '|': /* pipe */
/* finish this command */
- if (*prog->argv[argc_l])
+ if (*prog->argv[argc_l] || saw_quote)
argc_l++;
if (!argc_l) {
error_msg("empty command in pipe");
prog = job->progs + (job->num_progs - 1);
prog->num_redirects = 0;
prog->redirects = NULL;
- prog->free_glob = 0;
prog->is_stopped = 0;
prog->family = job;
argc_l = 0;
return_command = *command_ptr + (src - *command_ptr) + 1;
break;
-#ifdef BB_FEATURE_SH_BACKTICKS
- case '`':
- /* Exec a backtick-ed command */
- /* Besides any previous brokenness, I have not
- * updated backtick handling for close_me support.
- * I don't know if it needs it or not. -- LRD */
- {
- char* charptr1=NULL, *charptr2;
- char* ptr=NULL;
- struct job *newjob;
- struct jobset njob_list = { NULL, NULL };
- int pipefd[2];
- int size;
-
- ptr=strchr(++src, '`');
- if (ptr==NULL) {
- fprintf(stderr, "Unmatched '`' in command\n");
- free_job(job);
- return 1;
- }
-
- /* Make some space to hold just the backticked command */
- charptr1 = charptr2 = xmalloc(1+ptr-src);
- memcpy(charptr1, src, ptr-src);
- charptr1[ptr-src] = '\0';
- newjob = xmalloc(sizeof(struct job));
- newjob->job_list = &njob_list;
- /* Now parse and run the backticked command */
- if (!parse_command(&charptr1, newjob, inbg)
- && newjob->num_progs) {
- pipe(pipefd);
- run_command(newjob, 0, pipefd);
- }
- checkjobs(job->job_list);
- free_job(newjob); /* doesn't actually free newjob,
- looks like a memory leak */
- free(charptr2);
-
- /* Make a copy of any stuff left over in the command
- * line after the second backtick */
- charptr2 = xmalloc(strlen(ptr)+1);
- memcpy(charptr2, ptr+1, strlen(ptr));
-
-
- /* Copy the output from the backtick-ed command into the
- * command line, making extra room as needed */
- --src;
- charptr1 = xmalloc(BUFSIZ);
- while ( (size=full_read(pipefd[0], charptr1, BUFSIZ-1)) >0) {
- int newsize=src - *command_ptr + size + 1 + strlen(charptr2);
- if (newsize > BUFSIZ) {
- *command_ptr=xrealloc(*command_ptr, newsize);
- }
- memcpy(src, charptr1, size);
- src+=size;
- }
- free(charptr1);
- close(pipefd[0]);
- if (*(src-1)=='\n')
- --src;
-
- /* Now paste into the *command_ptr all the stuff
- * leftover after the second backtick */
- memcpy(src, charptr2, strlen(charptr2)+1);
- free(charptr2);
-
- /* Now recursively call parse_command to deal with the new
- * and improved version of the command line with the backtick
- * results expanded in place... */
- {
- struct jobset *jl=job->job_list;
- free_job(job);
- job->job_list = jl;
- }
- return(parse_command(command_ptr, job, inbg));
- }
- break;
-#endif // BB_FEATURE_SH_BACKTICKS
-
case '\\':
src++;
if (!*src) {
-/* This is currently a little broken... */
-#ifdef HANDLE_CONTINUATION_CHARS
- /* They fed us a continuation char, so continue reading stuff
- * on the next line, then tack that onto the end of the current
- * command */
- char *command;
- int newsize;
- printf("erik: found a continue char at EOL...\n");
- command = (char *) xcalloc(BUFSIZ, sizeof(char));
- if (get_command(input, command)) {
- error_msg("character expected after \\");
- free(command);
- free_job(job);
- return 1;
- }
- newsize = strlen(*command_ptr) + strlen(command) + 2;
- if (newsize > BUFSIZ) {
- printf("erik: doing realloc\n");
- *command_ptr=xrealloc(*command_ptr, newsize);
- }
- printf("erik: A: *command_ptr='%s'\n", *command_ptr);
- memcpy(--src, command, strlen(command));
- printf("erik: B: *command_ptr='%s'\n", *command_ptr);
- free(command);
- break;
-#else
error_msg("character expected after \\");
- free(command);
free_job(job);
return 1;
-#endif
}
if (*src == '*' || *src == '[' || *src == ']'
|| *src == '?') *buf++ = '\\';
src++;
}
- if (*prog->argv[argc_l]) {
+ if (*prog->argv[argc_l] || saw_quote) {
argc_l++;
- expand_argument(prog, &argc_l, &argv_alloced);
}
if (!argc_l) {
free_job(job);
static int pseudo_exec(struct child_prog *child)
{
struct built_in_command *x;
-#ifdef BB_FEATURE_SH_STANDALONE_SHELL
+#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
char *name;
#endif
exit (x->function(child));
}
}
-#ifdef BB_FEATURE_SH_STANDALONE_SHELL
+#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
/* Check if the command matches any busybox internal
* commands ("applets") here. Following discussions from
* November 2000 on busybox@opensource.lineo.com, don't use
*/
name = child->argv[0];
-#ifdef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
- /* If you enable BB_FEATURE_SH_APPLETS_ALWAYS_WIN, then
+#ifdef CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN
+ /* If you enable CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN, then
* if you run /bin/cat, it will use BusyBox cat even if
* /bin/cat exists on the filesystem and is _not_ busybox.
* Some systems want this, others do not. Choose wisely. :-)
#endif
{
- char** argv=child->argv;
+ char** argv_l=child->argv;
int argc_l;
- for(argc_l=0;*argv!=NULL; argv++, argc_l++);
+ for(argc_l=0;*argv_l!=NULL; argv_l++, argc_l++);
optind = 1;
run_applet_by_name(name, argc_l, child->argv);
}
static void insert_job(struct job *newjob, int inbg)
{
struct job *thejob;
- struct jobset *job_list=newjob->job_list;
+ struct jobset *j_list=newjob->job_list;
/* find the ID for thejob to use */
newjob->jobid = 1;
- for (thejob = job_list->head; thejob; thejob = thejob->next)
+ 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 (!job_list->head) {
- thejob = job_list->head = xmalloc(sizeof(*thejob));
+ if (!j_list->head) {
+ thejob = j_list->head = xmalloc(sizeof(*thejob));
} else {
- for (thejob = job_list->head; thejob->next; thejob = thejob->next) /* nothing */;
+ for (thejob = j_list->head; 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,
newjob->progs[newjob->num_progs - 1].pid);
-#ifdef BB_FEATURE_SH_ENVIRONMENT
+ last_jobid = newjob->jobid;
last_bg_pid=newjob->progs[newjob->num_progs - 1].pid;
-#endif
} 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(0, newjob->pgrp) && errno != ENOTTY)
+ if (tcsetpgrp(shell_terminal, newjob->pgrp) && errno != ENOTTY)
perror_msg("tcsetpgrp");
}
}
}
}
-#ifdef BB_FEATURE_SH_ENVIRONMENT
- if (show_x_trace==TRUE) {
- int j;
- fputc('+', stderr);
- for (j = 0; child->argv[j]; j++) {
- fputc(' ', stderr);
- fputs(child->argv[j], stderr);
- }
- fputc('\n', stderr);
- }
-#endif
/* Check if the command matches any non-forking builtins,
* but only if this is a simple command.
}
if (!(child->pid = fork())) {
+ /* 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();
newjob.job_context = DEFAULT_CONTEXT;
/* save current owner of TTY so we can restore it on exit */
- parent_pgrp = tcgetpgrp(0);
+ parent_pgrp = tcgetpgrp(shell_terminal);
command = (char *) xcalloc(BUFSIZ, sizeof(char));
- /* don't pay any attention to this signal; it just confuses
- things and isn't really meant for shells anyway */
- signal(SIGTTOU, SIG_IGN);
-
while (1) {
if (!job_list.fg) {
/* no job is in the foreground */
next_command = command;
}
+ if (expand_arguments(next_command) == FALSE) {
+ 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 being fed to run_command by busy_loop()'\n", &newjob);
+ debug_printf( "job=%p fed to run_command by busy_loop()'\n",
+ &newjob);
run_command(&newjob, inbg, pipefds);
}
else {
job_list.fg->running_progs--;
job_list.fg->progs[i].pid = 0;
-#ifdef BB_FEATURE_SH_ENVIRONMENT
last_return_code=WEXITSTATUS(status);
-#endif
- debug_printf("'%s' exited -- return code %d\n",
- job_list.fg->text, last_return_code);
+
if (!job_list.fg->running_progs) {
/* child exited */
remove_job(&job_list, job_list.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)
+ if (tcsetpgrp(shell_terminal, getpgrp()) && errno != ENOTTY)
perror_msg("tcsetpgrp");
}
}
free(command);
/* return controlling TTY back to parent process group before exiting */
- if (tcsetpgrp(0, parent_pgrp))
+ if (tcsetpgrp(shell_terminal, parent_pgrp))
perror_msg("tcsetpgrp");
/* return exit status if called with "-c" */
}
-#ifdef BB_FEATURE_CLEAN_UP
+#ifdef CONFIG_FEATURE_CLEAN_UP
void free_memory(void)
{
- if (cwd)
- free(cwd);
+ if (cwd && cwd!=unknown) {
+ free((char*)cwd);
+ }
if (local_pending_command)
free(local_pending_command);
}
#endif
+/* 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()
+{
+ int status;
+
+ /* Loop until we are in the foreground. */
+ while ((status = tcgetpgrp (shell_terminal)) >= 0) {
+ if (status == (shell_pgrp = getpgrp ())) {
+ break;
+ }
+ 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);
+}
-int shell_main(int argc_l, char **argv_l)
+int lash_main(int argc_l, char **argv_l)
{
int opt, interactive=FALSE;
FILE *input = stdin;
argc = argc_l;
argv = argv_l;
- shell_context = 0;
- cwd=NULL;
-#ifdef BB_FEATURE_SH_STANDALONE_SHELL
/* 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;
-#ifdef BB_FEATURE_SH_ENVIRONMENT
- last_bg_pid=-1;
- last_return_code=-1;
- show_x_trace=FALSE;
-#endif
-#endif
+ last_return_code=1;
if (argv[0] && argv[0][0] == '-') {
FILE *prof_input;
prof_input = fopen("/etc/profile", "r");
- if (!prof_input) {
- printf( "Couldn't open file '/etc/profile'\n");
- } else {
+ if (prof_input) {
int tmp_fd = fileno(prof_input);
mark_open(tmp_fd);
/* Now run the file */
optind++;
argv = argv+optind;
break;
-#ifdef BB_FEATURE_SH_ENVIRONMENT
- case 'x':
- show_x_trace = TRUE;
- break;
-#endif
case 'i':
interactive = TRUE;
break;
isatty(fileno(stdin)) && isatty(fileno(stdout))) {
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 */
- printf( "\n\nBusyBox v%s (%s) Built-in shell (lash)\n", BB_VER, BB_BT);
+#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 = xfopen(argv[optind], "r");
}
/* initialize the cwd -- this is never freed...*/
- cwd=(char*)xmalloc(sizeof(char)*MAX_LINE+1);
- getcwd(cwd, sizeof(char)*MAX_LINE);
+ cwd = xgetcwd(0);
+ if (!cwd)
+ cwd = unknown;
-#ifdef BB_FEATURE_CLEAN_UP
+#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));
}