//#define DEBUG_SHELL
-#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
-#include <glob.h>
+#include <wordexp.h>
#include <signal.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/wait.h>
#include <unistd.h>
#include <getopt.h>
+#include "busybox.h"
#include "cmdedit.h"
static const int MAX_LINE = 256; /* size of input buffer for cwd data */
static const int MAX_READ = 128; /* size of input buffer for `read' builtin */
#define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n"
-extern size_t NUM_APPLETS;
enum redir_type { REDIRECT_INPUT, REDIRECT_OVERWRITE,
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 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 int get_command(FILE * source, char *command);
static int parse_command(char **command_ptr, struct job *job, int *inbg);
static struct jobset job_list = { NULL, NULL };
static int argc;
static char **argv;
-static struct close_me *close_me_head = NULL;
+static struct close_me *close_me_head;
#ifdef BB_FEATURE_SH_ENVIRONMENT
-static int last_bg_pid=-1;
-static int last_return_code=-1;
-static int show_x_trace=FALSE;
+static int last_bg_pid;
+static int last_return_code;
+static int show_x_trace;
#endif
#ifdef BB_FEATURE_SH_IF_EXPRESSIONS
static char syntax_err[]="syntax error near unexpected token";
if (child->argv[1] == NULL)
return EXIT_SUCCESS; /* Really? */
child->argv++;
+ close_all();
pseudo_exec(child);
/* never returns */
}
struct job *job=NULL;
if (!child->argv[1] || child->argv[2]) {
- error_msg("%s: exactly one argument is expected\n",
+ 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'\n",
+ error_msg("%s: bad argument '%s'",
child->argv[0], child->argv[1]);
return EXIT_FAILURE;
}
}
if (!job) {
- error_msg("%s: unknown job %d\n",
+ error_msg("%s: unknown job %d",
child->argv[0], jobNum);
return EXIT_FAILURE;
}
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'\n", syntax_err);
+ error_msg("%s `then'", syntax_err);
return EXIT_FAILURE;
}
if (! (cmd->job_context & THEN_EXP_CONTEXT)) {
shell_context = 0; /* Reset the shell's context on an error */
- error_msg("%s `else'\n", syntax_err);
+ error_msg("%s `else'", syntax_err);
return EXIT_FAILURE;
}
/* If the if result was TRUE, skip the 'else' stuff */
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'\n", syntax_err);
+ error_msg("%s `fi'", syntax_err);
return EXIT_FAILURE;
}
/* Clear out the if and then context bits */
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;
}
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->text)
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\n", redir->filename,
+ error_msg("error opening %s: %s", redir->filename,
strerror(errno));
return 1;
}
** atexit() handlers and other unwanted stuff to our
** child processes (rob@sysgo.de)
*/
- cmdedit_init();
cmdedit_read_input(prompt_str, command);
- free(prompt_str);
cmdedit_terminate();
+ free(prompt_str);
return 0;
#else
fputs(prompt_str, stdout);
}
/* remove trailing newline */
- command[strlen(command) - 1] = '\0';
+ chomp(command);
return 0;
}
*--b = '-';
return b;
}
-#endif
+#endif
-static void expand_argument(struct child_prog *prog, int *argcPtr,
- int *argv_alloced_ptr)
+static int expand_arguments(char *command)
{
- int argc_l = *argcPtr;
- int argv_alloced = *argv_alloced_ptr;
- int rc;
- int flags;
- int i;
+#ifdef BB_FEATURE_SH_ENVIRONMENT
+ wordexp_t wrdexp;
char *src, *dst, *var;
+ int i=0, length, total_length=0, retval;
+#endif
+
+ /* get rid of the terminating \n */
+ chomp(command);
- 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;
- }
- /* do shell variable substitution */
- if(*prog->argv[argc_l - 1] == '$') {
- if ((var = getenv(prog->argv[argc_l - 1] + 1))) {
- prog->argv[argc_l - 1] = var;
- }
#ifdef BB_FEATURE_SH_ENVIRONMENT
- else {
- switch(*(prog->argv[argc_l - 1] + 1)) {
+
+ /* This first part uses wordexp() which is a wonderful C lib
+ * function which expands nearly everything. */
+
+ retval = wordexp (command, &wrdexp, 0);
+
+ if (retval == WRDE_NOSPACE) {
+ /* Mem may have been allocated... */
+ wordfree (&wrdexp);
+ error_msg("out of space during expansion");
+ return FALSE;
+ }
+ if (retval < 0) {
+ /* Some other error. */
+ error_msg("syntax error");
+ return FALSE;
+ }
+
+ /* Convert from char** (one word per string) to a simple char*,
+ * but don't overflow command which is BUFSIZ in length */
+ *command = '\0';
+ while (i < wrdexp.we_wordc && total_length < BUFSIZ) {
+ length=strlen(wrdexp.we_wordv[i])+1;
+ if (BUFSIZ-total_length-length <= 0) {
+ error_msg("out of space during expansion");
+ return FALSE;
+ }
+ strcat(command+total_length, wrdexp.we_wordv[i++]);
+ strcat(command+total_length, " ");
+ total_length+=length;
+ }
+ wordfree (&wrdexp);
+
+
+ /* Now do the shell variable substitutions which
+ * wordexp can't do for us, namely $? and $! */
+ src = command;
+ while((dst = strchr(src,'$')) != NULL){
+ if (!(var = getenv(dst + 1))) {
+ switch(*(dst+1)) {
case '?':
- prog->argv[argc_l - 1] = itoa(last_return_code);
- break;
- case '$':
- prog->argv[argc_l - 1] = itoa(getpid());
- break;
- case '#':
- prog->argv[argc_l - 1] = itoa(argc-1);
+ var = itoa(last_return_code);
break;
case '!':
if (last_bg_pid==-1)
- *(prog->argv[argc_l - 1])='\0';
+ *(var)='\0';
else
- prog->argv[argc_l - 1] = itoa(last_bg_pid);
+ 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 index=*(prog->argv[argc_l - 1] + 1)-48;
+ int index=*(dst + 1)-48;
if (index >= argc) {
- *(prog->argv[argc_l - 1])='\0';
+ var='\0';
} else {
- prog->argv[argc_l - 1] = argv[index];
+ var = argv[index];
}
}
break;
- }
- }
-#endif
- }
- 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\n");
- 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++;
- }
}
- *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);
}
- }else{
- src = dst = prog->argv[argc_l - 1];
- while (*src) {
- if (*src == '\\') {
- src++;
- *dst++ = process_escape_sequence(&src);
- } else {
- *dst++ = *src;
- src++;
- }
+ if (var) {
+ int subst_len = strlen(var);
+ char *next_dst;
+ if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?")) == NULL) {
+ next_dst = dst;
}
- *dst = '\0';
-
- prog->glob_result.gl_pathc=0;
- if (flags==0)
- prog->glob_result.gl_pathv=NULL;
+ src = (char*)xrealloc(src, strlen(src) - strlen(next_dst)+strlen(var)+1);
+ /* Move stuff to the end of the string to accommodate filling
+ * the created gap with the new stuff */
+ memmove(dst+subst_len, next_dst+1, subst_len);
+ /* Now copy in the new stuff */
+ strncpy(dst, var, subst_len);
+ src = dst;
+ src++;
+ } else {
+ /* Seems we got an un-expandable variable. So delete it. */
+ char *next_dst;
+ if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?")) != NULL) {
+ /* Move stuff to the end of the string to accommodate filling
+ * the created gap with the new stuff */
+ memmove(dst, next_dst, next_dst-dst);
+ }
+ }
}
- *argv_alloced_ptr = argv_alloced;
- *argcPtr = argc_l;
+
+
+
+
+#endif
+ return TRUE;
}
/* Return cmd->num_progs as 0 if no command is present (e.g. an empty
prog = job->progs;
prog->num_redirects = 0;
prog->redirects = NULL;
- prog->free_glob = 0;
prog->is_stopped = 0;
prog->family = job;
if (*src == '\\') {
src++;
if (!*src) {
- error_msg("character expected after \\\n");
+ error_msg("character expected after \\");
free_job(job);
return 1;
}
sizeof(*prog->argv) *
argv_alloced);
}
- expand_argument(prog, &argc_l, &argv_alloced);
prog->argv[argc_l] = buf;
}
} else
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\n", *src);
+ error_msg("file name expected after %c", *src);
free_job(job);
job->num_progs=0;
return 1;
if (*prog->argv[argc_l])
argc_l++;
if (!argc_l) {
- error_msg("empty command in pipe\n");
+ error_msg("empty command in pipe");
free_job(job);
job->num_progs=0;
return 1;
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;
src++;
if (!*src) {
- error_msg("empty command in pipe\n");
+ error_msg("empty command in pipe");
free_job(job);
job->num_progs=0;
return 1;
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 \\\n");
+ error_msg("character expected after \\");
free(command);
free_job(job);
return 1;
free(command);
break;
#else
- error_msg("character expected after \\\n");
+ error_msg("character expected after \\");
free(command);
free_job(job);
return 1;
if (*prog->argv[argc_l]) {
argc_l++;
- expand_argument(prog, &argc_l, &argv_alloced);
}
if (!argc_l) {
free_job(job);
{
struct built_in_command *x;
#ifdef BB_FEATURE_SH_STANDALONE_SHELL
- struct BB_applet search_applet, *applet;
+ char *name;
#endif
/* Check if the command matches any of the non-forking builtins.
* /bin/foo invocation will fork and exec /bin/foo, even if
* /bin/foo is a symlink to busybox.
*/
- search_applet.name = child->argv[0];
+ name = child->argv[0];
#ifdef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
/* If you enable BB_FEATURE_SH_APPLETS_ALWAYS_WIN, then
* /bin/cat exists on the filesystem and is _not_ busybox.
* Some systems want this, others do not. Choose wisely. :-)
*/
- search_applet.name = get_last_path_component(search_applet.name);
+ name = get_last_path_component(name);
#endif
- /* Do a binary search to find the applet entry given the name. */
- applet = bsearch(&search_applet, applets, NUM_APPLETS,
- sizeof(struct BB_applet), applet_name_compare);
- if (applet != NULL) {
- int argc_l;
- char** argv=child->argv;
- for(argc_l=0;*argv!=NULL; argv++, argc_l++);
- applet_name=applet->name;
- optind = 1;
- exit((*(applet->main)) (argc_l, child->argv));
+ {
+ char** argv=child->argv;
+ int argc_l;
+ for(argc_l=0;*argv!=NULL; argv++, argc_l++);
+ optind = 1;
+ run_applet_by_name(name, argc_l, child->argv);
}
#endif
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};
argc = argc_l;
argv = argv_l;
+ /* These variables need re-initializing when recursing */
shell_context = 0;
cwd=NULL;
-#ifdef BB_FEATURE_SH_STANDALONE_SHELL
- /* These variables need re-initializing when recursing */
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;
+ last_bg_pid=1;
+ last_return_code=1;
show_x_trace=FALSE;
-#endif
#endif
if (argv[0] && argv[0][0] == '-') {
case 'c':
input = NULL;
if (local_pending_command != 0)
- error_msg_and_die("multiple -c arguments\n");
+ error_msg_and_die("multiple -c arguments");
local_pending_command = xstrdup(argv[optind]);
optind++;
argv = argv+optind;
interactive = TRUE;
break;
default:
- usage(shell_usage);
+ show_usage();
}
}
/* A shell is interactive if the `-i' flag was given, or if all of
projects / oweals / busybox.git / blobdiff