/*
* lash -- the BusyBox Lame-Ass SHell
*
- * Copyright (C) 2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
* Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
*
* Based in part on ladsh.c by Michael K. Johnson and Erik W. Troan, which is
//#define DEBUG_SHELL
-#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <sys/wait.h>
#include <unistd.h>
#include <getopt.h>
+#include "busybox.h"
#include "cmdedit.h"
-#define MAX_LINE 256 /* size of input buffer for cwd data */
-#define MAX_READ 128 /* size of input buffer for `read' builtin */
+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,
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 */
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;
}
}
}
+#if defined(BB_FEATURE_SH_SIMPLE_PROMPT)
+static char* setup_prompt_string(int state)
+{
+ 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 */
+}
+
+#else
+
static char* setup_prompt_string(int state)
{
char user[9],buf[255],*s;
return(strdup(prompt_str)); /* Must free this memory */
}
+#endif
+
static int get_command(FILE * source, char *command)
{
char *prompt_str;
** 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);
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)) {
+ /* do shell variable substitution */
+ src = prog->argv[argc_l - 1];
+ while((dst = strchr(src,'$')) != NULL){
+ if (!(var = getenv(dst + 1))) {
+ switch(*(dst+1)) {
case '?':
- prog->argv[argc_l - 1] = itoa(last_return_code);
+ var = itoa(last_return_code);
break;
case '$':
- prog->argv[argc_l - 1] = itoa(getpid());
+ var = itoa(getpid());
break;
case '#':
- prog->argv[argc_l - 1] = itoa(argc-1);
+ var = itoa(argc-1);
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;
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 (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;
+ } else {
+ memset(dst, 0, strlen(src)-strlen(dst));
+ }
}
+#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");
+ error_msg("out of space during glob operation");
return;
} else if (rc == GLOB_NOMATCH ||
(!rc && (prog->glob_result.gl_pathc - i) == 1 &&
if (*src == '\\') {
src++;
if (!*src) {
- error_msg("character expected after \\\n");
+ error_msg("character expected after \\");
free_job(job);
return 1;
}
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;
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;
{
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
shell_context = 0;
cwd=NULL;
-#ifdef BB_FEATURE_STANDALONE_SHELL
+#ifdef BB_FEATURE_SH_STANDALONE_SHELL
/* These variables need re-initializing when recursing */
local_pending_command = NULL;
job_list.head = NULL;
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