X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=shell%2Flash.c;h=8727e12ae74ecb1be4998f9e0988b3288014ea99;hb=61173a537149484dfaaeb8f94a2c86ef01d30613;hp=874c0aca90fccc251669307abac1864ca6acf567;hpb=ca6045955d8e51b268e242f59f3b63b9fdcf90e6;p=oweals%2Fbusybox.git diff --git a/shell/lash.c b/shell/lash.c index 874c0aca9..8727e12ae 100644 --- a/shell/lash.c +++ b/shell/lash.c @@ -39,11 +39,15 @@ //#define BB_FEATURE_SH_BACKTICKS // //If, then, else, etc. support.. This should now behave basically -//like any other Bourne shell... +//like any other Bourne shell -- sortof... #define BB_FEATURE_SH_IF_EXPRESSIONS // -/* This is currently a little broken... */ -//#define HANDLE_CONTINUATION_CHARS +/* 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 @@ -54,16 +58,27 @@ #include #include #include -#include #include #include #include #include #include #include + +//#define BB_FEATURE_SH_WORDEXP + +#ifdef BB_FEATURE_SH_WORDEXP +#include +#define expand_t wordexp_t +#undef BB_FEATURE_SH_BACKTICKS +#else +#include +#define expand_t glob_t +#endif #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" @@ -215,6 +230,10 @@ static int show_x_trace; static char syntax_err[]="syntax error near unexpected token"; #endif +static char *PS1; +static char *PS2; + + #ifdef DEBUG_SHELL static inline void debug_printf(const char *format, ...) { @@ -274,7 +293,7 @@ static int builtin_cd(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); @@ -413,13 +432,20 @@ static int builtin_pwd(struct child_prog *dummy) static int builtin_export(struct child_prog *child) { int res; + char *v = child->argv[1]; - if (child->argv[1] == NULL) { + if (v == NULL) { return (builtin_env(child)); } - res = putenv(child->argv[1]); + res = putenv(v); if (res) - fprintf(stderr, "export: %s\n", strerror(errno)); + fprintf(stderr, "export: %m\n"); +#ifndef BB_FEATURE_SH_SIMPLE_PROMPT + if (strncmp(v, "PS1=", 4)==0) + PS1 = getenv("PS1"); + else if (strncmp(v, "PS2=", 4)==0) + PS2 = getenv("PS2"); +#endif return (res); } @@ -449,7 +475,7 @@ static int builtin_read(struct child_prog *child) 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); @@ -643,17 +669,22 @@ static void close_all() 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); } - 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 */ @@ -747,8 +778,7 @@ static int setup_redirects(struct child_prog *prog, int squirrel[]) 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; } @@ -778,57 +808,40 @@ static void restore_redirects(int squirrel[]) } } -#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 */ -} - +#ifdef BB_FEATURE_SH_SIMPLE_PROMPT + PS1 = NULL; + PS2 = "> "; #else + PS1 = getenv("PS1"); + if(PS1==0) { + PS1 = "\\w \\$ "; + } + PS2 = getenv("PS2"); + if(PS2==0) + PS2 = "> "; +#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]; - +#ifdef BB_FEATURE_SH_SIMPLE_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; @@ -845,9 +858,9 @@ static int get_command(FILE * source, char *command) } if (source == stdin) { - prompt_str = setup_prompt_string(shell_context); + setup_prompt_string(&prompt_str); -#ifdef BB_FEATURE_SH_COMMAND_EDITING +#ifdef BB_FEATURE_COMMAND_EDITING /* ** enable command line editing only while a command line ** is actually being read; otherwise, we'll end up bequeathing @@ -856,11 +869,9 @@ static int get_command(FILE * source, char *command) */ cmdedit_read_input(prompt_str, command); cmdedit_terminate(); - free(prompt_str); return 0; #else fputs(prompt_str, stdout); - free(prompt_str); #endif } @@ -870,9 +881,6 @@ static int get_command(FILE * source, char *command) return 1; } - /* remove trailing newline */ - chomp(command); - return 0; } @@ -898,28 +906,76 @@ static char* itoa(register int i) } #endif +#if defined BB_FEATURE_SH_ENVIRONMENT && ! defined BB_FEATURE_SH_WORDEXP +char * strsep_space( char *string, int * index) +{ + char *token, *begin; + + begin = string; + + /* Short circuit the trivial case */ + if ( !string || ! string[*index]) + return NULL; + + /* Find the end of the token. */ + while( string && string[*index] && !isspace(string[*index]) ) { + (*index)++; + } + + /* Find the end of any whitespace trailing behind + * the token and let that be part of the token */ + while( string && string[*index] && isspace(string[*index]) ) { + (*index)++; + } + + if (! string && *index==0) { + /* Nothing useful was found */ + return NULL; + } + + token = xmalloc(*index+1); + token[*index] = '\0'; + strncpy(token, string, *index); + + return token; +} +#endif + + static int expand_arguments(char *command) { #ifdef BB_FEATURE_SH_ENVIRONMENT - wordexp_t wrdexp; + expand_t expand_result; char *src, *dst, *var; + int index = 0; int i=0, length, total_length=0, retval; + const char *out_of_space = "out of space during expansion"; #endif /* get rid of the terminating \n */ chomp(command); + + /* Fix up escape sequences to be the Real Thing(tm) */ + while( command && command[index]) { + if (command[index] == '\\') { + char *tmp = command+index+1; + command[index] = process_escape_sequence( &tmp ); + memmove(command+index + 1, tmp, strlen(tmp)+1); + } + index++; + } #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, &wrdexp, 0); - + retval = wordexp (command, &expand_result, WRDE_SHOWERR); if (retval == WRDE_NOSPACE) { /* Mem may have been allocated... */ - wordfree (&wrdexp); - error_msg("out of space during expansion"); + wordfree (&expand_result); + error_msg(out_of_space); return FALSE; } if (retval < 0) { @@ -928,68 +984,174 @@ static int expand_arguments(char *command) 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; + 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; } - strcat(command+total_length, wrdexp.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 */ + + /* 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 (index = 0, tmpcmd = cmd; + (tmpcmd = strsep_space(cmd, &index)) != NULL; cmd += index, index=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 { + /* 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; + } + globfree (&expand_result); + } + } + free(cmd_copy); + trim(command); } - wordfree (&wrdexp); - +#endif + /* 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 '?': - var = itoa(last_return_code); - break; - case '!': - if (last_bg_pid==-1) - *(var)='\0'; - else - var = itoa(last_bg_pid); - break; -#if 0 - /* Everything else like $$, $#, $[0-9], etcshould all be - * expanded by wordexp(), so we can skip that stuff here */ - case '$': - case '#': - case '0':case '1':case '2':case '3':case '4': - case '5':case '6':case '7':case '8':case '9': - break; -#endif - } + 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 index=*(dst + 1)-48; + if (index >= argc) { + var='\0'; + } else { + var = argv[index]; + } + } + 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); - char *next_dst; - if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?")) == NULL) { - next_dst = dst; + int trail_len = strlen(src); + if (dst+subst_len+trail_len >= command+BUFSIZ) { + error_msg(out_of_space); + return FALSE; } - 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); + /* 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 */ - strncpy(dst, var, subst_len); + memcpy(dst, var, subst_len); + src = dst+subst_len; } - src = dst; - src++; } - - - #endif return TRUE; } @@ -1137,7 +1299,7 @@ static int parse_command(char **command_ptr, struct job *job, int *inbg) 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; @@ -1308,7 +1470,6 @@ static int parse_command(char **command_ptr, struct job *job, int *inbg) break; #else error_msg("character expected after \\"); - free(command); free_job(job); return 1; #endif @@ -1602,7 +1763,8 @@ static int busy_loop(FILE * input) 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 { @@ -1626,9 +1788,9 @@ static int busy_loop(FILE * input) #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); +#endif if (!job_list.fg->running_progs) { /* child exited */ remove_job(&job_list, job_list.fg); @@ -1770,5 +1932,13 @@ int shell_main(int argc_l, char **argv_l) atexit(free_memory); #endif +#ifdef BB_FEATURE_COMMAND_EDITING + cmdedit_set_initial_prompt(); +#else + PS1 = NULL; + PS2 = "> "; +#endif + return (busy_loop(input)); } +