X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=shell%2Fhush.c;h=c61607dd39f24f91b0ca19c3a0b065367670a1b2;hb=cdf62770af9e8bf7d5bb2344ddef8acb3216cfe2;hp=7a4d7f93412495eb5690fdad6f4572729fb0481d;hpb=c666f71e3b91285d66260567b0b4c57332e0ff1f;p=oweals%2Fbusybox.git diff --git a/shell/hush.c b/shell/hush.c index 7a4d7f934..c61607dd3 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -37,7 +37,6 @@ * across continuation lines. * * Bash grammar not implemented: (how many of these were in original sh?) - * $@ (those sure look like weird quoting rules) * $_ * ! negation operator for pipes * &> and >& redirection of stdout+stderr @@ -77,11 +76,34 @@ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ -#include "busybox.h" + #include /* glob, of course */ #include /* should be pretty obvious */ /* #include */ +#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */ + + +#if !BB_MMU && ENABLE_HUSH_TICK +//#undef ENABLE_HUSH_TICK +//#define ENABLE_HUSH_TICK 0 +#warning On NOMMU, hush command substitution is dangerous. +#warning Dont use it for commands which produce lots of output. +#warning For more info see shell/hush.c, generate_stream_from_list(). +#endif + +#if !BB_MMU && ENABLE_HUSH_JOB +#undef ENABLE_HUSH_JOB +#define ENABLE_HUSH_JOB 0 +#endif + +#if !ENABLE_HUSH_INTERACTIVE +#undef ENABLE_FEATURE_EDITING +#define ENABLE_FEATURE_EDITING 0 +#undef ENABLE_FEATURE_EDITING_FANCY_PROMPT +#define ENABLE_FEATURE_EDITING_FANCY_PROMPT 0 +#endif + /* If you comment out one of these below, it will be #defined later * to perform debug printfs to stderr: */ @@ -116,11 +138,15 @@ #define DEBUG_EXPAND 1 #endif +/* Keep unconditionally on for now */ +#define ENABLE_HUSH_DEBUG 1 + #ifndef debug_printf_clean /* broken, of course, but OK for testing */ static const char *indenter(int i) { - static const char blanks[] = " "; + static const char blanks[] ALIGN1 = + " "; return &blanks[sizeof(blanks) - i - 1]; } #define debug_printf_clean(...) fprintf(stderr, __VA_ARGS__) @@ -128,17 +154,45 @@ static const char *indenter(int i) #endif -#if !ENABLE_HUSH_INTERACTIVE -#undef ENABLE_FEATURE_EDITING -#define ENABLE_FEATURE_EDITING 0 -#undef ENABLE_FEATURE_EDITING_FANCY_PROMPT -#define ENABLE_FEATURE_EDITING_FANCY_PROMPT 0 +/* + * Leak hunting. Use hush_leaktool.sh for post-processing. + */ +#ifdef FOR_HUSH_LEAKTOOL +void *xxmalloc(int lineno, size_t size) +{ + void *ptr = xmalloc((size + 0xff) & ~0xff); + fprintf(stderr, "line %d: malloc %p\n", lineno, ptr); + return ptr; +} +void *xxrealloc(int lineno, void *ptr, size_t size) +{ + ptr = xrealloc(ptr, (size + 0xff) & ~0xff); + fprintf(stderr, "line %d: realloc %p\n", lineno, ptr); + return ptr; +} +char *xxstrdup(int lineno, const char *str) +{ + char *ptr = xstrdup(str); + fprintf(stderr, "line %d: strdup %p\n", lineno, ptr); + return ptr; +} +void xxfree(void *ptr) +{ + fprintf(stderr, "free %p\n", ptr); + free(ptr); +} +#define xmalloc(s) xxmalloc(__LINE__, s) +#define xrealloc(p, s) xxrealloc(__LINE__, p, s) +#define xstrdup(s) xxstrdup(__LINE__, s) +#define free(p) xxfree(p) #endif + #define SPECIAL_VAR_SYMBOL 3 -#define FLAG_EXIT_FROM_LOOP 1 -#define FLAG_PARSE_SEMICOLON (1 << 1) /* symbol ';' is special for parser */ -#define FLAG_REPARSING (1 << 2) /* >= 2nd pass */ + +#define PARSEFLAG_EXIT_FROM_LOOP 1 +#define PARSEFLAG_SEMICOLON (1 << 1) /* symbol ';' is special for parser */ +#define PARSEFLAG_REPARSING (1 << 2) /* >= 2nd pass */ typedef enum { REDIRECT_INPUT = 1, @@ -173,33 +227,41 @@ typedef enum { /* might eventually control execution */ typedef enum { RES_NONE = 0, +#if ENABLE_HUSH_IF RES_IF = 1, RES_THEN = 2, RES_ELIF = 3, RES_ELSE = 4, RES_FI = 5, +#endif +#if ENABLE_HUSH_LOOPS RES_FOR = 6, RES_WHILE = 7, RES_UNTIL = 8, RES_DO = 9, RES_DONE = 10, - RES_XXXX = 11, - RES_IN = 12, + RES_IN = 11, +#endif + RES_XXXX = 12, RES_SNTX = 13 } reserved_style; enum { FLAG_END = (1 << RES_NONE ), +#if ENABLE_HUSH_IF FLAG_IF = (1 << RES_IF ), FLAG_THEN = (1 << RES_THEN ), FLAG_ELIF = (1 << RES_ELIF ), FLAG_ELSE = (1 << RES_ELSE ), FLAG_FI = (1 << RES_FI ), +#endif +#if ENABLE_HUSH_LOOPS FLAG_FOR = (1 << RES_FOR ), FLAG_WHILE = (1 << RES_WHILE), FLAG_UNTIL = (1 << RES_UNTIL), FLAG_DO = (1 << RES_DO ), FLAG_DONE = (1 << RES_DONE ), FLAG_IN = (1 << RES_IN ), +#endif FLAG_START = (1 << RES_XXXX ), }; @@ -209,10 +271,10 @@ struct p_context { struct pipe *list_head; struct pipe *pipe; struct redir_struct *pending_redirect; - reserved_style res_w; - int old_flag; /* for figuring out valid reserved words */ + smallint res_w; + smallint parse_type; /* bitmask of PARSEFLAG_xxx, defines type of parser : ";$" common or special symbol */ + int old_flag; /* bitmask of FLAG_xxx, for figuring out valid reserved words */ struct p_context *stack; - int parse_type; /* define type of parser : ";$" common or special symbol */ /* How about quoting status? */ }; @@ -221,21 +283,21 @@ struct redir_struct { redir_type type; /* type of redirection */ int fd; /* file descriptor being redirected */ int dup; /* -1, or file descriptor being duplicated */ - glob_t word; /* *word.gl_pathv is the filename */ + char **glob_word; /* *word.gl_pathv is the filename */ }; struct child_prog { pid_t pid; /* 0 if exited */ char **argv; /* program name and arguments */ struct pipe *group; /* if non-NULL, first in group or subshell */ - int subshell; /* flag, non-zero if group must be forked */ + smallint subshell; /* flag, non-zero if group must be forked */ + smallint is_stopped; /* is the program currently running? */ struct redir_struct *redirects; /* I/O redirections */ - glob_t glob_result; /* result of parameter globbing */ - int is_stopped; /* is the program currently running? */ struct pipe *family; /* pointer back to the child's parent pipe */ //sp counting seems to be broken... so commented out, grep for '//sp:' //sp: int sp; /* number of SPECIAL_VAR_SYMBOL */ - int type; + //seems to be unused, grep for '//pt:' + //pt: int parse_type; }; /* argv vector may contain variable references (^Cvar^C, ^C0^C etc) * and on execution these are substituted with their values. @@ -247,85 +309,42 @@ struct pipe { struct pipe *next; int num_progs; /* total number of programs in job */ int running_progs; /* number of programs running (not exited) */ - char *cmdbuf; /* buffer various argv's point into */ + int stopped_progs; /* number of programs alive, but stopped */ #if ENABLE_HUSH_JOB int jobid; /* job number */ - char *cmdtext; /* name of job */ pid_t pgrp; /* process group ID for the job */ + char *cmdtext; /* name of job */ #endif + char *cmdbuf; /* buffer various argv's point into */ struct child_prog *progs; /* array of commands in pipe */ - int stopped_progs; /* number of programs alive, but stopped */ int job_context; /* bitmask defining current context */ - pipe_style followup; /* PIPE_BG, PIPE_SEQ, PIPE_OR, PIPE_AND */ - reserved_style r_mode; /* supports if, for, while, until */ -}; - -struct close_me { - struct close_me *next; - int fd; -}; - -struct variables { - struct variables *next; - const char *name; - const char *value; - int flg_export; - int flg_read_only; + smallint followup; /* PIPE_BG, PIPE_SEQ, PIPE_OR, PIPE_AND */ + smallint res_word; /* needed for if, for, while, until... */ }; -/* globals, connect us to the outside world - * the first three support $?, $#, and $1 */ -static char **global_argv; -static int global_argc; -static int last_return_code; -extern char **environ; /* This is in , but protected with __USE_GNU */ - -/* "globals" within this file */ -enum { - CHAR_ORDINARY = 0, - CHAR_ORDINARY_IF_QUOTED = 1, /* example: *, # */ - CHAR_IFS = 2, /* treated as ordinary if quoted */ - CHAR_SPECIAL = 3, /* example: $ */ +/* On program start, environ points to initial environment. + * putenv adds new pointers into it, unsetenv removes them. + * Neither of these (de)allocates the strings. + * setenv allocates new strings in malloc space and does putenv, + * and thus setenv is unusable (leaky) for shell's purposes */ +#define setenv(...) setenv_is_leaky_dont_use() +struct variable { + struct variable *next; + char *varstr; /* points to "name=" portion */ + int max_len; /* if > 0, name is part of initial env; else name is malloced */ + smallint flg_export; /* putenv should be done on this var */ + smallint flg_read_only; }; -static unsigned char charmap[256]; -static const char *ifs; -static int fake_mode; -static struct close_me *close_me_head; -static const char *cwd; -static unsigned last_bg_pid; -#if !ENABLE_HUSH_INTERACTIVE -enum { interactive_fd = 0 }; -#else -/* 'interactive_fd' is a fd# open to ctty, if we have one - * _AND_ if we decided to act interactively */ -static int interactive_fd; -#if ENABLE_HUSH_JOB -static pid_t saved_task_pgrp; -static pid_t saved_tty_pgrp; -static int last_jobid; -static struct pipe *job_list; -#endif -static const char *PS1; -static const char *PS2; -#endif - -#define HUSH_VER_STR "0.02" -static struct variables shell_ver = { NULL, "HUSH_VERSION", HUSH_VER_STR, 1, 1 }; -static struct variables *top_vars = &shell_ver; - -#define B_CHUNK 100 -#define B_NOSPAC 1 typedef struct { char *data; int length; int maxlen; - int quote; - int nonnull; + smallint o_quote; + smallint nonnull; } o_string; #define NULL_O_STRING {NULL,0,0,0,0} -/* used for initialization: - o_string foo = NULL_O_STRING; */ +/* used for initialization: o_string foo = NULL_O_STRING; */ /* I can almost use ordinary FILE *. Is open_memstream() universally * available? Where is it documented? */ @@ -335,8 +354,8 @@ struct in_str { char eof_flag; /* meaningless if ->p == NULL */ char peek_buf[2]; #if ENABLE_HUSH_INTERACTIVE - int __promptme; - int promptmode; + smallint promptme; + smallint promptmode; /* 0: PS1, 1: PS2 */ #endif FILE *file; int (*get) (struct in_str *); @@ -345,40 +364,137 @@ struct in_str { #define b_getch(input) ((input)->get(input)) #define b_peek(input) ((input)->peek(input)) -#define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n" +enum { + CHAR_ORDINARY = 0, + CHAR_ORDINARY_IF_QUOTED = 1, /* example: *, # */ + CHAR_IFS = 2, /* treated as ordinary if quoted */ + CHAR_SPECIAL = 3, /* example: $ */ +}; -struct built_in_command { - const char *cmd; /* name */ - const char *descr; /* description */ - int (*function) (char **argv); /* function ptr */ +#define HUSH_VER_STR "0.02" + +/* "Globals" within this file */ + +/* Sorted roughly by size (smaller offsets == smaller code) */ +struct globals { +#if ENABLE_HUSH_INTERACTIVE + /* 'interactive_fd' is a fd# open to ctty, if we have one + * _AND_ if we decided to act interactively */ + int interactive_fd; + const char *PS1; + const char *PS2; +#endif +#if ENABLE_FEATURE_EDITING + line_input_t *line_input_state; +#endif +#if ENABLE_HUSH_JOB + int run_list_level; + pid_t saved_task_pgrp; + pid_t saved_tty_pgrp; + int last_jobid; + struct pipe *job_list; + struct pipe *toplevel_list; + smallint ctrl_z_flag; +#endif + smallint fake_mode; + /* these three support $?, $#, and $1 */ + char **global_argv; + int global_argc; + int last_return_code; + const char *ifs; + const char *cwd; + unsigned last_bg_pid; + struct variable *top_var; /* = &shell_ver (set in main()) */ + struct variable shell_ver; +#if ENABLE_FEATURE_SH_STANDALONE + struct nofork_save_area nofork_save; +#endif +#if ENABLE_HUSH_JOB + sigjmp_buf toplevel_jb; +#endif + unsigned char charmap[256]; + char user_input_buf[ENABLE_FEATURE_EDITING ? BUFSIZ : 2]; }; -static void __syntax(int line) +#define G (*ptr_to_globals) + +#if !ENABLE_HUSH_INTERACTIVE +enum { interactive_fd = 0 }; +#endif +#if !ENABLE_HUSH_JOB +enum { run_list_level = 0 }; +#endif + +#if ENABLE_HUSH_INTERACTIVE +#define interactive_fd (G.interactive_fd ) +#define PS1 (G.PS1 ) +#define PS2 (G.PS2 ) +#endif +#if ENABLE_FEATURE_EDITING +#define line_input_state (G.line_input_state) +#endif +#if ENABLE_HUSH_JOB +#define run_list_level (G.run_list_level ) +#define saved_task_pgrp (G.saved_task_pgrp ) +#define saved_tty_pgrp (G.saved_tty_pgrp ) +#define last_jobid (G.last_jobid ) +#define job_list (G.job_list ) +#define toplevel_list (G.toplevel_list ) +#define toplevel_jb (G.toplevel_jb ) +#define ctrl_z_flag (G.ctrl_z_flag ) +#endif /* JOB */ +#define global_argv (G.global_argv ) +#define global_argc (G.global_argc ) +#define last_return_code (G.last_return_code) +#define ifs (G.ifs ) +#define fake_mode (G.fake_mode ) +#define cwd (G.cwd ) +#define last_bg_pid (G.last_bg_pid ) +#define top_var (G.top_var ) +#define shell_ver (G.shell_ver ) +#if ENABLE_FEATURE_SH_STANDALONE +#define nofork_save (G.nofork_save ) +#endif +#if ENABLE_HUSH_JOB +#define toplevel_jb (G.toplevel_jb ) +#endif +#define charmap (G.charmap ) +#define user_input_buf (G.user_input_buf ) +#define INIT_G() do { \ + SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ +} while (0) + + +#define B_CHUNK 100 +#define B_NOSPAC 1 +#define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n" + +#if 1 +/* Normal */ +static void syntax(const char *msg) { - bb_error_msg("syntax error hush.c:%d", line); + /* Was using fancy stuff: + * (interactive_fd ? bb_error_msg : bb_error_msg_and_die)(...params...) + * but it SEGVs. ?! Oh well... explicit temp ptr works around that */ + void (*fp)(const char *s, ...); + + fp = (interactive_fd ? bb_error_msg : bb_error_msg_and_die); + fp(msg ? "%s: %s" : "syntax error", "syntax error", msg); } -#define syntax() __syntax(__LINE__) -/* Index of subroutines: */ -/* function prototypes for builtins */ -static int builtin_cd(char **argv); -static int builtin_eval(char **argv); -static int builtin_exec(char **argv); -static int builtin_exit(char **argv); -static int builtin_export(char **argv); -#if ENABLE_HUSH_JOB -static int builtin_fg_bg(char **argv); -static int builtin_jobs(char **argv); +#else +/* Debug */ +static void syntax_lineno(int line) +{ + void (*fp)(const char *s, ...); + + fp = (interactive_fd ? bb_error_msg : bb_error_msg_and_die); + fp("syntax error hush.c:%d", line); +} +#define syntax(str) syntax_lineno(__LINE__) #endif -static int builtin_help(char **argv); -static int builtin_pwd(char **argv); -static int builtin_read(char **argv); -static int builtin_set(char **argv); -static int builtin_shift(char **argv); -static int builtin_source(char **argv); -static int builtin_umask(char **argv); -static int builtin_unset(char **argv); -static int builtin_not_written(char **argv); + +/* Index of subroutines: */ /* o_string manipulation: */ static int b_check_space(o_string *o, int len); static int b_addchr(o_string *o, int ch); @@ -391,10 +507,6 @@ static int file_get(struct in_str *i); static int file_peek(struct in_str *i); static void setup_file_in_str(struct in_str *i, FILE *f); static void setup_string_in_str(struct in_str *i, const char *s); -/* close_me manipulations: */ -static void mark_open(int fd); -static void mark_closed(int fd); -static void close_all(void); /* "run" the final data structures: */ #if !defined(DEBUG_CLEAN) #define free_pipe_list(head, indent) free_pipe_list(head) @@ -404,14 +516,14 @@ static int free_pipe_list(struct pipe *head, int indent); static int free_pipe(struct pipe *pi, int indent); /* really run the final data structures: */ static int setup_redirects(struct child_prog *prog, int squirrel[]); -static int run_list_real(struct pipe *pi); +static int run_list(struct pipe *pi); static void pseudo_exec_argv(char **argv) ATTRIBUTE_NORETURN; static void pseudo_exec(struct child_prog *child) ATTRIBUTE_NORETURN; -static int run_pipe_real(struct pipe *pi); +static int run_pipe(struct pipe *pi); /* extended glob support: */ -static int globhack(const char *src, int flags, glob_t *pglob); +static char **globhack(const char *src, char **strings); static int glob_needed(const char *s); -static int xglob(o_string *dest, int flags, glob_t *pglob); +static int xglob(o_string *dest, char ***pglob); /* variable assignment: */ static int is_assignment(const char *s); /* data structure manipulation: */ @@ -423,16 +535,17 @@ static int done_pipe(struct p_context *ctx, pipe_style type); /* primary string parsing: */ static int redirect_dup_num(struct in_str *input); static int redirect_opt_num(o_string *o); +#if ENABLE_HUSH_TICK static int process_command_subs(o_string *dest, struct p_context *ctx, struct in_str *input, const char *subst_end); +#endif static int parse_group(o_string *dest, struct p_context *ctx, struct in_str *input, int ch); static const char *lookup_param(const char *src); -static char *make_string(char **inp); static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *input); static int parse_stream(o_string *dest, struct p_context *ctx, struct in_str *input0, const char *end_trigger); /* setup: */ -static int parse_stream_outer(struct in_str *inp, int parse_flag); -static int parse_string_outer(const char *s, int parse_flag); -static int parse_file_outer(FILE *f); +static int parse_and_run_stream(struct in_str *inp, int parse_flag); +static int parse_and_run_string(const char *s, int parse_flag); +static int parse_and_run_file(FILE *f); /* job management: */ static int checkjobs(struct pipe* fg_pipe); #if ENABLE_HUSH_JOB @@ -444,85 +557,179 @@ static void delete_finished_bg_job(struct pipe *pi); int checkjobs_and_fg_shell(struct pipe* fg_pipe); /* never called */ #endif /* local variable support */ -static char **do_variable_expansion(char **argv); -static char *insert_var_value(char *inp); -static const char *get_local_var(const char *var); -static int set_local_var(const char *s, int flg_export); +static char **expand_strvec_to_strvec(char **argv); +/* used for eval */ +static char *expand_strvec_to_string(char **argv); +/* used for expansion of right hand of assignments */ +static char *expand_string_to_string(const char *str); +static struct variable *get_local_var(const char *name); +static int set_local_var(char *str, int flg_export); static void unset_local_var(const char *name); + +static char **add_strings_to_strings(int need_xstrdup, char **strings, char **add) +{ + int i; + unsigned count1; + unsigned count2; + char **v; + + v = strings; + count1 = 0; + if (v) { + while (*v) { + count1++; + v++; + } + } + count2 = 0; + v = add; + while (*v) { + count2++; + v++; + } + v = xrealloc(strings, (count1 + count2 + 1) * sizeof(char*)); + v[count1 + count2] = NULL; + i = count2; + while (--i >= 0) + v[count1 + i] = need_xstrdup ? xstrdup(add[i]) : add[i]; + return v; +} + +/* 'add' should be a malloced pointer */ +static char **add_string_to_strings(char **strings, char *add) +{ + char *v[2]; + + v[0] = add; + v[1] = NULL; + + return add_strings_to_strings(0, strings, v); +} + +static void free_strings(char **strings) +{ + if (strings) { + char **v = strings; + while (*v) + free(*v++); + free(strings); + } +} + + +/* Function prototypes for builtins */ +static int builtin_cd(char **argv); +static int builtin_echo(char **argv); +static int builtin_eval(char **argv); +static int builtin_exec(char **argv); +static int builtin_exit(char **argv); +static int builtin_export(char **argv); +#if ENABLE_HUSH_JOB +static int builtin_fg_bg(char **argv); +static int builtin_jobs(char **argv); +#endif +#if ENABLE_HUSH_HELP +static int builtin_help(char **argv); +#endif +static int builtin_pwd(char **argv); +static int builtin_read(char **argv); +static int builtin_test(char **argv); +static int builtin_set(char **argv); +static int builtin_shift(char **argv); +static int builtin_source(char **argv); +static int builtin_umask(char **argv); +static int builtin_unset(char **argv); +//static int builtin_not_written(char **argv); + /* Table of built-in functions. They can be forked or not, depending on * context: within pipes, they fork. As simple commands, they do not. * When used in non-forking context, they can change global variables * in the parent shell process. If forked, of course they cannot. * For example, 'unset foo | whatever' will parse and run, but foo will * still be set at the end. */ +struct built_in_command { + const char *cmd; /* name */ + int (*function) (char **argv); /* function ptr */ +#if ENABLE_HUSH_HELP + const char *descr; /* description */ +#define BLTIN(cmd, func, help) { cmd, func, help } +#else +#define BLTIN(cmd, func, help) { cmd, func } +#endif +}; + +/* For now, echo and test are unconditionally enabled. + * Maybe make it configurable? */ static const struct built_in_command bltins[] = { + BLTIN("[" , builtin_test, "Test condition"), + BLTIN("[[" , builtin_test, "Test condition"), #if ENABLE_HUSH_JOB - { "bg", "Resume a job in the background", builtin_fg_bg }, -#endif - { "break", "Exit for, while or until loop", builtin_not_written }, - { "cd", "Change working directory", builtin_cd }, - { "continue", "Continue for, while or until loop", builtin_not_written }, - { "eval", "Construct and run shell command", builtin_eval }, - { "exec", "Exec command, replacing this shell with the exec'd process", - builtin_exec }, - { "exit", "Exit from shell()", builtin_exit }, - { "export", "Set environment variable", builtin_export }, + BLTIN("bg" , builtin_fg_bg, "Resume a job in the background"), +#endif +// BLTIN("break" , builtin_not_written, "Exit for, while or until loop"), + BLTIN("cd" , builtin_cd, "Change working directory"), +// BLTIN("continue", builtin_not_written, "Continue for, while or until loop"), + BLTIN("echo" , builtin_echo, "Write strings to stdout"), + BLTIN("eval" , builtin_eval, "Construct and run shell command"), + BLTIN("exec" , builtin_exec, "Exec command, replacing this shell with the exec'd process"), + BLTIN("exit" , builtin_exit, "Exit from shell"), + BLTIN("export", builtin_export, "Set environment variable"), #if ENABLE_HUSH_JOB - { "fg", "Bring job into the foreground", builtin_fg_bg }, - { "jobs", "Lists the active jobs", builtin_jobs }, -#endif - { "pwd", "Print current directory", builtin_pwd }, - { "read", "Input environment variable", builtin_read }, - { "return", "Return from a function", builtin_not_written }, - { "set", "Set/unset shell local variables", builtin_set }, - { "shift", "Shift positional parameters", builtin_shift }, - { "trap", "Trap signals", builtin_not_written }, - { "ulimit","Controls resource limits", builtin_not_written }, - { "umask","Sets file creation mask", builtin_umask }, - { "unset", "Unset environment variable", builtin_unset }, - { ".", "Source-in and run commands in a file", builtin_source }, - { "help", "List shell built-in commands", builtin_help }, - { NULL, NULL, NULL } + BLTIN("fg" , builtin_fg_bg, "Bring job into the foreground"), + BLTIN("jobs" , builtin_jobs, "Lists the active jobs"), +#endif +// TODO: remove pwd? we have it as an applet... + BLTIN("pwd" , builtin_pwd, "Print current directory"), + BLTIN("read" , builtin_read, "Input environment variable"), +// BLTIN("return", builtin_not_written, "Return from a function"), + BLTIN("set" , builtin_set, "Set/unset shell local variables"), + BLTIN("shift" , builtin_shift, "Shift positional parameters"), +// BLTIN("trap" , builtin_not_written, "Trap signals"), + BLTIN("test" , builtin_test, "Test condition"), +// BLTIN("ulimit", builtin_not_written, "Controls resource limits"), + BLTIN("umask" , builtin_umask, "Sets file creation mask"), + BLTIN("unset" , builtin_unset, "Unset environment variable"), + BLTIN("." , builtin_source, "Source-in and run commands in a file"), +#if ENABLE_HUSH_HELP + BLTIN("help" , builtin_help, "List shell built-in commands"), +#endif + BLTIN(NULL, NULL, NULL) }; #if ENABLE_HUSH_JOB -/* move to libbb? */ -static void signal_SA_RESTART(int sig, void (*handler)(int)) -{ - struct sigaction sa; - sa.sa_handler = handler; - sa.sa_flags = SA_RESTART; - sigemptyset(&sa.sa_mask); - sigaction(sig, &sa, NULL); -} - /* Signals are grouped, we handle them in batches */ static void set_fatal_sighandler(void (*handler)(int)) { - signal(SIGILL , handler); - signal(SIGTRAP, handler); - signal(SIGABRT, handler); - signal(SIGFPE , handler); - signal(SIGBUS , handler); - signal(SIGSEGV, handler); + bb_signals(0 + + (1 << SIGILL) + + (1 << SIGTRAP) + + (1 << SIGABRT) + + (1 << SIGFPE) + + (1 << SIGBUS) + + (1 << SIGSEGV) /* bash 3.2 seems to handle these just like 'fatal' ones */ - signal(SIGHUP , handler); - signal(SIGPIPE, handler); - signal(SIGALRM, handler); + + (1 << SIGHUP) + + (1 << SIGPIPE) + + (1 << SIGALRM) + , handler); } static void set_jobctrl_sighandler(void (*handler)(int)) { - signal(SIGTSTP, handler); - signal(SIGTTIN, handler); - signal(SIGTTOU, handler); + bb_signals(0 + + (1 << SIGTSTP) + + (1 << SIGTTIN) + + (1 << SIGTTOU) + , handler); } static void set_misc_sighandler(void (*handler)(int)) { - signal(SIGINT , handler); - signal(SIGQUIT, handler); - signal(SIGTERM, handler); + bb_signals(0 + + (1 << SIGINT) + + (1 << SIGQUIT) + + (1 << SIGTERM) + , handler); } /* SIGCHLD is special and handled separately */ @@ -534,13 +741,6 @@ static void set_every_sighandler(void (*handler)(int)) signal(SIGCHLD, handler); } -static struct pipe *toplevel_list; -static sigjmp_buf toplevel_jb; -smallint ctrl_z_flag; -#if ENABLE_FEATURE_SH_STANDALONE -struct nofork_save_area nofork_save; -#endif - static void handler_ctrl_c(int sig) { debug_printf_jobs("got sig %d\n", sig); @@ -558,6 +758,8 @@ static void handler_ctrl_z(int sig) return; ctrl_z_flag = 1; if (!pid) { /* child */ + if (ENABLE_HUSH_JOB) + die_sleep = 0; /* let nofork's xfuncs die */ setpgrp(); debug_printf_jobs("set pgrp for child %d ok\n", getpid()); set_every_sighandler(SIG_DFL); @@ -586,11 +788,8 @@ static void handler_ctrl_z(int sig) static void sigexit(int sig) ATTRIBUTE_NORETURN; static void sigexit(int sig) { - sigset_t block_all; - /* Disable all signals: job control, SIGPIPE, etc. */ - sigfillset(&block_all); - sigprocmask(SIG_SETMASK, &block_all, NULL); + sigprocmask_allsigs(SIG_BLOCK); if (interactive_fd) tcsetpgrp(interactive_fd, saved_tty_pgrp); @@ -599,12 +798,7 @@ static void sigexit(int sig) if (sig <= 0) _exit(- sig); - /* Enable only this sig and kill ourself with it */ - signal(sig, SIG_DFL); - sigdelset(&block_all, sig); - sigprocmask(SIG_SETMASK, &block_all, NULL); - raise(sig); - _exit(1); /* Should not reach it */ + kill_myself_with_sig(sig); /* does not return */ } /* Restores tty foreground process group, and exits. */ @@ -635,16 +829,38 @@ static const char *set_cwd(void) return cwd; } + +/* built-in 'test' handler */ +static int builtin_test(char **argv) +{ + int argc = 0; + while (*argv) { + argc++; + argv++; + } + return test_main(argc, argv - argc); +} + +/* built-in 'test' handler */ +static int builtin_echo(char **argv) +{ + int argc = 0; + while (*argv) { + argc++; + argv++; + } + return echo_main(argc, argv - argc); +} + /* built-in 'eval' handler */ static int builtin_eval(char **argv) { - char *str = NULL; int rcode = EXIT_SUCCESS; if (argv[1]) { - str = make_string(argv + 1); - parse_string_outer(str, FLAG_EXIT_FROM_LOOP | - FLAG_PARSE_SEMICOLON); + char *str = expand_strvec_to_string(argv + 1); + parse_and_run_string(str, PARSEFLAG_EXIT_FROM_LOOP | + PARSEFLAG_SEMICOLON); free(str); rcode = last_return_code; } @@ -654,10 +870,12 @@ static int builtin_eval(char **argv) /* built-in 'cd ' handler */ static int builtin_cd(char **argv) { - char *newdir; - if (argv[1] == NULL) - newdir = getenv("HOME"); - else + const char *newdir; + if (argv[1] == NULL) { + // bash does nothing (exitcode 0) if HOME is ""; if it's unset, + // bash says "bash: cd: HOME not set" and does nothing (exitcode 1) + newdir = getenv("HOME") ? : "/"; + } else newdir = argv[1]; if (chdir(newdir)) { printf("cd: %s: %s\n", newdir, strerror(errno)); @@ -695,7 +913,7 @@ static int builtin_exit(char **argv) /* built-in 'export VAR=value' handler */ static int builtin_export(char **argv) { - int res = 0; + const char *value; char *name = argv[1]; if (name == NULL) { @@ -710,36 +928,23 @@ static int builtin_export(char **argv) return EXIT_SUCCESS; } - name = xstrdup(name); - { - const char *value = strchr(name, '='); - - if (!value) { - char *tmp; - /* They are exporting something without an =VALUE */ - - value = get_local_var(name); - if (value) { - size_t ln = strlen(name); + value = strchr(name, '='); + if (!value) { + /* They are exporting something without a =VALUE */ + struct variable *var; - tmp = xrealloc(name, ln+strlen(value)+2); - sprintf(tmp+ln, "=%s", value); - name = tmp; - } else { - /* bash does not return an error when trying to export - * an undefined variable. Do likewise. */ - res = 1; - } + var = get_local_var(name); + if (var) { + var->flg_export = 1; + putenv(var->varstr); } + /* bash does not return an error when trying to export + * an undefined variable. Do likewise. */ + return EXIT_SUCCESS; } - if (res < 0) - bb_perror_msg("export"); - else if (res == 0) - res = set_local_var(name, 1); - else - res = 0; - free(name); - return res; + + set_local_var(xstrdup(name), 1); + return EXIT_SUCCESS; } #if ENABLE_HUSH_JOB @@ -807,6 +1012,7 @@ static int builtin_fg_bg(char **argv) #endif /* built-in 'help' handler */ +#if ENABLE_HUSH_HELP static int builtin_help(char **argv ATTRIBUTE_UNUSED) { const struct built_in_command *x; @@ -814,13 +1020,12 @@ static int builtin_help(char **argv ATTRIBUTE_UNUSED) printf("\nBuilt-in commands:\n"); printf("-------------------\n"); for (x = bltins; x->cmd; x++) { - if (x->descr == NULL) - continue; printf("%s\t%s\n", x->cmd, x->descr); } printf("\n\n"); return EXIT_SUCCESS; } +#endif #if ENABLE_HUSH_JOB /* built-in 'jobs' handler */ @@ -851,20 +1056,10 @@ static int builtin_pwd(char **argv ATTRIBUTE_UNUSED) /* built-in 'read VAR' handler */ static int builtin_read(char **argv) { - char string[BUFSIZ]; - char *p; + char *string; const char *name = argv[1] ? argv[1] : "REPLY"; - int name_len = strlen(name); - if (name_len >= sizeof(string) - 2) - return EXIT_FAILURE; - strcpy(string, name); - p = string + name_len; - *p++ = '='; - *p = '\0'; /* In case stdin has only EOF */ - /* read string. name_len+1 chars are already used by 'name=' */ - fgets(p, sizeof(string) - 1 - name_len, stdin); - chomp(p); + string = xmalloc_reads(STDIN_FILENO, xasprintf("%s=", name)); return set_local_var(string, 0); } @@ -872,13 +1067,13 @@ static int builtin_read(char **argv) static int builtin_set(char **argv) { char *temp = argv[1]; - struct variables *e; + struct variable *e; if (temp == NULL) - for (e = top_vars; e; e = e->next) - printf("%s=%s\n", e->name, e->value); + for (e = top_var; e; e = e->next) + puts(e->varstr); else - set_local_var(temp, 0); + set_local_var(xstrdup(temp), 0); return EXIT_SUCCESS; } @@ -892,7 +1087,7 @@ static int builtin_shift(char **argv) n = atoi(argv[1]); } if (n >= 0 && n < global_argc) { - /* XXX This probably breaks $0 */ + global_argv[n] = global_argv[0]; global_argc -= n; global_argv += n; return EXIT_SUCCESS; @@ -915,14 +1110,13 @@ static int builtin_source(char **argv) bb_error_msg("cannot open '%s'", argv[1]); return EXIT_FAILURE; } + close_on_exec_on(fileno(input)); /* Now run the file */ /* XXX argv and argc are broken; need to save old global_argv * (pointer only is OK!) on this stack frame, * set global_argv=argv+1, recurse, and restore. */ - mark_open(fileno(input)); - status = parse_file_outer(input); - mark_closed(fileno(input)); + status = parse_and_run_file(input); fclose(input); return status; } @@ -953,11 +1147,11 @@ static int builtin_unset(char **argv) return EXIT_SUCCESS; } -static int builtin_not_written(char **argv) -{ - printf("builtin_%s not written\n", argv[0]); - return EXIT_FAILURE; -} +//static int builtin_not_written(char **argv) +//{ +// printf("builtin_%s not written\n", argv[0]); +// return EXIT_FAILURE; +//} static int b_check_space(o_string *o, int len) { @@ -986,16 +1180,14 @@ static void b_reset(o_string *o) { o->length = 0; o->nonnull = 0; - if (o->data != NULL) - *o->data = '\0'; + if (o->data) + o->data[0] = '\0'; } static void b_free(o_string *o) { - b_reset(o); free(o->data); - o->data = NULL; - o->maxlen = 0; + memset(o, 0, sizeof(*o)); } /* My analysis of quoting semantics tells me that state information @@ -1044,56 +1236,45 @@ static const char* setup_prompt_string(int promptmode) debug_printf("setup_prompt_string %d ", promptmode); #if !ENABLE_FEATURE_EDITING_FANCY_PROMPT /* Set up the prompt */ - if (promptmode == 1) { - char *ns; + if (promptmode == 0) { /* PS1 */ free((char*)PS1); - ns = xmalloc(strlen(cwd)+4); - sprintf(ns, "%s %s", cwd, (geteuid() != 0) ? "$ " : "# "); - prompt_str = ns; - PS1 = ns; + PS1 = xasprintf("%s %c ", cwd, (geteuid() != 0) ? '$' : '#'); + prompt_str = PS1; } else { prompt_str = PS2; } #else - prompt_str = (promptmode == 1) ? PS1 : PS2; + prompt_str = (promptmode == 0) ? PS1 : PS2; #endif - debug_printf("result %s\n", prompt_str); + debug_printf("result '%s'\n", prompt_str); return prompt_str; } -#if ENABLE_FEATURE_EDITING -static line_input_t *line_input_state; -#endif - static void get_user_input(struct in_str *i) { - static char the_command[ENABLE_FEATURE_EDITING ? BUFSIZ : 2]; - int r; const char *prompt_str; prompt_str = setup_prompt_string(i->promptmode); #if ENABLE_FEATURE_EDITING - /* - ** enable command line editing only while a command line - ** is actually being read; otherwise, we'll end up bequeathing - ** atexit() handlers and other unwanted stuff to our - ** child processes (rob@sysgo.de) - */ - r = read_line_input(prompt_str, the_command, BUFSIZ-1, line_input_state); + /* Enable command line editing only while a command line + * is actually being read */ + do { + r = read_line_input(prompt_str, user_input_buf, BUFSIZ-1, line_input_state); + } while (r == 0); /* repeat if Ctrl-C */ i->eof_flag = (r < 0); if (i->eof_flag) { /* EOF/error detected */ - the_command[0] = EOF; /* yes, it will be truncated, it's ok */ - the_command[1] = '\0'; + user_input_buf[0] = EOF; /* yes, it will be truncated, it's ok */ + user_input_buf[1] = '\0'; } #else fputs(prompt_str, stdout); fflush(stdout); - the_command[0] = r = fgetc(i->file); - /*the_command[1] = '\0'; - already is and never changed */ + user_input_buf[0] = r = fgetc(i->file); + /*user_input_buf[1] = '\0'; - already is and never changed */ i->eof_flag = (r == EOF); #endif - i->p = the_command; + i->p = user_input_buf; } #endif /* INTERACTIVE */ @@ -1105,7 +1286,9 @@ static int file_get(struct in_str *i) /* If there is data waiting, eat it up */ if (i->p && *i->p) { +#if ENABLE_HUSH_INTERACTIVE take_cached: +#endif ch = *i->p++; if (i->eof_flag && !*i->p) ch = EOF; @@ -1113,23 +1296,21 @@ static int file_get(struct in_str *i) /* need to double check i->file because we might be doing something * more complicated by now, like sourcing or substituting. */ #if ENABLE_HUSH_INTERACTIVE - if (interactive_fd && i->__promptme && i->file == stdin) { + if (interactive_fd && i->promptme && i->file == stdin) { do { get_user_input(i); } while (!*i->p); /* need non-empty line */ - i->promptmode = 2; - i->__promptme = 0; + i->promptmode = 1; /* PS2 */ + i->promptme = 0; goto take_cached; - } else -#endif - { - ch = fgetc(i->file); } +#endif + ch = fgetc(i->file); } debug_printf("file_get: got a '%c' %d\n", ch, ch); #if ENABLE_HUSH_INTERACTIVE if (ch == '\n') - i->__promptme = 1; + i->promptme = 1; #endif return ch; } @@ -1159,8 +1340,8 @@ static void setup_file_in_str(struct in_str *i, FILE *f) i->peek = file_peek; i->get = file_get; #if ENABLE_HUSH_INTERACTIVE - i->__promptme = 1; - i->promptmode = 1; + i->promptme = 1; + i->promptmode = 0; /* PS1 */ #endif i->file = f; i->p = NULL; @@ -1171,40 +1352,13 @@ static void setup_string_in_str(struct in_str *i, const char *s) i->peek = static_peek; i->get = static_get; #if ENABLE_HUSH_INTERACTIVE - i->__promptme = 1; - i->promptmode = 1; + i->promptme = 1; + i->promptmode = 0; /* PS1 */ #endif i->p = s; i->eof_flag = 0; } -static void mark_open(int fd) -{ - struct close_me *new = xmalloc(sizeof(struct close_me)); - new->fd = fd; - new->next = close_me_head; - close_me_head = new; -} - -static void mark_closed(int fd) -{ - struct close_me *tmp; - if (close_me_head == NULL || close_me_head->fd != fd) - bb_error_msg_and_die("corrupt close_me"); - tmp = close_me_head; - close_me_head = close_me_head->next; - free(tmp); -} - -static void close_all(void) -{ - struct close_me *c; - for (c = close_me_head; c; c = c->next) { - close(c->fd); - } - close_me_head = NULL; -} - /* squirrel != NULL means we squirrel away copies of stdin, stdout, * and stderr if they are redirected. */ static int setup_redirects(struct child_prog *prog, int squirrel[]) @@ -1213,13 +1367,16 @@ static int setup_redirects(struct child_prog *prog, int squirrel[]) struct redir_struct *redir; for (redir = prog->redirects; redir; redir = redir->next) { - if (redir->dup == -1 && redir->word.gl_pathv == NULL) { + if (redir->dup == -1 && redir->glob_word == NULL) { /* something went wrong in the parse. Pretend it didn't happen */ continue; } if (redir->dup == -1) { + char *p; mode = redir_table[redir->type].mode; - openfd = open_or_warn(redir->word.gl_pathv[0], mode); + p = expand_string_to_string(redir->glob_word[0]); + openfd = open_or_warn(p, mode); + free(p); 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!) */ @@ -1234,7 +1391,7 @@ static int setup_redirects(struct child_prog *prog, int squirrel[]) squirrel[redir->fd] = dup(redir->fd); } if (openfd == -3) { - close(openfd); + //close(openfd); // close(-3) ??! } else { dup2(openfd, redir->fd); if (redir->dup == -1) @@ -1257,8 +1414,9 @@ static void restore_redirects(int squirrel[]) } } -/* never returns */ -/* XXX no exit() here. If you don't exec, use _exit instead. +/* Called after [v]fork() in run_pipe(), or from builtin_exec(). + * Never returns. + * XXX no exit() here. If you don't exec, use _exit instead. * The at_exit handlers apparently confuse the calling process, * in particular stdin handling. Not sure why? -- because of vfork! (vda) */ static void pseudo_exec_argv(char **argv) @@ -1271,18 +1429,17 @@ static void pseudo_exec_argv(char **argv) debug_printf_exec("pid %d environment modification: %s\n", getpid(), argv[i]); // FIXME: vfork case?? - p = insert_var_value(argv[i]); - putenv(p == argv[i] ? xstrdup(p) : p); + p = expand_string_to_string(argv[i]); + putenv(p); } argv += i; /* If a variable is assigned in a forest, and nobody listens, * was it ever really set? */ - if (argv[0] == NULL) { + if (!argv[0]) _exit(EXIT_SUCCESS); - } - argv = do_variable_expansion(argv); + argv = expand_strvec_to_strvec(argv); /* * Check if the command matches any of the builtins. @@ -1302,17 +1459,16 @@ static void pseudo_exec_argv(char **argv) /* Check if the command matches any busybox applets */ #if ENABLE_FEATURE_SH_STANDALONE if (strchr(argv[0], '/') == NULL) { - const struct bb_applet *a = find_applet_by_name(argv[0]); - if (a) { - if (a->noexec) { - current_applet = a; + int a = find_applet_by_name(argv[0]); + if (a >= 0) { + if (APPLET_IS_NOEXEC(a)) { debug_printf_exec("running applet '%s'\n", argv[0]); -// is it ok that run_current_applet_and_exit() does exit(), not _exit()? - run_current_applet_and_exit(argv); +// is it ok that run_applet_no_and_exit() does exit(), not _exit()? + run_applet_no_and_exit(a, argv); } /* re-exec ourselves with the new arguments */ debug_printf_exec("re-execing applet '%s'\n", argv[0]); - execvp(CONFIG_BUSYBOX_EXEC_PATH, argv); + execvp(bb_busybox_exec_path, argv); /* If they called chroot or otherwise made the binary no longer * executable, fall through */ } @@ -1325,27 +1481,33 @@ static void pseudo_exec_argv(char **argv) _exit(1); } +/* Called after [v]fork() in run_pipe() + */ static void pseudo_exec(struct child_prog *child) { // FIXME: buggy wrt NOMMU! Must not modify any global data -// until it does exec/_exit, but currently it does. - int rcode; - - if (child->argv) { +// until it does exec/_exit, but currently it does +// (puts malloc'ed stuff into environment) + if (child->argv) pseudo_exec_argv(child->argv); - } if (child->group) { - // FIXME: do not modify globals! Think vfork! +#if !BB_MMU + bb_error_msg_and_die("nested lists are not supported on NOMMU"); +#else + int rcode; + #if ENABLE_HUSH_INTERACTIVE - debug_printf_exec("pseudo_exec: setting interactive_fd=0\n"); - interactive_fd = 0; /* crucial!!!! */ +// run_list_level now takes care of it? +// debug_printf_exec("pseudo_exec: setting interactive_fd=0\n"); +// interactive_fd = 0; /* crucial!!!! */ #endif - debug_printf_exec("pseudo_exec: run_list_real\n"); - rcode = run_list_real(child->group); + debug_printf_exec("pseudo_exec: run_list\n"); + rcode = run_list(child->group); /* OK to leak memory by not calling free_pipe_list, * since this process is about to exit */ _exit(rcode); +#endif } /* Can happen. See what bash does with ">foo" by itself. */ @@ -1483,6 +1645,7 @@ static int checkjobs(struct pipe* fg_pipe) // + killall -STOP cat wait_more: +// TODO: safe_waitpid? while ((childpid = waitpid(-1, &status, attributes)) > 0) { const int dead = WIFEXITED(status) || WIFSIGNALED(status); @@ -1507,7 +1670,7 @@ static int checkjobs(struct pipe* fg_pipe) if (dead) { fg_pipe->progs[i].pid = 0; fg_pipe->running_progs--; - if (i == fg_pipe->num_progs-1) + if (i == fg_pipe->num_progs - 1) /* last process gives overall exitstatus */ rcode = WEXITSTATUS(status); } else { @@ -1580,21 +1743,21 @@ static int checkjobs_and_fg_shell(struct pipe* fg_pipe) pid_t p; int rcode = checkjobs(fg_pipe); /* Job finished, move the shell to the foreground */ - p = getpgid(0); - debug_printf("fg'ing ourself: getpgid(0)=%d\n", (int)p); + p = getpgid(0); /* pgid of our process */ + debug_printf_jobs("fg'ing ourself: getpgid(0)=%d\n", (int)p); if (tcsetpgrp(interactive_fd, p) && errno != ENOTTY) bb_perror_msg("tcsetpgrp-4a"); return rcode; } #endif -/* run_pipe_real() starts all the jobs, but doesn't wait for anything +/* run_pipe() starts all the jobs, but doesn't wait for anything * to finish. See checkjobs(). * * return code is normally -1, when the caller has to wait for children * to finish to determine the exit status of the pipe. If the pipe * is a simple builtin command, however, the action is done by the - * time run_pipe_real returns, and the exit code is provided as the + * time run_pipe returns, and the exit code is provided as the * return value. * * The input of the pipe is always stdin, the output is always @@ -1603,12 +1766,15 @@ static int checkjobs_and_fg_shell(struct pipe* fg_pipe) * subshell, when that is in fact necessary. The subshell process * now has its stdout directed to the input of the appropriate pipe, * so this routine is noticeably simpler. + * + * Returns -1 only if started some children. IOW: we have to + * mask out retvals of builtins etc with 0xff! */ -static int run_pipe_real(struct pipe *pi) +static int run_pipe(struct pipe *pi) { int i; - int nextin, nextout; - int pipefds[2]; /* pipefds[0] is for reading */ + int nextin; + int pipefds[2]; /* pipefds[0] is for reading */ struct child_prog *child; const struct built_in_command *x; char *p; @@ -1617,9 +1783,8 @@ static int run_pipe_real(struct pipe *pi) int rcode; const int single_fg = (pi->num_progs == 1 && pi->followup != PIPE_BG); - debug_printf_exec("run_pipe_real start: single_fg=%d\n", single_fg); + debug_printf_exec("run_pipe start: single_fg=%d\n", single_fg); - nextin = 0; #if ENABLE_HUSH_JOB pi->pgrp = -1; #endif @@ -1634,10 +1799,10 @@ static int run_pipe_real(struct pipe *pi) if (single_fg && child->group && child->subshell == 0) { debug_printf("non-subshell grouping\n"); setup_redirects(child, squirrel); - debug_printf_exec(": run_list_real\n"); - rcode = run_list_real(child->group); + debug_printf_exec(": run_list\n"); + rcode = run_list(child->group) & 0xff; restore_redirects(squirrel); - debug_printf_exec("run_pipe_real return %d\n", rcode); + debug_printf_exec("run_pipe return %d\n", rcode); return rcode; } @@ -1650,38 +1815,16 @@ static int run_pipe_real(struct pipe *pi) if (i != 0 && argv[i] == NULL) { /* assignments, but no command: set the local environment */ for (i = 0; argv[i] != NULL; i++) { - /* Ok, this case is tricky. We have to decide if this is a - * local variable, or an already exported variable. If it is - * already exported, we have to export the new value. If it is - * not exported, we need only set this as a local variable. - * This junk is all to decide whether or not to export this - * variable. */ - int export_me = 0; - char *name, *value; - name = xstrdup(argv[i]); - debug_printf("local environment set: %s\n", name); - value = strchr(name, '='); - if (value) - *value = '\0'; - if (get_local_var(name)) { - export_me = 1; - } - free(name); - p = insert_var_value(argv[i]); - set_local_var(p, export_me); - if (p != argv[i]) - free(p); + debug_printf("local environment set: %s\n", argv[i]); + p = expand_string_to_string(argv[i]); + set_local_var(p, 0); } return EXIT_SUCCESS; /* don't worry about errors in set_local_var() yet */ } for (i = 0; is_assignment(argv[i]); i++) { - p = insert_var_value(argv[i]); - if (p != argv[i]) { - //sp: child->sp--; - putenv(p); - } else { - putenv(xstrdup(p)); - } + p = expand_string_to_string(argv[i]); + //sp: child->sp--; + putenv(p); } for (x = bltins; x->cmd; x++) { if (strcmp(argv[i], x->cmd) == 0) { @@ -1698,41 +1841,42 @@ static int run_pipe_real(struct pipe *pi) setup_redirects(child, squirrel); debug_printf_exec(": builtin '%s' '%s'...\n", x->cmd, argv[i+1]); //sp: if (child->sp) /* btw we can do it unconditionally... */ - argv_expanded = do_variable_expansion(argv + i); - rcode = x->function(argv_expanded); + argv_expanded = expand_strvec_to_strvec(argv + i); + rcode = x->function(argv_expanded) & 0xff; free(argv_expanded); restore_redirects(squirrel); - debug_printf_exec("run_pipe_real return %d\n", rcode); + debug_printf_exec("run_pipe return %d\n", rcode); return rcode; } } #if ENABLE_FEATURE_SH_STANDALONE { - const struct bb_applet *a = find_applet_by_name(argv[i]); - if (a && a->nofork) { + int a = find_applet_by_name(argv[i]); + if (a >= 0 && APPLET_IS_NOFORK(a)) { setup_redirects(child, squirrel); save_nofork_data(&nofork_save); argv_expanded = argv + i; //sp: if (child->sp) - argv_expanded = do_variable_expansion(argv + i); + argv_expanded = expand_strvec_to_strvec(argv + i); debug_printf_exec(": run_nofork_applet '%s' '%s'...\n", argv_expanded[0], argv_expanded[1]); - rcode = run_nofork_applet_prime(&nofork_save, a, argv_expanded); + rcode = run_nofork_applet_prime(&nofork_save, a, argv_expanded) & 0xff; free(argv_expanded); restore_redirects(squirrel); - debug_printf_exec("run_pipe_real return %d\n", rcode); + debug_printf_exec("run_pipe return %d\n", rcode); return rcode; } } #endif } - /* Going to fork a child per each pipe member */ - pi->running_progs = 0; - /* Disable job control signals for shell (parent) and * for initial child code after fork */ set_jobctrl_sighandler(SIG_IGN); + /* Going to fork a child per each pipe member */ + pi->running_progs = 0; + nextin = 0; + for (i = 0; i < pi->num_progs; i++) { child = &(pi->progs[i]); if (child->argv) @@ -1741,50 +1885,36 @@ static int run_pipe_real(struct pipe *pi) debug_printf_exec(": pipe member with no argv\n"); /* pipes are inserted between pairs of commands */ - if ((i + 1) < pi->num_progs) { - if (pipe(pipefds) < 0) - bb_perror_msg_and_die("pipe"); - nextout = pipefds[1]; - } else { - nextout = 1; - pipefds[0] = -1; - } + pipefds[0] = 0; + pipefds[1] = 1; + if ((i + 1) < pi->num_progs) + xpipe(pipefds); - /* XXX test for failed fork()? */ -#if BB_MMU - child->pid = fork(); -#else - child->pid = vfork(); -#endif + child->pid = BB_MMU ? fork() : vfork(); if (!child->pid) { /* child */ - /* Every child adds itself to new process group - * with pgid == pid of first child in pipe */ + if (ENABLE_HUSH_JOB) + die_sleep = 0; /* let nofork's xfuncs die */ #if ENABLE_HUSH_JOB - if (interactive_fd) { + /* Every child adds itself to new process group + * with pgid == pid_of_first_child_in_pipe */ + if (run_list_level == 1 && interactive_fd) { + pid_t pgrp; /* Don't do pgrp restore anymore on fatal signals */ set_fatal_sighandler(SIG_DFL); - if (pi->pgrp < 0) /* true for 1st process only */ - pi->pgrp = getpid(); - if (setpgid(0, pi->pgrp) == 0 && pi->followup != PIPE_BG) { + pgrp = pi->pgrp; + if (pgrp < 0) /* true for 1st process only */ + pgrp = getpid(); + if (setpgid(0, pgrp) == 0 && pi->followup != PIPE_BG) { /* We do it in *every* child, not just first, * to avoid races */ - tcsetpgrp(interactive_fd, pi->pgrp); + tcsetpgrp(interactive_fd, pgrp); } } #endif - /* in non-interactive case fatal sigs are already SIG_DFL */ - close_all(); - if (nextin != 0) { - dup2(nextin, 0); - close(nextin); - } - if (nextout != 1) { - dup2(nextout, 1); - close(nextout); - } - if (pipefds[0] != -1) { - close(pipefds[0]); /* opposite end of our output pipe */ - } + xmove_fd(nextin, 0); + xmove_fd(pipefds[1], 1); /* write end */ + if (pipefds[0] > 1) + close(pipefds[0]); /* read end */ /* Like bash, explicit redirects override pipes, * and the pipe fd is available for dup'ing. */ setup_redirects(child, NULL); @@ -1793,30 +1923,39 @@ static int run_pipe_real(struct pipe *pi) set_jobctrl_sighandler(SIG_DFL); set_misc_sighandler(SIG_DFL); signal(SIGCHLD, SIG_DFL); - pseudo_exec(child); + pseudo_exec(child); /* does not return */ } - pi->running_progs++; - + if (child->pid < 0) { /* [v]fork failed */ + /* Clearly indicate, was it fork or vfork */ + bb_perror_msg(BB_MMU ? "fork" : "vfork"); + } else { + pi->running_progs++; #if ENABLE_HUSH_JOB - /* Second and next children need to know pid of first one */ - if (pi->pgrp < 0) - pi->pgrp = child->pid; + /* Second and next children need to know pid of first one */ + if (pi->pgrp < 0) + pi->pgrp = child->pid; #endif - if (nextin != 0) - close(nextin); - if (nextout != 1) - close(nextout); + } - /* If there isn't another process, nextin is garbage - but it doesn't matter */ + if (i) + close(nextin); + if ((i + 1) < pi->num_progs) + close(pipefds[1]); /* write end */ + /* Pass read (output) pipe end to next iteration */ nextin = pipefds[0]; } - debug_printf_exec("run_pipe_real return -1\n"); + + if (!pi->running_progs) { + debug_printf_exec("run_pipe return 1 (all forks failed, no children)\n"); + return 1; + } + + debug_printf_exec("run_pipe return -1 (%u children started)\n", pi->running_progs); return -1; } -#ifndef debug_print_tree +#ifndef debug_print_tree static void debug_print_tree(struct pipe *pi, int lvl) { static const char *PIPE[] = { @@ -1827,26 +1966,31 @@ static void debug_print_tree(struct pipe *pi, int lvl) }; static const char *RES[] = { [RES_NONE ] = "NONE" , +#if ENABLE_HUSH_IF [RES_IF ] = "IF" , [RES_THEN ] = "THEN" , [RES_ELIF ] = "ELIF" , [RES_ELSE ] = "ELSE" , [RES_FI ] = "FI" , +#endif +#if ENABLE_HUSH_LOOPS [RES_FOR ] = "FOR" , [RES_WHILE] = "WHILE", [RES_UNTIL] = "UNTIL", [RES_DO ] = "DO" , [RES_DONE ] = "DONE" , - [RES_XXXX ] = "XXXX" , [RES_IN ] = "IN" , +#endif + [RES_XXXX ] = "XXXX" , [RES_SNTX ] = "SNTX" , }; int pin, prn; + pin = 0; while (pi) { - fprintf(stderr, "%*spipe %d r_mode=%s followup=%d %s\n", lvl*2, "", - pin, RES[pi->r_mode], pi->followup, PIPE[pi->followup]); + fprintf(stderr, "%*spipe %d res_word=%s followup=%d %s\n", lvl*2, "", + pin, RES[pi->res_word], pi->followup, PIPE[pi->followup]); prn = 0; while (prn < pi->num_progs) { struct child_prog *child = &pi->progs[prn]; @@ -1864,7 +2008,7 @@ static void debug_print_tree(struct pipe *pi, int lvl) if (argv) while (*argv) { fprintf(stderr, " '%s'", *argv); argv++; - } + } fprintf(stderr, "\n"); prn++; } @@ -1876,53 +2020,57 @@ static void debug_print_tree(struct pipe *pi, int lvl) /* NB: called by pseudo_exec, and therefore must not modify any * global data until exec/_exit (we can be a child after vfork!) */ -static int run_list_real(struct pipe *pi) +static int run_list(struct pipe *pi) { -#if ENABLE_HUSH_JOB - static int level; -#else - enum { level = 0 }; -#endif - + struct pipe *rpipe; +#if ENABLE_HUSH_LOOPS char *for_varname = NULL; char **for_lcur = NULL; char **for_list = NULL; - struct pipe *rpipe; int flag_rep = 0; - int save_num_progs; +#endif int flag_skip = 1; int rcode = 0; /* probably for gcc only */ int flag_restore = 0; +#if ENABLE_HUSH_IF int if_code = 0, next_if_code = 0; /* need double-buffer to handle elif */ - reserved_style rmode, skip_more_in_this_rmode = RES_XXXX; +#else + enum { if_code = 0, next_if_code = 0 }; +#endif + reserved_style rword; + reserved_style skip_more_for_this_rword = RES_XXXX; - debug_printf_exec("run_list_real start lvl %d\n", level + 1); + debug_printf_exec("run_list start lvl %d\n", run_list_level + 1); +#if ENABLE_HUSH_LOOPS /* check syntax for "for" */ for (rpipe = pi; rpipe; rpipe = rpipe->next) { - if ((rpipe->r_mode == RES_IN || rpipe->r_mode == RES_FOR) + if ((rpipe->res_word == RES_IN || rpipe->res_word == RES_FOR) && (rpipe->next == NULL) ) { - syntax(); /* unterminated FOR (no IN or no commands after IN) */ - debug_printf_exec("run_list_real lvl %d return 1\n", level); + syntax("malformed for"); /* no IN or no commands after IN */ + debug_printf_exec("run_list lvl %d return 1\n", run_list_level); return 1; } - if ((rpipe->r_mode == RES_IN && rpipe->next->r_mode == RES_IN && rpipe->next->progs[0].argv != NULL) - || (rpipe->r_mode == RES_FOR && rpipe->next->r_mode != RES_IN) + if ((rpipe->res_word == RES_IN && rpipe->next->res_word == RES_IN && rpipe->next->progs[0].argv != NULL) + || (rpipe->res_word == RES_FOR && rpipe->next->res_word != RES_IN) ) { /* TODO: what is tested in the first condition? */ - syntax(); /* 2nd: malformed FOR (not followed by IN) */ - debug_printf_exec("run_list_real lvl %d return 1\n", level); + syntax("malformed for"); /* 2nd condition: not followed by IN */ + debug_printf_exec("run_list lvl %d return 1\n", run_list_level); return 1; } } +#else + rpipe = NULL; +#endif #if ENABLE_HUSH_JOB /* Example of nested list: "while true; do { sleep 1 | exit 2; } done". * We are saving state before entering outermost list ("while...done") * so that ctrl-Z will correctly background _entire_ outermost list, * not just a part of it (like "sleep 1 | exit 2") */ - if (++level == 1 && interactive_fd) { + if (++run_list_level == 1 && interactive_fd) { if (sigsetjmp(toplevel_jb, 1)) { /* ctrl-Z forked and we are parent; or ctrl-C. * Sighandler has longjmped us here */ @@ -1930,7 +2078,7 @@ static int run_list_real(struct pipe *pi) signal(SIGTSTP, SIG_IGN); /* Restore level (we can be coming from deep inside * nested levels) */ - level = 1; + run_list_level = 1; #if ENABLE_FEATURE_SH_STANDALONE if (nofork_save.saved) { /* if save area is valid */ debug_printf_jobs("exiting nofork early\n"); @@ -1943,7 +2091,7 @@ static int run_list_real(struct pipe *pi) insert_bg_job(pi); } else { /* ctrl-C. We just stop doing whatever we were doing */ - putchar('\n'); + bb_putchar('\n'); } rcode = 0; goto ret; @@ -1954,44 +2102,51 @@ static int run_list_real(struct pipe *pi) #if ENABLE_FEATURE_SH_STANDALONE nofork_save.saved = 0; /* in case we will run a nofork later */ #endif - signal_SA_RESTART(SIGTSTP, handler_ctrl_z); + signal_SA_RESTART_empty_mask(SIGTSTP, handler_ctrl_z); signal(SIGINT, handler_ctrl_c); } -#endif +#endif /* JOB */ for (; pi; pi = flag_restore ? rpipe : pi->next) { - rmode = pi->r_mode; - if (rmode == RES_WHILE || rmode == RES_UNTIL || rmode == RES_FOR) { +//why? int save_num_progs; + rword = pi->res_word; +#if ENABLE_HUSH_LOOPS + if (rword == RES_WHILE || rword == RES_UNTIL || rword == RES_FOR) { flag_restore = 0; if (!rpipe) { flag_rep = 0; rpipe = pi; } } - debug_printf_exec(": rmode=%d if_code=%d next_if_code=%d skip_more=%d\n", - rmode, if_code, next_if_code, skip_more_in_this_rmode); - if (rmode == skip_more_in_this_rmode && flag_skip) { +#endif + debug_printf_exec(": rword=%d if_code=%d next_if_code=%d skip_more=%d\n", + rword, if_code, next_if_code, skip_more_for_this_rword); + if (rword == skip_more_for_this_rword && flag_skip) { if (pi->followup == PIPE_SEQ) flag_skip = 0; continue; } flag_skip = 1; - skip_more_in_this_rmode = RES_XXXX; - if (rmode == RES_THEN || rmode == RES_ELSE) + skip_more_for_this_rword = RES_XXXX; +#if ENABLE_HUSH_IF + if (rword == RES_THEN || rword == RES_ELSE) if_code = next_if_code; - if (rmode == RES_THEN && if_code) + if (rword == RES_THEN && if_code) continue; - if (rmode == RES_ELSE && !if_code) + if (rword == RES_ELSE && !if_code) continue; - if (rmode == RES_ELIF && !if_code) + if (rword == RES_ELIF && !if_code) break; - if (rmode == RES_FOR && pi->num_progs) { +#endif +#if ENABLE_HUSH_LOOPS + if (rword == RES_FOR && pi->num_progs) { if (!for_lcur) { + /* first loop through for */ /* if no variable values after "in" we skip "for" */ if (!pi->next->progs->argv) continue; /* create list of variable values */ - for_list = do_variable_expansion(pi->next->progs->argv); + for_list = expand_strvec_to_strvec(pi->next->progs->argv); for_lcur = for_list; for_varname = pi->progs->argv[0]; pi->progs->argv[0] = NULL; @@ -1999,76 +2154,79 @@ static int run_list_real(struct pipe *pi) } free(pi->progs->argv[0]); if (!*for_lcur) { + /* for loop is over, clean up */ free(for_list); for_lcur = NULL; flag_rep = 0; pi->progs->argv[0] = for_varname; - pi->progs->glob_result.gl_pathv[0] = pi->progs->argv[0]; continue; } /* insert next value from for_lcur */ /* vda: does it need escaping? */ pi->progs->argv[0] = xasprintf("%s=%s", for_varname, *for_lcur++); - pi->progs->glob_result.gl_pathv[0] = pi->progs->argv[0]; } - if (rmode == RES_IN) + if (rword == RES_IN) continue; - if (rmode == RES_DO) { + if (rword == RES_DO) { if (!flag_rep) continue; } - if (rmode == RES_DONE) { + if (rword == RES_DONE) { if (flag_rep) { flag_restore = 1; } else { rpipe = NULL; } } +#endif if (pi->num_progs == 0) continue; - save_num_progs = pi->num_progs; /* save number of programs */ - debug_printf_exec(": run_pipe_real with %d members\n", pi->num_progs); - rcode = run_pipe_real(pi); +//why? save_num_progs = pi->num_progs; + debug_printf_exec(": run_pipe with %d members\n", pi->num_progs); + rcode = run_pipe(pi); if (rcode != -1) { /* We only ran a builtin: rcode was set by the return value - * of run_pipe_real(), and we don't need to wait for anything. */ + * of run_pipe(), and we don't need to wait for anything. */ } else if (pi->followup == PIPE_BG) { /* What does bash do with attempts to background builtins? */ - /* Even bash 3.2 doesn't do that well with nested bg: * try "{ { sleep 10; echo DEEP; } & echo HERE; } &". - * I'm considering NOT treating inner bgs as jobs - - * thus maybe "if (level == 1 && pi->followup == PIPE_BG)" - * above? */ + * I'm NOT treating inner &'s as jobs */ #if ENABLE_HUSH_JOB - insert_bg_job(pi); + if (run_list_level == 1) + insert_bg_job(pi); #endif rcode = EXIT_SUCCESS; } else { #if ENABLE_HUSH_JOB - /* Paranoia, just "interactive_fd" should be enough */ - if (level == 1 && interactive_fd) { + if (run_list_level == 1 && interactive_fd) { + /* waits for completion, then fg's main shell */ rcode = checkjobs_and_fg_shell(pi); } else #endif { + /* this one just waits for completion */ rcode = checkjobs(pi); } debug_printf_exec(": checkjobs returned %d\n", rcode); } debug_printf_exec(": setting last_return_code=%d\n", rcode); last_return_code = rcode; - pi->num_progs = save_num_progs; /* restore number of programs */ - if (rmode == RES_IF || rmode == RES_ELIF) +//why? pi->num_progs = save_num_progs; +#if ENABLE_HUSH_IF + if (rword == RES_IF || rword == RES_ELIF) next_if_code = rcode; /* can be overwritten a number of times */ - if (rmode == RES_WHILE) +#endif +#if ENABLE_HUSH_LOOPS + if (rword == RES_WHILE) flag_rep = !last_return_code; - if (rmode == RES_UNTIL) + if (rword == RES_UNTIL) flag_rep = last_return_code; +#endif if ((rcode == EXIT_SUCCESS && pi->followup == PIPE_OR) || (rcode != EXIT_SUCCESS && pi->followup == PIPE_AND) ) { - skip_more_in_this_rmode = rmode; + skip_more_for_this_rword = rword; } checkjobs(NULL); } @@ -2080,9 +2238,12 @@ static int run_list_real(struct pipe *pi) exit(rcode); } ret: - level--; + if (!--run_list_level && interactive_fd) { + signal(SIGTSTP, SIG_IGN); + signal(SIGINT, SIG_IGN); + } #endif - debug_printf_exec("run_list_real lvl %d return %d\n", level + 1, rcode); + debug_printf_exec("run_list lvl %d return %d\n", run_list_level + 1, rcode); return rcode; } @@ -2104,7 +2265,7 @@ static int free_pipe(struct pipe *pi, int indent) for (a = 0, p = child->argv; *p; a++, p++) { debug_printf_clean("%s argv[%d] = %s\n", indenter(indent), a, *p); } - globfree(&child->glob_result); + free_strings(child->argv); child->argv = NULL; } else if (child->group) { debug_printf_clean("%s begin group (subshell:%d)\n", indenter(indent), child->subshell); @@ -2117,9 +2278,10 @@ static int free_pipe(struct pipe *pi, int indent) debug_printf_clean("%s redirect %d%s", indenter(indent), r->fd, redir_table[r->type].descrip); if (r->dup == -1) { /* guard against the case >$FOO, where foo is unset or blank */ - if (r->word.gl_pathv) { - debug_printf_clean(" %s\n", *r->word.gl_pathv); - globfree(&r->word); + if (r->glob_word) { + debug_printf_clean(" %s\n", r->glob_word[0]); + free_strings(r->glob_word); + r->glob_word = NULL; } } else { debug_printf_clean("&%d\n", r->dup); @@ -2144,7 +2306,7 @@ static int free_pipe_list(struct pipe *head, int indent) struct pipe *pi, *next; for (pi = head; pi; pi = next) { - debug_printf_clean("%s pipe reserved mode %d\n", indenter(indent), pi->r_mode); + debug_printf_clean("%s pipe reserved mode %d\n", indenter(indent), pi->res_word); rcode = free_pipe(pi, indent); debug_printf_clean("%s pipe followup code %d\n", indenter(indent), pi->followup); next = pi->next; @@ -2155,104 +2317,106 @@ static int free_pipe_list(struct pipe *head, int indent) } /* Select which version we will use */ -static int run_list(struct pipe *pi) +static int run_and_free_list(struct pipe *pi) { int rcode = 0; - debug_printf_exec("run_list entered\n"); - if (fake_mode == 0) { - debug_printf_exec(": run_list_real with %d members\n", pi->num_progs); - rcode = run_list_real(pi); + debug_printf_exec("run_and_free_list entered\n"); + if (!fake_mode) { + debug_printf_exec(": run_list with %d members\n", pi->num_progs); + rcode = run_list(pi); } /* free_pipe_list has the side effect of clearing memory. - * In the long run that function can be merged with run_list_real, + * In the long run that function can be merged with run_list, * but doing that now would hobble the debugging effort. */ - free_pipe_list(pi, 0); - debug_printf_exec("run_list return %d\n", rcode); + free_pipe_list(pi, /* indent: */ 0); + debug_printf_exec("run_nad_free_list return %d\n", rcode); return rcode; } +/* Whoever decided to muck with glob internal data is AN IDIOT! */ +/* uclibc happily changed the way it works (and it has rights to do so!), + all hell broke loose (SEGVs) */ + /* The API for glob is arguably broken. This routine pushes a non-matching * string into the output structure, removing non-backslashed backslashes. * If someone can prove me wrong, by performing this function within the * original glob(3) api, feel free to rewrite this routine into oblivion. - * Return code (0 vs. GLOB_NOSPACE) matches glob(3). * XXX broken if the last character is '\\', check that before calling. */ -static int globhack(const char *src, int flags, glob_t *pglob) +static char **globhack(const char *src, char **strings) { - int cnt = 0, pathc; + int cnt; const char *s; - char *dest; + char *v, *dest; + for (cnt = 1, s = src; s && *s; s++) { if (*s == '\\') s++; cnt++; } - dest = xmalloc(cnt); - if (!(flags & GLOB_APPEND)) { - pglob->gl_pathv = NULL; - pglob->gl_pathc = 0; - pglob->gl_offs = 0; - pglob->gl_offs = 0; - } - pathc = ++pglob->gl_pathc; - pglob->gl_pathv = xrealloc(pglob->gl_pathv, (pathc+1) * sizeof(*pglob->gl_pathv)); - pglob->gl_pathv[pathc-1] = dest; - pglob->gl_pathv[pathc] = NULL; + v = dest = xmalloc(cnt); for (s = src; s && *s; s++, dest++) { if (*s == '\\') s++; *dest = *s; } *dest = '\0'; - return 0; + + return add_string_to_strings(strings, v); } /* XXX broken if the last character is '\\', check that before calling */ static int glob_needed(const char *s) { for (; *s; s++) { - if (*s == '\\') s++; - if (strchr("*[?", *s)) return 1; + if (*s == '\\') + s++; + if (strchr("*[?", *s)) + return 1; } return 0; } -static int xglob(o_string *dest, int flags, glob_t *pglob) +static int xglob(o_string *dest, char ***pglob) { - int gr; - /* short-circuit for null word */ /* we can code this better when the debug_printf's are gone */ if (dest->length == 0) { if (dest->nonnull) { /* bash man page calls this an "explicit" null */ - gr = globhack(dest->data, flags, pglob); - debug_printf("globhack returned %d\n", gr); - } else { - return 0; + *pglob = globhack(dest->data, *pglob); } - } else if (glob_needed(dest->data)) { - gr = glob(dest->data, flags, NULL, pglob); + return 0; + } + + if (glob_needed(dest->data)) { + glob_t globdata; + int gr; + + memset(&globdata, 0, sizeof(globdata)); + gr = glob(dest->data, 0, NULL, &globdata); debug_printf("glob returned %d\n", gr); + if (gr == GLOB_NOSPACE) + bb_error_msg_and_die("out of memory during glob"); if (gr == GLOB_NOMATCH) { - /* quote removal, or more accurately, backslash removal */ - gr = globhack(dest->data, flags, pglob); debug_printf("globhack returned %d\n", gr); + /* quote removal, or more accurately, backslash removal */ + *pglob = globhack(dest->data, *pglob); + globfree(&globdata); + return 0; } - } else { - gr = globhack(dest->data, flags, pglob); - debug_printf("globhack returned %d\n", gr); - } - if (gr == GLOB_NOSPACE) - bb_error_msg_and_die("out of memory during glob"); - if (gr != 0) { /* GLOB_ABORTED ? */ - bb_error_msg("glob(3) error %d", gr); + if (gr != 0) { /* GLOB_ABORTED ? */ + bb_error_msg("glob(3) error %d", gr); + } + if (globdata.gl_pathv && globdata.gl_pathv[0]) + *pglob = add_strings_to_strings(1, *pglob, globdata.gl_pathv); + globfree(&globdata); + return gr; } - /* globprint(glob_target); */ - return gr; -} + *pglob = globhack(dest->data, *pglob); + return 0; +} -/* do_variable_expansion() takes a list of strings, expands +/* expand_strvec_to_strvec() takes a list of strings, expands * all variable references within and returns a pointer to * a list of expanded strings, possibly with larger number * of strings. (Think VAR="a b"; echo $VAR). @@ -2303,7 +2467,7 @@ static void count_var_expansion_space(int *countp, int *lenp, char *arg) break; case '*': case '@': - for (i = 1; i < global_argc; i++) { + for (i = 1; global_argv[i]; i++) { len += strlen(global_argv[i]) + 1; count++; if (!(first_ch & 0x80)) @@ -2371,8 +2535,11 @@ static int expand_on_ifs(char **list, int n, char **posp, const char *str) * 'echo -$*-'. If you play here, you must run testsuite afterwards! */ /* NB: another bug is that we cannot detect empty strings yet: * "" or $empty"" expands to zero words, has to expand to empty word */ -static int expand_vars_to_list(char **list, int n, char **posp, char *arg) +static int expand_vars_to_list(char **list, int n, char **posp, char *arg, char or_mask) { + /* or_mask is either 0 (normal case) or 0x80 + * (expansion of right-hand side of assignment == 1-element expand) */ + char first_ch, ored_ch; int i; const char *val; @@ -2392,14 +2559,14 @@ static int expand_vars_to_list(char **list, int n, char **posp, char *arg) arg = ++p; p = strchr(p, SPECIAL_VAR_SYMBOL); - first_ch = arg[0]; + first_ch = arg[0] | or_mask; /* forced to "quoted" if or_mask = 0x80 */ ored_ch |= first_ch; val = NULL; switch (first_ch & 0x7f) { /* Highest bit in first_ch indicates that var is double-quoted */ case '$': /* pid */ /* FIXME: (echo $$) should still print pid of main shell */ - val = utoa(getpid()); + val = utoa(getpid()); /* rootpid? */ break; case '!': /* bg pid */ val = last_bg_pid ? utoa(last_bg_pid) : (char*)""; @@ -2413,11 +2580,13 @@ static int expand_vars_to_list(char **list, int n, char **posp, char *arg) case '*': case '@': i = 1; + if (!global_argv[i]) + break; if (!(first_ch & 0x80)) { /* unquoted $* or $@ */ - while (i < global_argc) { + while (global_argv[i]) { n = expand_on_ifs(list, n, &pos, global_argv[i]); debug_printf_expand("expand_vars_to_list: argv %d (last %d)\n", i, global_argc-1); - if (global_argv[i++][0] && i < global_argc) { + if (global_argv[i++][0] && global_argv[i]) { /* this argv[] is not empty and not last: * put terminating NUL, start new word */ *pos++ = '\0'; @@ -2427,7 +2596,10 @@ static int expand_vars_to_list(char **list, int n, char **posp, char *arg) list[n++] = pos; } } - } else if (first_ch == ('@'|0x80)) { /* quoted $@ */ + } else + /* If or_mask is nonzero, we handle assignment 'a=....$@.....' + * and in this case should treat it like '$*' - see 'else...' below */ + if (first_ch == ('@'|0x80) && !or_mask) { /* quoted $@ */ while (1) { strcpy(pos, global_argv[i]); pos += strlen(global_argv[i]); @@ -2443,7 +2615,7 @@ static int expand_vars_to_list(char **list, int n, char **posp, char *arg) while (1) { strcpy(pos, global_argv[i]); pos += strlen(global_argv[i]); - if (++i >= global_argc) + if (!global_argv[++i]) break; if (ifs[0]) *pos++ = ifs[0]; @@ -2490,7 +2662,7 @@ static int expand_vars_to_list(char **list, int n, char **posp, char *arg) return n; } -static char **do_variable_expansion(char **argv) +static char **expand_variables(char **argv, char or_mask) { int n; int count = 1; @@ -2515,9 +2687,9 @@ static char **do_variable_expansion(char **argv) n = 0; v = argv; while (*v) - n = expand_vars_to_list(list, n, &pos, *v++); + n = expand_vars_to_list(list, n, &pos, *v++, or_mask); - if(n) debug_printf_expand("finalized list[%d]=%p '%s' " + if (n) debug_printf_expand("finalized list[%d]=%p '%s' " "strlen=%d next=%p pos=%p\n", n-1, list[n-1], list[n-1], strlen(list[n-1]), list[n-1] + strlen(list[n-1]) + 1, pos); list[n] = NULL; @@ -2532,190 +2704,164 @@ static char **do_variable_expansion(char **argv) debug_printf_expand("used_space=%d\n", pos - (char*)list); } #endif - /* To be removed / made conditional later. */ - if (pos - (char*)list > len) - bb_error_msg_and_die("BUG in varexp"); + if (ENABLE_HUSH_DEBUG) + if (pos - (char*)list > len) + bb_error_msg_and_die("BUG in varexp"); return list; } +static char **expand_strvec_to_strvec(char **argv) +{ + return expand_variables(argv, 0); +} -static char *insert_var_value(char *inp) +static char *expand_string_to_string(const char *str) { - int res_str_len = 0; - int len; - int done = 0; - int i; - const char *p1; - char *p, *p2; - char *res_str = NULL; - - while ((p = strchr(inp, SPECIAL_VAR_SYMBOL))) { - if (p != inp) { - len = p - inp; - res_str = xrealloc(res_str, (res_str_len + len)); - strncpy((res_str + res_str_len), inp, len); - res_str_len += len; - } - inp = ++p; - p = strchr(inp, SPECIAL_VAR_SYMBOL); - *p = '\0'; - - switch (inp[0]) { - case '$': - /* FIXME: (echo $$) should still print pid of main shell */ - p1 = utoa(getpid()); - break; - case '!': - p1 = last_bg_pid ? utoa(last_bg_pid) : (char*)""; - break; - case '?': - p1 = utoa(last_return_code); - break; - case '#': - p1 = utoa(global_argc ? global_argc-1 : 0); - break; - case '*': - case '@': /* FIXME: we treat $@ as $* for now */ - len = 1; - for (i = 1; i < global_argc; i++) - len += strlen(global_argv[i]) + 1; - p1 = p2 = alloca(--len); - for (i = 1; i < global_argc; i++) { - strcpy(p2, global_argv[i]); - p2 += strlen(global_argv[i]); - *p2++ = ifs[0]; - } - *--p2 = '\0'; - break; - default: - p1 = lookup_param(inp); - } + char *argv[2], **list; - if (p1) { - len = res_str_len + strlen(p1); - res_str = xrealloc(res_str, 1 + len); - strcpy(res_str + res_str_len, p1); - res_str_len = len; - } - *p = SPECIAL_VAR_SYMBOL; - inp = ++p; - done = 1; - } - if (done) { - res_str = xrealloc(res_str, (1 + res_str_len + strlen(inp))); - strcpy((res_str + res_str_len), inp); - while ((p = strchr(res_str, '\n'))) { - *p = ' '; + argv[0] = (char*)str; + argv[1] = NULL; + list = expand_variables(argv, 0x80); /* 0x80: make one-element expansion */ + if (ENABLE_HUSH_DEBUG) + if (!list[0] || list[1]) + bb_error_msg_and_die("BUG in varexp2"); + /* actually, just move string 2*sizeof(char*) bytes back */ + strcpy((char*)list, list[0]); + debug_printf_expand("string_to_string='%s'\n", (char*)list); + return (char*)list; +} + +static char* expand_strvec_to_string(char **argv) +{ + char **list; + + list = expand_variables(argv, 0x80); + /* Convert all NULs to spaces */ + if (list[0]) { + int n = 1; + while (list[n]) { + if (ENABLE_HUSH_DEBUG) + if (list[n-1] + strlen(list[n-1]) + 1 != list[n]) + bb_error_msg_and_die("BUG in varexp3"); + list[n][-1] = ' '; /* TODO: or to ifs[0]? */ + n++; } } - return (res_str == NULL) ? inp : res_str; + strcpy((char*)list, list[0]); + debug_printf_expand("strvec_to_string='%s'\n", (char*)list); + return (char*)list; } - /* This is used to get/check local shell variables */ -static const char *get_local_var(const char *s) +static struct variable *get_local_var(const char *name) { - struct variables *cur; + struct variable *cur; + int len; - if (!s) + if (!name) return NULL; - for (cur = top_vars; cur; cur = cur->next) { - if (strcmp(cur->name, s) == 0) - return cur->value; + len = strlen(name); + for (cur = top_var; cur; cur = cur->next) { + if (strncmp(cur->varstr, name, len) == 0 && cur->varstr[len] == '=') + return cur; } return NULL; } -/* This is used to set local shell variables - flg_export == 0 if only local (not exporting) variable - flg_export == 1 if "new" exporting environ - flg_export > 1 if current startup environ (not call putenv()) */ -static int set_local_var(const char *s, int flg_export) +/* str holds "NAME=VAL" and is expected to be malloced. + * We take ownership of it. */ +static int set_local_var(char *str, int flg_export) { - char *name, *value; - int result = 0; - struct variables *cur; - - name = xstrdup(s); + struct variable *cur; + char *value; + int name_len; - /* Assume when we enter this function that we are already in - * NAME=VALUE format. So the first order of business is to - * split 's' on the '=' into 'name' and 'value' */ - value = strchr(name, '='); - /*if (value == 0 && ++value == 0) ??? -vda */ - if (value == NULL || value[1] == '\0') { - free(name); + value = strchr(str, '='); + if (!value) { /* not expected to ever happen? */ + free(str); return -1; } - *value++ = '\0'; - for (cur = top_vars; cur; cur = cur->next) { - if (strcmp(cur->name, name) == 0) { - if (strcmp(cur->value, value) == 0) { - if (flg_export && !cur->flg_export) - cur->flg_export = flg_export; - else - result++; - } else if (cur->flg_read_only) { - bb_error_msg("%s: readonly variable", name); - result = -1; - } else { - if (flg_export > 0 || cur->flg_export > 1) - cur->flg_export = 1; - free((char*)cur->value); - cur->value = xstrdup(value); + name_len = value - str + 1; /* including '=' */ + cur = top_var; /* cannot be NULL (we have HUSH_VERSION and it's RO) */ + while (1) { + if (strncmp(cur->varstr, str, name_len) != 0) { + if (!cur->next) { + /* Bail out. Note that now cur points + * to last var in linked list */ + break; } - goto skip; + cur = cur->next; + continue; } - } - - cur = xzalloc(sizeof(*cur)); - cur->name = xstrdup(name); - cur->value = xstrdup(value); - /*cur->next = 0;*/ - cur->flg_export = flg_export; - /*cur->flg_read_only = 0;*/ - { - struct variables *bottom = top_vars; - while (bottom->next) - bottom = bottom->next; - bottom->next = cur; - } - skip: - if (result == 0 && cur->flg_export == 1) { - *(value-1) = '='; - result = putenv(name); - } else { - free(name); - if (result > 0) /* equivalent to previous set */ - result = 0; - } - return result; + /* We found an existing var with this name */ + *value = '\0'; + if (cur->flg_read_only) { + bb_error_msg("%s: readonly variable", str); + free(str); + return -1; + } + unsetenv(str); /* just in case */ + *value = '='; + if (strcmp(cur->varstr, str) == 0) { + free_and_exp: + free(str); + goto exp; + } + if (cur->max_len >= strlen(str)) { + /* This one is from startup env, reuse space */ + strcpy(cur->varstr, str); + goto free_and_exp; + } + /* max_len == 0 signifies "malloced" var, which we can + * (and has to) free */ + if (!cur->max_len) + free(cur->varstr); + cur->max_len = 0; + goto set_str_and_exp; + } + + /* Not found - create next variable struct */ + cur->next = xzalloc(sizeof(*cur)); + cur = cur->next; + + set_str_and_exp: + cur->varstr = str; + exp: + if (flg_export) + cur->flg_export = 1; + if (cur->flg_export) + return putenv(cur->varstr); + return 0; } static void unset_local_var(const char *name) { - struct variables *cur, *next; + struct variable *cur; + struct variable *prev = prev; /* for gcc */ + int name_len; if (!name) return; - for (cur = top_vars; cur; cur = cur->next) { - if (strcmp(cur->name, name) == 0) { + name_len = strlen(name); + cur = top_var; + while (cur) { + if (strncmp(cur->varstr, name, name_len) == 0 && cur->varstr[name_len] == '=') { if (cur->flg_read_only) { bb_error_msg("%s: readonly variable", name); return; } - if (cur->flg_export) - unsetenv(cur->name); - free((char*)cur->name); - free((char*)cur->value); - next = top_vars; - while (next->next != cur) - next = next->next; - next->next = cur->next; + /* prev is ok to use here because 1st variable, HUSH_VERSION, + * is ro, and we cannot reach this code on the 1st pass */ + prev->next = cur->next; + unsetenv(cur->varstr); + if (!cur->max_len) + free(cur->varstr); free(cur); return; } + prev = cur; + cur = cur->next; } } @@ -2745,9 +2891,9 @@ static int setup_redirect(struct p_context *ctx, int fd, redir_type style, last_redir = redir; redir = redir->next; } - redir = xmalloc(sizeof(struct redir_struct)); - redir->next = NULL; - redir->word.gl_pathv = NULL; + redir = xzalloc(sizeof(struct redir_struct)); + /* redir->next = NULL; */ + /* redir->glob_word = NULL; */ if (last_redir) { last_redir->next = redir; } else { @@ -2771,8 +2917,7 @@ static int setup_redirect(struct p_context *ctx, int fd, redir_type style, /* We do _not_ try to open the file that src points to, * since we need to return and let src be expanded first. * Set ctx->pending_redirect, so we know what to do at the - * end of the next parsed word. - */ + * end of the next parsed word. */ ctx->pending_redirect = redir; } return 0; @@ -2787,20 +2932,19 @@ static struct pipe *new_pipe(void) /*pi->next = NULL;*/ /*pi->followup = 0; invalid */ if (RES_NONE) - pi->r_mode = RES_NONE; + pi->res_word = RES_NONE; return pi; } static void initialize_context(struct p_context *ctx) { - ctx->pipe = NULL; - ctx->pending_redirect = NULL; ctx->child = NULL; - ctx->list_head = new_pipe(); - ctx->pipe = ctx->list_head; + ctx->pipe = ctx->list_head = new_pipe(); + ctx->pending_redirect = NULL; ctx->res_w = RES_NONE; - ctx->stack = NULL; + //only ctx->parse_type is not touched... is this intentional? ctx->old_flag = 0; + ctx->stack = NULL; done_command(ctx); /* creates the memory for working child */ } @@ -2809,6 +2953,7 @@ static void initialize_context(struct p_context *ctx) * should handle if, then, elif, else, fi, for, while, until, do, done. * case, function, and select are obnoxious, save those for later. */ +#if ENABLE_HUSH_IF || ENABLE_HUSH_LOOPS static int reserved_word(o_string *dest, struct p_context *ctx) { struct reserved_combo { @@ -2822,69 +2967,78 @@ static int reserved_word(o_string *dest, struct p_context *ctx) * FLAG_START means the word must start a new compound list. */ static const struct reserved_combo reserved_list[] = { +#if ENABLE_HUSH_IF { "if", RES_IF, FLAG_THEN | FLAG_START }, { "then", RES_THEN, FLAG_ELIF | FLAG_ELSE | FLAG_FI }, { "elif", RES_ELIF, FLAG_THEN }, { "else", RES_ELSE, FLAG_FI }, { "fi", RES_FI, FLAG_END }, +#endif +#if ENABLE_HUSH_LOOPS { "for", RES_FOR, FLAG_IN | FLAG_START }, { "while", RES_WHILE, FLAG_DO | FLAG_START }, { "until", RES_UNTIL, FLAG_DO | FLAG_START }, { "in", RES_IN, FLAG_DO }, { "do", RES_DO, FLAG_DONE }, { "done", RES_DONE, FLAG_END } +#endif }; - enum { NRES = sizeof(reserved_list)/sizeof(reserved_list[0]) }; + const struct reserved_combo *r; - for (r = reserved_list; r < reserved_list + NRES; r++) { - if (strcmp(dest->data, r->literal) == 0) { - debug_printf("found reserved word %s, code %d\n", r->literal, r->code); - if (r->flag & FLAG_START) { - struct p_context *new = xmalloc(sizeof(struct p_context)); - debug_printf("push stack\n"); - if (ctx->res_w == RES_IN || ctx->res_w == RES_FOR) { - syntax(); - free(new); - ctx->res_w = RES_SNTX; - b_reset(dest); - return 1; - } - *new = *ctx; /* physical copy */ - initialize_context(ctx); - ctx->stack = new; - } else if (ctx->res_w == RES_NONE || !(ctx->old_flag & (1 << r->code))) { - syntax(); + for (r = reserved_list; r < reserved_list + ARRAY_SIZE(reserved_list); r++) { + if (strcmp(dest->data, r->literal) != 0) + continue; + debug_printf("found reserved word %s, code %d\n", r->literal, r->code); + if (r->flag & FLAG_START) { + struct p_context *new; + debug_printf("push stack\n"); +#if ENABLE_HUSH_LOOPS + if (ctx->res_w == RES_IN || ctx->res_w == RES_FOR) { + syntax("malformed for"); /* example: 'for if' */ ctx->res_w = RES_SNTX; b_reset(dest); return 1; } - ctx->res_w = r->code; - ctx->old_flag = r->flag; - if (ctx->old_flag & FLAG_END) { - struct p_context *old; - debug_printf("pop stack\n"); - done_pipe(ctx, PIPE_SEQ); - old = ctx->stack; - old->child->group = ctx->list_head; - old->child->subshell = 0; - *ctx = *old; /* physical copy */ - free(old); - } +#endif + new = xmalloc(sizeof(*new)); + *new = *ctx; /* physical copy */ + initialize_context(ctx); + ctx->stack = new; + } else if (ctx->res_w == RES_NONE || !(ctx->old_flag & (1 << r->code))) { + syntax(NULL); + ctx->res_w = RES_SNTX; b_reset(dest); return 1; } + ctx->res_w = r->code; + ctx->old_flag = r->flag; + if (ctx->old_flag & FLAG_END) { + struct p_context *old; + debug_printf("pop stack\n"); + done_pipe(ctx, PIPE_SEQ); + old = ctx->stack; + old->child->group = ctx->list_head; + old->child->subshell = 0; + *ctx = *old; /* physical copy */ + free(old); + } + b_reset(dest); + return 1; } return 0; } +#else +#define reserved_word(dest, ctx) ((int)0) +#endif /* Normal return is 0. * Syntax or xglob errors return 1. */ static int done_word(o_string *dest, struct p_context *ctx) { struct child_prog *child = ctx->child; - glob_t *glob_target; - int gr, flags = 0; + char ***glob_target; + int gr; debug_printf_parse("done_word entered: '%s' %p\n", dest->data, child); if (dest->length == 0 && !dest->nonnull) { @@ -2892,25 +3046,23 @@ static int done_word(o_string *dest, struct p_context *ctx) return 0; } if (ctx->pending_redirect) { - glob_target = &ctx->pending_redirect->word; + glob_target = &ctx->pending_redirect->glob_word; } else { if (child->group) { - syntax(); + syntax(NULL); debug_printf_parse("done_word return 1: syntax error, groups and arglists don't mix\n"); return 1; } - if (!child->argv && (ctx->parse_type & FLAG_PARSE_SEMICOLON)) { + if (!child->argv && (ctx->parse_type & PARSEFLAG_SEMICOLON)) { debug_printf_parse(": checking '%s' for reserved-ness\n", dest->data); if (reserved_word(dest, ctx)) { debug_printf_parse("done_word return %d\n", (ctx->res_w == RES_SNTX)); return (ctx->res_w == RES_SNTX); } } - glob_target = &child->glob_result; - if (child->argv) - flags |= GLOB_APPEND; + glob_target = &child->argv; } - gr = xglob(dest, flags, glob_target); + gr = xglob(dest, glob_target); if (gr != 0) { debug_printf_parse("done_word return 1: xglob returned %d\n", gr); return 1; @@ -2918,19 +3070,25 @@ static int done_word(o_string *dest, struct p_context *ctx) b_reset(dest); if (ctx->pending_redirect) { - ctx->pending_redirect = NULL; - if (glob_target->gl_pathc != 1) { + /* NB: don't free_strings(ctx->pending_redirect->glob_word) here */ + if (ctx->pending_redirect->glob_word + && ctx->pending_redirect->glob_word[0] + && ctx->pending_redirect->glob_word[1] + ) { + /* more than one word resulted from globbing redir */ + ctx->pending_redirect = NULL; bb_error_msg("ambiguous redirect"); debug_printf_parse("done_word return 1: ambiguous redirect\n"); return 1; } - } else { - child->argv = glob_target->gl_pathv; + ctx->pending_redirect = NULL; } +#if ENABLE_HUSH_LOOPS if (ctx->res_w == RES_FOR) { done_word(dest, ctx); done_pipe(ctx, PIPE_SEQ); } +#endif debug_printf_parse("done_word return 0\n"); return 0; } @@ -2968,10 +3126,9 @@ static int done_command(struct p_context *ctx) /*child->argv = NULL;*/ /*child->is_stopped = 0;*/ /*child->group = NULL;*/ - /*child->glob_result.gl_pathv = NULL;*/ child->family = pi; //sp: /*child->sp = 0;*/ - child->type = ctx->parse_type; + //pt: child->parse_type = ctx->parse_type; ctx->child = child; /* but ctx->pipe and ctx->list_head remain unchanged */ @@ -2987,7 +3144,7 @@ static int done_pipe(struct p_context *ctx, pipe_style type) debug_printf_parse("done_pipe entered, followup %d\n", type); not_null = done_command(ctx); /* implicit closure of previous command */ ctx->pipe->followup = type; - ctx->pipe->r_mode = ctx->res_w; + ctx->pipe->res_word = ctx->res_w; /* Without this check, even just on command line generates * tree of three NOPs (!). Which is harmless but annoying. * IOW: it is safe to do it unconditionally. */ @@ -3058,31 +3215,45 @@ static int redirect_opt_num(o_string *o) return num; } +#if ENABLE_HUSH_TICK +/* NB: currently disabled on NOMMU */ static FILE *generate_stream_from_list(struct pipe *head) { FILE *pf; int pid, channel[2]; - if (pipe(channel) < 0) bb_perror_msg_and_die("pipe"); -#if BB_MMU - pid = fork(); -#else - pid = vfork(); + + xpipe(channel); +/* *** NOMMU WARNING *** */ +/* By using vfork here, we suspend parent till child exits or execs. + * If child will not do it before it fills the pipe, it can block forever + * in write(STDOUT_FILENO), and parent (shell) will be also stuck. + */ + pid = BB_MMU ? fork() : vfork(); + if (pid < 0) + bb_perror_msg_and_die(BB_MMU ? "fork" : "vfork"); + if (pid == 0) { /* child */ + if (ENABLE_HUSH_JOB) + die_sleep = 0; /* let nofork's xfuncs die */ + close(channel[0]); /* NB: close _first_, then move fd! */ + xmove_fd(channel[1], 1); + /* Prevent it from trying to handle ctrl-z etc */ +#if ENABLE_HUSH_JOB + run_list_level = 1; #endif - if (pid < 0) { - bb_perror_msg_and_die("fork"); - } else if (pid == 0) { - close(channel[0]); - if (channel[1] != 1) { - dup2(channel[1], 1); - close(channel[1]); - } - _exit(run_list_real(head)); /* leaks memory */ + /* Process substitution is not considered to be usual + * 'command execution'. + * SUSv3 says ctrl-Z should be ignored, ctrl-C should not. */ + /* Not needed, we are relying on it being disabled + * everywhere outside actual command execution. */ + /*set_jobctrl_sighandler(SIG_IGN);*/ + set_misc_sighandler(SIG_DFL); + /* Freeing 'head' here would break NOMMU. */ + _exit(run_list(head)); } - debug_printf("forked child %d\n", pid); close(channel[1]); pf = fdopen(channel[0], "r"); - debug_printf("pipe on FILE *%p\n", pf); return pf; + /* 'head' is freed by the caller */ } /* Return code is exit status of the process that is run. */ @@ -3099,14 +3270,16 @@ static int process_command_subs(o_string *dest, struct p_context *ctx, /* recursion to generate command */ retcode = parse_stream(&result, &inner, input, subst_end); - if (retcode != 0) return retcode; /* syntax error or EOF */ + if (retcode != 0) + return retcode; /* syntax error or EOF */ done_word(&result, &inner); done_pipe(&inner, PIPE_SEQ); b_free(&result); p = generate_stream_from_list(inner.list_head); - if (p == NULL) return 1; - mark_open(fileno(p)); + if (p == NULL) + return 1; + close_on_exec_on(fileno(p)); setup_file_in_str(&pipe_str, p); /* now send results of command back into original context */ @@ -3117,24 +3290,24 @@ static int process_command_subs(o_string *dest, struct p_context *ctx, continue; } while (eol_cnt) { - b_addqchr(dest, '\n', dest->quote); + b_addqchr(dest, '\n', dest->o_quote); eol_cnt--; } - b_addqchr(dest, ch, dest->quote); + b_addqchr(dest, ch, dest->o_quote); } debug_printf("done reading from pipe, pclose()ing\n"); /* This is the step that wait()s for the child. Should be pretty * safe, since we just read an EOF from its stdout. We could try - * to better, by using wait(), and keeping track of background jobs + * to do better, by using wait(), and keeping track of background jobs * at the same time. That would be a lot of work, and contrary * to the KISS philosophy of this program. */ - mark_closed(fileno(p)); - retcode = pclose(p); - free_pipe_list(inner.list_head, 0); - debug_printf("pclosed, retcode=%d\n", retcode); + retcode = fclose(p); + free_pipe_list(inner.list_head, /* indent: */ 0); + debug_printf("closed FILE from child, retcode=%d\n", retcode); return retcode; } +#endif static int parse_group(o_string *dest, struct p_context *ctx, struct in_str *input, int ch) @@ -3146,23 +3319,18 @@ static int parse_group(o_string *dest, struct p_context *ctx, debug_printf_parse("parse_group entered\n"); if (child->argv) { - syntax(); + syntax(NULL); debug_printf_parse("parse_group return 1: syntax error, groups and arglists don't mix\n"); return 1; } initialize_context(&sub); - switch (ch) { - case '(': + endch = "}"; + if (ch == '(') { endch = ")"; child->subshell = 1; - break; - case '{': - endch = "}"; - break; - default: - syntax(); /* really logic error */ } rcode = parse_stream(dest, &sub, input, endch); +//vda: err chk? done_word(dest, &sub); /* finish off the final word in the subcontext */ done_pipe(&sub, PIPE_SEQ); /* and the final command there, too */ child->group = sub.list_head; @@ -3176,45 +3344,17 @@ static int parse_group(o_string *dest, struct p_context *ctx, * see the bash man page under "Parameter Expansion" */ static const char *lookup_param(const char *src) { - const char *p = NULL; - if (src) { - p = getenv(src); - if (!p) - p = get_local_var(src); - } - return p; -} - -/* Make new string for parser */ -static char* make_string(char **inp) -{ - char *p; - char *str = NULL; - int n; - int val_len; - int len = 0; - - for (n = 0; inp[n]; n++) { - p = insert_var_value(inp[n]); - val_len = strlen(p); - str = xrealloc(str, len + val_len + 3); /* +3: space, '\n', */ - str[len++] = ' '; - strcpy(str + len, p); - len += val_len; - if (p != inp[n]) free(p); - } - /* We do not check for case where loop had no iterations at all - * - cannot happen? */ - str[len] = '\n'; - str[len+1] = '\0'; - return str; + struct variable *var = get_local_var(src); + if (var) + return strchr(var->varstr, '=') + 1; + return NULL; } /* return code: 0 for OK, 1 for syntax error */ static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *input) { int ch = b_peek(input); /* first character after the $ */ - unsigned char quote_mask = dest->quote ? 0x80 : 0; + unsigned char quote_mask = dest->o_quote ? 0x80 : 0; debug_printf_parse("handle_dollar entered: ch='%c'\n", ch); if (isalpha(ch)) { @@ -3253,23 +3393,25 @@ static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *i /* XXX maybe someone will try to escape the '}' */ while (1) { ch = b_getch(input); - if (ch == EOF) { - syntax(); + if (ch == '}') + break; + if (!isalnum(ch) && ch != '_') { + syntax("unterminated ${name}"); debug_printf_parse("handle_dollar return 1: unterminated ${name}\n"); return 1; } - if (ch == '}') - break; debug_printf_parse(": '%c'\n", ch); b_addchr(dest, ch | quote_mask); quote_mask = 0; } b_addchr(dest, SPECIAL_VAR_SYMBOL); break; +#if ENABLE_HUSH_TICK case '(': b_getch(input); process_command_subs(dest, ctx, input, ")"); break; +#endif case '-': case '_': /* still unhandled, but should be eventually */ @@ -3277,7 +3419,7 @@ static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *i return 1; break; default: - b_addqchr(dest, '$', dest->quote); + b_addqchr(dest, '$', dest->o_quote); } debug_printf_parse("handle_dollar return 0\n"); return 0; @@ -3292,21 +3434,32 @@ static int parse_stream(o_string *dest, struct p_context *ctx, redir_type redir_style; int next; - /* Only double-quote state is handled in the state variable dest->quote. + /* Only double-quote state is handled in the state variable dest->o_quote. * A single-quote triggers a bypass of the main loop until its mate is - * found. When recursing, quote state is passed in via dest->quote. */ + * found. When recursing, quote state is passed in via dest->o_quote. */ debug_printf_parse("parse_stream entered, end_trigger='%s'\n", end_trigger); - while ((ch = b_getch(input)) != EOF) { - m = charmap[ch]; - next = (ch == '\n') ? '\0' : b_peek(input); + while (1) { + m = CHAR_IFS; + next = '\0'; + ch = b_getch(input); + if (ch != EOF) { + m = charmap[ch]; + if (ch != '\n') + next = b_peek(input); + } debug_printf_parse(": ch=%c (%d) m=%d quote=%d\n", - ch, ch, m, dest->quote); + ch, ch, m, dest->o_quote); if (m == CHAR_ORDINARY - || (m != CHAR_SPECIAL && dest->quote) + || (m != CHAR_SPECIAL && dest->o_quote) ) { - b_addqchr(dest, ch, dest->quote); + if (ch == EOF) { + syntax("unterminated \""); + debug_printf_parse("parse_stream return 1: unterminated \"\n"); + return 1; + } + b_addqchr(dest, ch, dest->o_quote); continue; } if (m == CHAR_IFS) { @@ -3314,6 +3467,8 @@ static int parse_stream(o_string *dest, struct p_context *ctx, debug_printf_parse("parse_stream return 1: done_word!=0\n"); return 1; } + if (ch == EOF) + break; /* If we aren't performing a substitution, treat * a newline as a command separator. * [why we don't handle it exactly like ';'? --vda] */ @@ -3322,7 +3477,7 @@ static int parse_stream(o_string *dest, struct p_context *ctx, } } if ((end_trigger && strchr(end_trigger, ch)) - && !dest->quote && ctx->res_w == RES_NONE + && !dest->o_quote && ctx->res_w == RES_NONE ) { debug_printf_parse("parse_stream return 0: end_trigger char found\n"); return 0; @@ -3331,7 +3486,7 @@ static int parse_stream(o_string *dest, struct p_context *ctx, continue; switch (ch) { case '#': - if (dest->length == 0 && !dest->quote) { + if (dest->length == 0 && !dest->o_quote) { while (1) { ch = b_peek(input); if (ch == EOF || ch == '\n') @@ -3339,17 +3494,17 @@ static int parse_stream(o_string *dest, struct p_context *ctx, b_getch(input); } } else { - b_addqchr(dest, ch, dest->quote); + b_addqchr(dest, ch, dest->o_quote); } break; case '\\': if (next == EOF) { - syntax(); + syntax("\\"); debug_printf_parse("parse_stream return 1: \\\n"); return 1; } - b_addqchr(dest, '\\', dest->quote); - b_addqchr(dest, b_getch(input), dest->quote); + b_addqchr(dest, '\\', dest->o_quote); + b_addqchr(dest, b_getch(input), dest->o_quote); break; case '$': if (handle_dollar(dest, ctx, input) != 0) { @@ -3366,18 +3521,20 @@ static int parse_stream(o_string *dest, struct p_context *ctx, b_addchr(dest, ch); } if (ch == EOF) { - syntax(); + syntax("unterminated '"); debug_printf_parse("parse_stream return 1: unterminated '\n"); return 1; } break; case '"': dest->nonnull = 1; - dest->quote = !dest->quote; + dest->o_quote ^= 1; /* invert */ break; +#if ENABLE_HUSH_TICK case '`': process_command_subs(dest, ctx, input, "`"); break; +#endif case '>': redir_fd = redirect_opt_num(dest); done_word(dest, ctx); @@ -3385,11 +3542,14 @@ static int parse_stream(o_string *dest, struct p_context *ctx, if (next == '>') { redir_style = REDIRECT_APPEND; b_getch(input); - } else if (next == '(') { - syntax(); /* until we support >(list) Process Substitution */ + } +#if 0 + else if (next == '(') { + syntax(">(process) not supported"); debug_printf_parse("parse_stream return 1: >(process) not supported\n"); return 1; } +#endif setup_redirect(ctx, redir_fd, redir_style, input); break; case '<': @@ -3402,11 +3562,14 @@ static int parse_stream(o_string *dest, struct p_context *ctx, } else if (next == '>') { redir_style = REDIRECT_IO; b_getch(input); - } else if (next == '(') { - syntax(); /* until we support <(list) Process Substitution */ + } +#if 0 + else if (next == '(') { + syntax("<(process) not supported"); debug_printf_parse("parse_stream return 1: <(process) not supported\n"); return 1; } +#endif setup_redirect(ctx, redir_fd, redir_style, input); break; case ';': @@ -3443,13 +3606,12 @@ static int parse_stream(o_string *dest, struct p_context *ctx, break; case ')': case '}': - syntax(); /* Proper use of this character is caught by end_trigger */ + syntax("unexpected }"); /* Proper use of this character is caught by end_trigger */ debug_printf_parse("parse_stream return 1: unexpected '}'\n"); return 1; default: - syntax(); /* this is really an internal logic error */ - debug_printf_parse("parse_stream return 1: internal logic error\n"); - return 1; + if (ENABLE_HUSH_DEBUG) + bb_error_msg_and_die("BUG: unexpected %c\n", ch); } } /* Complain if quote? No, maybe we just finished a command substitution @@ -3485,14 +3647,18 @@ static void update_charmap(void) * and on most machines that would be faster (reduced L1 cache use). */ memset(charmap, CHAR_ORDINARY, sizeof(charmap)); +#if ENABLE_HUSH_TICK set_in_charmap("\\$\"`", CHAR_SPECIAL); +#else + set_in_charmap("\\$\"", CHAR_SPECIAL); +#endif set_in_charmap("<>;&|(){}#'", CHAR_ORDINARY_IF_QUOTED); - set_in_charmap(ifs, CHAR_IFS); /* also flow through if quoted */ + set_in_charmap(ifs, CHAR_IFS); /* are ordinary if quoted */ } /* most recursion does not come through here, the exception is - * from builtin_source() */ -static int parse_stream_outer(struct in_str *inp, int parse_flag) + * from builtin_source() and builtin_eval() */ +static int parse_and_run_stream(struct in_str *inp, int parse_flag) { struct p_context ctx; o_string temp = NULL_O_STRING; @@ -3501,52 +3667,52 @@ static int parse_stream_outer(struct in_str *inp, int parse_flag) ctx.parse_type = parse_flag; initialize_context(&ctx); update_charmap(); - if (!(parse_flag & FLAG_PARSE_SEMICOLON) || (parse_flag & FLAG_REPARSING)) + if (!(parse_flag & PARSEFLAG_SEMICOLON) || (parse_flag & PARSEFLAG_REPARSING)) set_in_charmap(";$&|", CHAR_ORDINARY); #if ENABLE_HUSH_INTERACTIVE - inp->promptmode = 1; + inp->promptmode = 0; /* PS1 */ #endif /* We will stop & execute after each ';' or '\n'. * Example: "sleep 9999; echo TEST" + ctrl-C: * TEST should be printed */ rcode = parse_stream(&temp, &ctx, inp, ";\n"); if (rcode != 1 && ctx.old_flag != 0) { - syntax(); + syntax(NULL); } if (rcode != 1 && ctx.old_flag == 0) { done_word(&temp, &ctx); done_pipe(&ctx, PIPE_SEQ); debug_print_tree(ctx.list_head, 0); - debug_printf_exec("parse_stream_outer: run_list\n"); - run_list(ctx.list_head); + debug_printf_exec("parse_stream_outer: run_and_free_list\n"); + run_and_free_list(ctx.list_head); } else { if (ctx.old_flag != 0) { free(ctx.stack); b_reset(&temp); } temp.nonnull = 0; - temp.quote = 0; + temp.o_quote = 0; inp->p = NULL; - free_pipe_list(ctx.list_head, 0); + free_pipe_list(ctx.list_head, /* indent: */ 0); } b_free(&temp); - } while (rcode != -1 && !(parse_flag & FLAG_EXIT_FROM_LOOP)); /* loop on syntax errors, return on EOF */ + } while (rcode != -1 && !(parse_flag & PARSEFLAG_EXIT_FROM_LOOP)); /* loop on syntax errors, return on EOF */ return 0; } -static int parse_string_outer(const char *s, int parse_flag) +static int parse_and_run_string(const char *s, int parse_flag) { struct in_str input; setup_string_in_str(&input, s); - return parse_stream_outer(&input, parse_flag); + return parse_and_run_stream(&input, parse_flag); } -static int parse_file_outer(FILE *f) +static int parse_and_run_file(FILE *f) { int rcode; struct in_str input; setup_file_in_str(&input, f); - rcode = parse_stream_outer(&input, FLAG_PARSE_SEMICOLON); + rcode = parse_and_run_stream(&input, PARSEFLAG_SEMICOLON); return rcode; } @@ -3560,7 +3726,7 @@ static void setup_job_control(void) saved_task_pgrp = shell_pgrp = getpgrp(); debug_printf_jobs("saved_task_pgrp=%d\n", saved_task_pgrp); - fcntl(interactive_fd, F_SETFD, FD_CLOEXEC); + close_on_exec_on(interactive_fd); /* If we were ran as 'hush &', * sleep until we are in the foreground. */ @@ -3585,63 +3751,70 @@ static void setup_job_control(void) } #endif -int hush_main(int argc, char **argv); +int hush_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int hush_main(int argc, char **argv) { + static const char version_str[] ALIGN1 = "HUSH_VERSION="HUSH_VER_STR; + static const struct variable const_shell_ver = { + .next = NULL, + .varstr = (char*)version_str, + .max_len = 1, /* 0 can provoke free(name) */ + .flg_export = 1, + .flg_read_only = 1, + }; + int opt; FILE *input; char **e; + struct variable *cur_var; + + INIT_G(); + + /* Deal with HUSH_VERSION */ + shell_ver = const_shell_ver; /* copying struct here */ + top_var = &shell_ver; + unsetenv("HUSH_VERSION"); /* in case it exists in initial env */ + /* Initialize our shell local variables with the values + * currently living in the environment */ + cur_var = top_var; + e = environ; + if (e) while (*e) { + char *value = strchr(*e, '='); + if (value) { /* paranoia */ + cur_var->next = xzalloc(sizeof(*cur_var)); + cur_var = cur_var->next; + cur_var->varstr = *e; + cur_var->max_len = strlen(*e); + cur_var->flg_export = 1; + } + e++; + } + putenv((char *)version_str); /* reinstate HUSH_VERSION */ #if ENABLE_FEATURE_EDITING line_input_state = new_line_input_t(FOR_SHELL); #endif - /* XXX what should these be while sourcing /etc/profile? */ global_argc = argc; global_argv = argv; - - /* (re?) initialize globals. Sometimes hush_main() ends up calling - * hush_main(), therefore we cannot rely on the BSS to zero out this - * stuff. Reset these to 0 every time. */ - ifs = NULL; - /* charmap[] is taken care of with call to update_charmap() */ - fake_mode = 0; - close_me_head = NULL; -#if ENABLE_HUSH_INTERACTIVE - interactive_fd = 0; -#endif -#if ENABLE_HUSH_JOB - last_bg_pid = 0; - job_list = NULL; - last_jobid = 0; -#endif - /* Initialize some more globals to non-zero values */ set_cwd(); #if ENABLE_HUSH_INTERACTIVE #if ENABLE_FEATURE_EDITING cmdedit_set_initial_prompt(); -#else - PS1 = NULL; #endif PS2 = "> "; #endif - /* initialize our shell local variables with the values - * currently living in the environment */ - e = environ; - if (e) - while (*e) - set_local_var(*e++, 2); /* without call putenv() */ - last_return_code = EXIT_SUCCESS; + if (EXIT_SUCCESS) /* otherwise is already done */ + last_return_code = EXIT_SUCCESS; if (argv[0] && argv[0][0] == '-') { debug_printf("sourcing /etc/profile\n"); input = fopen("/etc/profile", "r"); if (input != NULL) { - mark_open(fileno(input)); - parse_file_outer(input); - mark_closed(fileno(input)); + close_on_exec_on(fileno(input)); + parse_and_run_file(input); fclose(input); } } @@ -3652,7 +3825,7 @@ int hush_main(int argc, char **argv) case 'c': global_argv = argv + optind; global_argc = argc - optind; - opt = parse_string_outer(optarg, FLAG_PARSE_SEMICOLON); + opt = parse_and_run_string(optarg, PARSEFLAG_SEMICOLON); goto final_return; case 'i': /* Well, we cannot just declare interactiveness, @@ -3660,7 +3833,7 @@ int hush_main(int argc, char **argv) /* interactive_fd++; */ break; case 'f': - fake_mode++; + fake_mode = 1; break; default: #ifndef BB_VER @@ -3701,17 +3874,18 @@ int hush_main(int argc, char **argv) } debug_printf("interactive_fd=%d\n", interactive_fd); if (interactive_fd) { + fcntl(interactive_fd, F_SETFD, FD_CLOEXEC); /* Looks like they want an interactive shell */ setup_job_control(); - /* Make xfuncs do cleanup on exit */ - die_sleep = -1; /* flag */ -// FIXME: should we reset die_sleep = 0 whereever we fork? + /* -1 is special - makes xfuncs longjmp, not exit + * (we reset die_sleep = 0 whereever we [v]fork) */ + die_sleep = -1; if (setjmp(die_jmp)) { /* xfunc has failed! die die die */ hush_exit(xfunc_error_retval); } #if !ENABLE_FEATURE_SH_EXTRA_QUIET - printf("\n\n%s hush - the humble shell v"HUSH_VER_STR"\n", BB_BANNER); + printf("\n\n%s hush - the humble shell v"HUSH_VER_STR"\n", bb_banner); printf("Enter 'help' for a list of built-in commands.\n\n"); #endif } @@ -3728,38 +3902,46 @@ int hush_main(int argc, char **argv) /* give up */ interactive_fd = 0; } + if (interactive_fd) + fcntl(interactive_fd, F_SETFD, FD_CLOEXEC); } - #endif if (argv[optind] == NULL) { - opt = parse_file_outer(stdin); - goto final_return; + opt = parse_and_run_file(stdin); + } else { + debug_printf("\nrunning script '%s'\n", argv[optind]); + global_argv = argv + optind; + global_argc = argc - optind; + input = xfopen(argv[optind], "r"); + fcntl(fileno(input), F_SETFD, FD_CLOEXEC); + opt = parse_and_run_file(input); } - debug_printf("\nrunning script '%s'\n", argv[optind]); - global_argv = argv + optind; - global_argc = argc - optind; - input = xfopen(argv[optind], "r"); - opt = parse_file_outer(input); + final_return: #if ENABLE_FEATURE_CLEAN_UP fclose(input); if (cwd != bb_msg_unknown) free((char*)cwd); - { - struct variables *cur, *tmp; - for (cur = top_vars; cur; cur = tmp) { - tmp = cur->next; - if (!cur->flg_read_only) { - free((char*)cur->name); - free((char*)cur->value); - free(cur); - } - } + cur_var = top_var->next; + while (cur_var) { + struct variable *tmp = cur_var; + if (!cur_var->max_len) + free(cur_var->varstr); + cur_var = cur_var->next; + free(tmp); } #endif - - final_return: hush_exit(opt ? opt : last_return_code); } + + +#if ENABLE_LASH +int lash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int lash_main(int argc, char **argv) +{ + //bb_error_msg("lash is deprecated, please use hush instead"); + return hush_main(argc, argv); +} +#endif