/*
* 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 -- sortof...
-#define BB_FEATURE_SH_IF_EXPRESSIONS
-//
-/* This is currently sortof broken, only for the brave... */
-#undef HANDLE_CONTINUATION_CHARS
-//
-/* This would be great -- if wordexp wouldn't strip all quoting
- * out from the target strings... As is, a parser needs */
-#undef BB_FEATURE_SH_WORDEXP
-//
+
//For debugging/development on the shell only...
//#define DEBUG_SHELL
#include <sys/wait.h>
#include <unistd.h>
#include <getopt.h>
+#include <termios.h>
+#include "busybox.h"
+#include "cmdedit.h"
-#ifdef BB_LOCALE_SUPPORT
+#ifdef CONFIG_LOCALE_SUPPORT
#include <locale.h>
#endif
-//#define BB_FEATURE_SH_WORDEXP
-
-#ifdef BB_FEATURE_SH_WORDEXP
-#include <wordexp.h>
-#define expand_t wordexp_t
-#undef BB_FEATURE_SH_BACKTICKS
-#else
#include <glob.h>
#define expand_t glob_t
-#endif
-#include "busybox.h"
-#include "cmdedit.h"
static const int MAX_READ = 128; /* size of input buffer for `read' builtin */
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_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}
};
};
-/* 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;
-#ifdef BB_FEATURE_SH_ENVIRONMENT
-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";
-#endif
-
+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 = "> ";
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);
printf("cd: %s: %m\n", newdir);
return EXIT_FAILURE;
}
- cwd = xgetcwd(cwd);
-
+ cwd = xgetcwd((char *)cwd);
+ if (!cwd)
+ cwd = unknown;
return EXIT_SUCCESS;
}
/* 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)
{
- printf( "%s\n", cwd);
+ cwd = xgetcwd((char *)cwd);
+ if (!cwd)
+ cwd = unknown;
+ puts(cwd);
return EXIT_SUCCESS;
}
if (v == NULL) {
char **e;
for (e = environ; *e; e++) {
- printf( "%s\n", *e);
+ puts(*e);
}
return 0;
}
res = putenv(v);
if (res)
fprintf(stderr, "export: %m\n");
-#ifndef BB_FEATURE_SH_SIMPLE_PROMPT
+#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
if (strncmp(v, "PS1=", 4)==0)
PS1 = getenv("PS1");
#endif
-#ifdef BB_LOCALE_SUPPORT
+#ifdef CONFIG_LOCALE_SUPPORT
if(strncmp(v, "LC_ALL=", 7)==0)
setlocale(LC_ALL, getenv("LC_ALL"));
if(strncmp(v, "LC_CTYPE=", 9)==0)
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)
-{
- local_pending_command = xstrdup(cmd);
- return( busy_loop(NULL));
-}
-#endif
-
static void mark_open(int fd)
{
struct close_me *new = xmalloc(sizeof(struct close_me));
prevjob->next = job->next;
}
+ if (j_list->head)
+ last_jobid = j_list->head->jobid;
+ else
+ last_jobid = 0;
+
free(job);
}
if (!job->running_progs) {
printf(JOB_STATUS_FORMAT, job->jobid, "Done", job->text);
+ last_jobid=0;
remove_job(j_list, job);
}
} else {
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
}
}
static inline void cmdedit_set_initial_prompt(void)
{
-#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
+#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
PS1 = NULL;
#else
PS1 = getenv("PS1");
static inline void setup_prompt_string(char **prompt_str)
{
-#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
+#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
/* Set up the prompt */
if (shell_context == 0) {
if (PS1)
if (source == stdin) {
setup_prompt_string(&prompt_str);
-#ifdef BB_FEATURE_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();
return 0;
#else
fputs(prompt_str, stdout);
return 0;
}
-#ifdef BB_FEATURE_SH_ENVIRONMENT
static char* itoa(register int i)
{
static char a[7]; /* Max 7 ints */
*--b = '-';
return b;
}
-#endif
-#if defined BB_FEATURE_SH_ENVIRONMENT && ! defined BB_FEATURE_SH_WORDEXP
char * strsep_space( char *string, int * ix)
{
char *token, *begin;
return token;
}
-#endif
-
static int expand_arguments(char *command)
{
-#ifdef BB_FEATURE_SH_ENVIRONMENT
+ int total_length=0, length, i, retval, ix = 0;
expand_t expand_result;
+ char *tmpcmd, *cmd, *cmd_copy;
char *src, *dst, *var;
- int ix = 0;
- int i=0, length, total_length=0, retval;
- const char *out_of_space = "out of space during expansion";
-#endif
+ 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] == '\\') {
}
ix++;
}
-
-#ifdef BB_FEATURE_SH_ENVIRONMENT
-
-
-#ifdef BB_FEATURE_SH_WORDEXP
- /* This first part uses wordexp() which is a wonderful C lib
- * function which expands nearly everything. */
- retval = wordexp (command, &expand_result, WRDE_SHOWERR);
- if (retval == WRDE_NOSPACE) {
- /* Mem may have been allocated... */
- wordfree (&expand_result);
- error_msg(out_of_space);
- return FALSE;
- }
- if (retval < 0) {
- /* Some other error. */
- error_msg("syntax error");
- return FALSE;
- }
-
- if (expand_result.we_wordc > 0) {
- /* 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 < expand_result.we_wordc && total_length < BUFSIZ) {
- length=strlen(expand_result.we_wordv[i])+1;
- if (BUFSIZ-total_length-length <= 0) {
- error_msg(out_of_space);
- return FALSE;
- }
- strcat(command+total_length, expand_result.we_wordv[i++]);
- strcat(command+total_length, " ");
- total_length+=length;
- }
- wordfree (&expand_result);
- }
-#else
-
- /* Ok. They don't have a recent glibc and they don't have uClibc. Chances
- * are about 100% they don't have wordexp(). So instead the best we can do
- * is use glob and then fixup environment variables and such ourselves.
- * This is better then nothing, but certainly not perfect */
+ /* 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) */
- {
-
- int flags = GLOB_NOCHECK
-#ifdef GLOB_BRACE
- | GLOB_BRACE
-#endif
-#ifdef GLOB_TILDE
- | GLOB_TILDE
-#endif
- ;
- char *tmpcmd, *cmd, *cmd_copy;
- /* 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;
- 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 {
+
+ /* 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 {
/* 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;
- }
- if (i>0) {
- strcat(command+total_length, " ");
- total_length+=1;
- }
- strcat(command+total_length, expand_result.gl_pathv[i]);
- total_length+=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;
}
- globfree (&expand_result);
+ 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);
}
-
-#endif
+ free(cmd_copy);
+ trim(command);
/* Now do the shell variable substitutions which
* wordexp can't do for us, namely $? and $! */
else
var = itoa(last_bg_pid);
break;
- /* Everything else like $$, $#, $[0-9], etc should all be
+ /* 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
+ * 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 '$':
}
}
-#endif
return TRUE;
}
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;
*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) {
argv_alloced);
}
prog->argv[argc_l] = buf;
+ saw_quote = 0;
}
} else
switch (*src) {
case '"':
case '\'':
quote = *src;
+ saw_quote = 1;
break;
case '#': /* comment */
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");
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_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++;
}
if (!argc_l) {
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. :-)
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 */
job_list.fg->running_progs--;
job_list.fg->progs[i].pid = 0;
-#ifdef BB_FEATURE_SH_ENVIRONMENT
last_return_code=WEXITSTATUS(status);
- debug_printf("'%s' exited -- return code %d\n",
- job_list.fg->text, last_return_code);
-#endif
+
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);
- cwd = NULL;
+ 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);
+ }
-int shell_main(int argc_l, char **argv_l)
+ /* 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 lash_main(int argc_l, char **argv_l)
{
int opt, interactive=FALSE;
FILE *input = stdin;
argv = argv_l;
/* These variables need re-initializing when recursing */
- shell_context = 0;
+ 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
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 = xgetcwd(0);
+ if (!cwd)
+ cwd = unknown;
-#ifdef BB_FEATURE_CLEAN_UP
+#ifdef CONFIG_FEATURE_CLEAN_UP
atexit(free_memory);
#endif
-#ifdef BB_FEATURE_COMMAND_EDITING
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
cmdedit_set_initial_prompt();
#else
PS1 = NULL;
return (busy_loop(input));
}
-
projects / oweals / busybox.git / blobdiff