X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=shell%2Fhush.c;h=1ff7b0df66d2d6fc0b18a15f1a4c7804a06cf98a;hb=b055001b6a69cf8fd513d36622cf693ee20c0e92;hp=8ffb117deb04b9ae193e6792219424d0966883ca;hpb=53079d494ef0c1fec481b062b3614c45e60eb057;p=oweals%2Fbusybox.git diff --git a/shell/hush.c b/shell/hush.c index 8ffb117de..1ff7b0df6 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -71,7 +71,7 @@ * memory leak finding and plugging - done? * more testing, especially quoting rules and redirection * document how quoting rules not precisely followed for variable assignments - * maybe change map[] to use 2-bit entries + * maybe change charmap[] to use 2-bit entries * (eventually) remove all the printf's * * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. @@ -81,17 +81,19 @@ #include /* glob, of course */ #include /* should be pretty obvious */ /* #include */ +extern char **environ; /* This is in , but protected with __USE_GNU */ /* If you comment out one of these below, it will be #defined later * to perform debug printfs to stderr: */ -#define debug_printf(...) do {} while (0) +#define debug_printf(...) do {} while (0) /* Finer-grained debug switches */ -#define debug_printf_parse(...) do {} while (0) -#define debug_print_tree(a, b) do {} while (0) -#define debug_printf_exec(...) do {} while (0) -#define debug_printf_jobs(...) do {} while (0) -#define debug_printf_clean(...) do {} while (0) +#define debug_printf_parse(...) do {} while (0) +#define debug_print_tree(a, b) do {} while (0) +#define debug_printf_exec(...) do {} while (0) +#define debug_printf_jobs(...) do {} while (0) +#define debug_printf_expand(...) do {} while (0) +#define debug_printf_clean(...) do {} while (0) #ifndef debug_printf #define debug_printf(...) fprintf(stderr, __VA_ARGS__) @@ -110,6 +112,14 @@ #define DEBUG_SHELL_JOBS 1 #endif +#ifndef debug_printf_expand +#define debug_printf_expand(...) fprintf(stderr, __VA_ARGS__) +#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) @@ -118,6 +128,7 @@ static const char *indenter(int i) return &blanks[sizeof(blanks) - i - 1]; } #define debug_printf_clean(...) fprintf(stderr, __VA_ARGS__) +#define DEBUG_CLEAN 1 #endif @@ -129,9 +140,10 @@ static const char *indenter(int i) #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, @@ -166,33 +178,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 ), }; @@ -202,10 +222,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,30 +241,37 @@ 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 */ - int sp; /* number of SPECIAL_VAR_SYMBOL */ - int type; + //sp counting seems to be broken... so commented out, grep for '//sp:' + //sp: int sp; /* number of SPECIAL_VAR_SYMBOL */ + //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. + * Substitution can make _several_ words out of one argv[n]! + * Example: argv[0]=='.^C*^C.' here: echo .$*. + */ 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 */ + smallint followup; /* PIPE_BG, PIPE_SEQ, PIPE_OR, PIPE_AND */ + smallint res_word; /* needed for if, for, while, until... */ }; struct close_me { @@ -256,53 +283,10 @@ struct variables { struct variables *next; const char *name; const char *value; - int flg_export; - int flg_read_only; + smallint flg_export; + smallint flg_read_only; }; -/* 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 { - MAP_ORDINARY = 0, - MAP_FLOWTROUGH_IF_QUOTED = 1, - MAP_IFS_IF_UNQUOTED = 2, /* flow through if quoted too */ - MAP_NEVER_FLOWTROUGH = 3, -}; -static unsigned char map[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; @@ -311,13 +295,14 @@ typedef struct { int 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? */ struct in_str { const char *p; + /* eof_flag=1: last char in ->p is really an EOF */ + char eof_flag; /* meaningless if ->p == NULL */ char peek_buf[2]; #if ENABLE_HUSH_INTERACTIVE int __promptme; @@ -330,19 +315,130 @@ 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 */ + +/* "Globals" within this file */ + +#define HUSH_VER_STR "0.02" +static const struct variables const_shell_ver = { + NULL, "HUSH_VERSION", HUSH_VER_STR, 1, 1 }; -static void __syntax(int line) +/* 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; + struct close_me *close_me_head; + const char *cwd; + unsigned last_bg_pid; + struct variables *top_vars; /* = &shell_ver (both are set in main()) */ + struct variables shell_ver; /* = const_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]; +}; + +#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 close_me_head (G.close_me_head ) +#define cwd (G.cwd ) +#define last_bg_pid (G.last_bg_pid ) +#define top_vars (G.top_vars ) +#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 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); + (interactive_fd ? bb_error_msg : bb_error_msg_and_die) + (msg ? "%s: %s" : "syntax error", "syntax error", msg); } -#define syntax() __syntax(__LINE__) +#else +/* Debug */ +static void syntax_lineno(int line) +{ + (interactive_fd ? bb_error_msg : bb_error_msg_and_die) + ("syntax error hush.c:%d", line); +} +#define syntax(str) syntax_lineno(__LINE__) +#endif /* Index of subroutines: */ /* function prototypes for builtins */ @@ -355,7 +451,9 @@ static int builtin_export(char **argv); 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_set(char **argv); @@ -363,13 +461,12 @@ 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); +//static int builtin_not_written(char **argv); /* o_string manipulation: */ static int b_check_space(o_string *o, int len); static int b_addchr(o_string *o, int ch); static void b_reset(o_string *o); static int b_addqchr(o_string *o, int ch, int quote); -static int b_adduint(o_string *o, unsigned i); /* in_str manipulations: */ static int static_get(struct in_str *i); static int static_peek(struct in_str *i); @@ -382,7 +479,10 @@ static void mark_open(int fd); static void mark_closed(int fd); static void close_all(void); /* "run" the final data structures: */ -//TODO: remove indent argument from non-debug build! +#if !defined(DEBUG_CLEAN) +#define free_pipe_list(head, indent) free_pipe_list(head) +#define free_pipe(pi, indent) free_pipe(pi) +#endif 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: */ @@ -406,17 +506,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_string(o_string *dest, struct p_context *ctx, const char *src); 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 @@ -428,8 +528,11 @@ 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 **make_list_in(char **inp, char *name); -static char *insert_var_value(char *inp); +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 const char *get_local_var(const char *var); static int set_local_var(const char *s, int flg_export); static void unset_local_var(const char *name); @@ -440,34 +543,47 @@ static void unset_local_var(const char *name); * 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 +}; + static const struct built_in_command bltins[] = { #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("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("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 @@ -518,13 +634,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); @@ -538,7 +647,7 @@ static void handler_ctrl_z(int sig) debug_printf_jobs("got tty sig %d in pid %d\n", sig, getpid()); pid = fork(); - if (pid < 0) /* can't fork. Pretend there were no ctrl-Z */ + if (pid < 0) /* can't fork. Pretend there was no ctrl-Z */ return; ctrl_z_flag = 1; if (!pid) { /* child */ @@ -622,13 +731,12 @@ static const char *set_cwd(void) /* 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; } @@ -638,9 +746,9 @@ static int builtin_eval(char **argv) /* built-in 'cd ' handler */ static int builtin_cd(char **argv) { - char *newdir; + const char *newdir; if (argv[1] == NULL) - newdir = getenv("HOME"); + newdir = getenv("HOME") ? : "/"; else newdir = argv[1]; if (chdir(newdir)) { @@ -694,9 +802,8 @@ static int builtin_export(char **argv) return EXIT_SUCCESS; } - name = strdup(name); - - if (name) { + name = xstrdup(name); + { const char *value = strchr(name, '='); if (!value) { @@ -707,13 +814,9 @@ static int builtin_export(char **argv) if (value) { size_t ln = strlen(name); - tmp = realloc(name, ln+strlen(value)+2); - if (tmp == NULL) - res = -1; - else { - sprintf(tmp+ln, "=%s", value); - name = tmp; - } + 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. */ @@ -796,6 +899,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; @@ -803,13 +907,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 */ @@ -840,32 +943,24 @@ static int builtin_pwd(char **argv ATTRIBUTE_UNUSED) /* built-in 'read VAR' handler */ static int builtin_read(char **argv) { - int res; + char string[BUFSIZ]; + char *p; + const char *name = argv[1] ? argv[1] : "REPLY"; + int name_len = strlen(name); - if (argv[1]) { - char string[BUFSIZ]; - char *var = NULL; - - string[0] = '\0'; /* In case stdin has only EOF */ - /* read string */ - fgets(string, sizeof(string), stdin); - chomp(string); - var = malloc(strlen(argv[1]) + strlen(string) + 2); - if (var) { - sprintf(var, "%s=%s", argv[1], string); - res = set_local_var(var, 0); - } else - res = -1; - if (res) - bb_perror_msg("read"); - free(var); /* So not move up to avoid breaking errno */ - return res; - } - do res = getchar(); while (res != '\n' && res != EOF); - return 0; + 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); + return set_local_var(string, 0); } -/* built-in 'set VAR=value' handler */ +/* built-in 'set [VAR=value]' handler */ static int builtin_set(char **argv) { char *temp = argv[1]; @@ -889,7 +984,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; @@ -918,7 +1013,7 @@ static int builtin_source(char **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); + status = parse_and_run_file(input); mark_closed(fileno(input)); fclose(input); return status; @@ -945,36 +1040,32 @@ static int builtin_umask(char **argv) /* built-in 'unset VAR' handler */ static int builtin_unset(char **argv) { - /* bash returned already true */ + /* bash always returns true */ unset_local_var(argv[1]); 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) { /* It would be easy to drop a more restrictive policy * in here, such as setting a maximum string length */ if (o->length + len > o->maxlen) { - char *old_data = o->data; /* assert(data == NULL || o->maxlen != 0); */ o->maxlen += (2*len > B_CHUNK ? 2*len : B_CHUNK); - o->data = realloc(o->data, 1 + o->maxlen); - if (o->data == NULL) { - free(old_data); - } + o->data = xrealloc(o->data, 1 + o->maxlen); } return o->data == NULL; } static int b_addchr(o_string *o, int ch) { - debug_printf("b_addchr: %c %d %p\n", ch, o->length, o); + debug_printf("b_addchr: '%c' o->length=%d o=%p\n", ch, o->length, o); if (b_check_space(o, 1)) return B_NOSPAC; o->data[o->length] = ch; @@ -1013,17 +1104,6 @@ static int b_addqchr(o_string *o, int ch, int quote) return b_addchr(o, ch); } -static int b_adduint(o_string *o, unsigned i) -{ - int r; - char buf[sizeof(unsigned)*3 + 1]; - char *p = buf; - *(utoa_to_buf(i, buf, sizeof(buf))) = '\0'; - /* no escape checking necessary */ - do r = b_addchr(o, *p++); while (r == 0 && *p); - return r; -} - static int static_get(struct in_str *i) { int ch = *i->p++; @@ -1073,34 +1153,31 @@ static const char* setup_prompt_string(int promptmode) return prompt_str; } -#if ENABLE_FEATURE_EDITING -static line_input_t *line_input_state; -#endif - -static int get_user_input(struct in_str *i) +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; 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, user_input_buf, BUFSIZ-1, line_input_state); + i->eof_flag = (r < 0); + if (i->eof_flag) { /* EOF/error detected */ + 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 - fflush(stdout); - i->p = the_command; - return r; /* < 0 == EOF. Not meaningful otherwise */ + i->p = user_input_buf; } #endif /* INTERACTIVE */ @@ -1110,31 +1187,30 @@ static int file_get(struct in_str *i) { int ch; - ch = 0; /* 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; } else { /* 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) { - while (!i->p || !(interactive_fd && i->p[0])) { - if (get_user_input(i) < 0) - return EOF; - } + do { + get_user_input(i); + } while (!*i->p); /* need non-empty line */ i->promptmode = 2; i->__promptme = 0; - if (i->p && *i->p) { - ch = *i->p++; - } - } else -#endif - { - ch = fgetc(i->file); + goto take_cached; } - debug_printf("b_getch: got a %d\n", ch); +#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; @@ -1147,14 +1223,19 @@ static int file_get(struct in_str *i) */ static int file_peek(struct in_str *i) { + int ch; if (i->p && *i->p) { + if (i->eof_flag && !i->p[1]) + return EOF; return *i->p; } - i->peek_buf[0] = fgetc(i->file); + ch = fgetc(i->file); + i->eof_flag = (ch == EOF); + i->peek_buf[0] = ch; i->peek_buf[1] = '\0'; i->p = i->peek_buf; - debug_printf("b_peek: got a %d\n", *i->p); - return *i->p; + debug_printf("file_peek: got a '%c' %d\n", *i->p, *i->p); + return ch; } static void setup_file_in_str(struct in_str *i, FILE *f) @@ -1178,6 +1259,7 @@ static void setup_string_in_str(struct in_str *i, const char *s) i->promptmode = 1; #endif i->p = s; + i->eof_flag = 0; } static void mark_open(int fd) @@ -1253,10 +1335,8 @@ static void restore_redirects(int squirrel[]) for (i = 0; i < 3; i++) { fd = squirrel[i]; if (fd != -1) { - /* No error checking. I sure wouldn't know what - * to do with an error if I found one! */ - dup2(fd, i); - close(fd); + /* We simply die on error */ + xmove_fd(fd, i); } } } @@ -1272,13 +1352,11 @@ static void pseudo_exec_argv(char **argv) const struct built_in_command *x; for (i = 0; is_assignment(argv[i]); i++) { - debug_printf("pid %d environment modification: %s\n", + debug_printf_exec("pid %d environment modification: %s\n", getpid(), argv[i]); // FIXME: vfork case?? - p = insert_var_value(argv[i]); - putenv(strdup(p)); - if (p != argv[i]) - free(p); + p = expand_string_to_string(argv[i]); + putenv(p); } argv += i; /* If a variable is assigned in a forest, and nobody listens, @@ -1288,6 +1366,8 @@ static void pseudo_exec_argv(char **argv) _exit(EXIT_SUCCESS); } + argv = expand_strvec_to_strvec(argv); + /* * Check if the command matches any of the builtins. * Depending on context, this might be redundant. But it's @@ -1296,29 +1376,34 @@ static void pseudo_exec_argv(char **argv) */ for (x = bltins; x->cmd; x++) { if (strcmp(argv[0], x->cmd) == 0) { - debug_printf("builtin exec %s\n", argv[0]); + debug_printf_exec("running builtin '%s'\n", argv[0]); rcode = x->function(argv); fflush(stdout); _exit(rcode); } } - /* Check if the command matches any busybox internal commands - * ("applets") here. - * FIXME: This feature is not 100% safe, since - * BusyBox is not fully reentrant, so we have no guarantee the things - * from the .bss are still zeroed, or that things from .data are still - * at their defaults. We could exec ourself from /proc/self/exe, but I - * really dislike relying on /proc for things. We could exec ourself - * from global_argv[0], but if we are in a chroot, we may not be able - * to find ourself... */ + /* Check if the command matches any busybox applets */ #if ENABLE_FEATURE_SH_STANDALONE - debug_printf("running applet %s\n", argv[0]); - run_applet_and_exit(argv[0], argv); -// is it ok that run_applet_and_exit() does exit(), not _exit()? -// NB: IIRC on NOMMU we are after _vfork_, not fork! + if (strchr(argv[0], '/') == NULL) { + const struct bb_applet *a = find_applet_by_name(argv[0]); + if (a) { + if (a->noexec) { + current_applet = 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); + } + /* re-exec ourselves with the new arguments */ + debug_printf_exec("re-execing applet '%s'\n", argv[0]); + execvp(CONFIG_BUSYBOX_EXEC_PATH, argv); + /* If they called chroot or otherwise made the binary no longer + * executable, fall through */ + } + } #endif - debug_printf("exec of %s\n", argv[0]); + + debug_printf_exec("execing '%s'\n", argv[0]); execvp(argv[0], argv); bb_perror_msg("cannot exec '%s'", argv[0]); _exit(1); @@ -1411,16 +1496,7 @@ static void insert_bg_job(struct pipe *pi) // TODO: do we really need to have so many fields which are just dead weight // at execution stage? thejob->progs[i].pid = pi->progs[i].pid; - //rest: - //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 */ - //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 */ - //int sp; /* number of SPECIAL_VAR_SYMBOL */ - //int type; + /* all other fields are not used and stay zero */ } thejob->next = NULL; thejob->cmdtext = xstrdup(get_cmdtext(pi)); @@ -1579,10 +1655,6 @@ static int checkjobs(struct pipe* fg_pipe) if (childpid && errno != ECHILD) bb_perror_msg("waitpid"); - - /* move the shell to the foreground */ - //if (interactive_fd && tcsetpgrp(interactive_fd, getpgid(0))) - // bb_perror_msg("tcsetpgrp-2"); return rcode; } @@ -1592,8 +1664,8 @@ 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; @@ -1615,6 +1687,9 @@ 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) { @@ -1650,10 +1725,11 @@ static int run_pipe_real(struct pipe *pi) rcode = run_list_real(child->group); restore_redirects(squirrel); debug_printf_exec("run_pipe_real return %d\n", rcode); - return rcode; + return rcode; // do we need to add '... & 0xff' ? } if (single_fg && child->argv != NULL) { + char **argv_expanded; char **argv = child->argv; for (i = 0; is_assignment(argv[i]); i++) @@ -1670,38 +1746,24 @@ static int run_pipe_real(struct pipe *pi) int export_me = 0; char *name, *value; name = xstrdup(argv[i]); - debug_printf("Local environment set: %s\n", name); + debug_printf("local environment set: %s\n", name); value = strchr(name, '='); if (value) - *value = 0; + *value = '\0'; if (get_local_var(name)) { export_me = 1; } free(name); - p = insert_var_value(argv[i]); + p = expand_string_to_string(argv[i]); set_local_var(p, export_me); - if (p != argv[i]) - free(p); + free(p); } 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]); - putenv(strdup(p)); - if (p != argv[i]) { - child->sp--; - free(p); - } - } - if (child->sp) { - char *str; - - str = make_string(argv + i); - debug_printf_exec(": parse_string_outer '%s'\n", str); - parse_string_outer(str, FLAG_EXIT_FROM_LOOP | FLAG_REPARSING); - free(str); - debug_printf_exec("run_pipe_real return %d\n", last_return_code); - return last_return_code; + 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) { @@ -1715,10 +1777,12 @@ static int run_pipe_real(struct pipe *pi) * This is perfect for work that comes after exec(). * Is it really safe for inline use? Experimentally, * things seem to work with glibc. */ -// TODO: fflush(NULL)? setup_redirects(child, squirrel); debug_printf_exec(": builtin '%s' '%s'...\n", x->cmd, argv[i+1]); - rcode = x->function(argv + i); + //sp: if (child->sp) /* btw we can do it unconditionally... */ + 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); return rcode; @@ -1729,9 +1793,13 @@ static int run_pipe_real(struct pipe *pi) const struct bb_applet *a = find_applet_by_name(argv[i]); if (a && a->nofork) { setup_redirects(child, squirrel); - debug_printf_exec(": run_nofork_applet '%s' '%s'...\n", argv[i], argv[i+1]); save_nofork_data(&nofork_save); - rcode = run_nofork_applet_prime(&nofork_save, a, argv + i); + argv_expanded = argv + i; + //sp: if (child->sp) + 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) & 0xff; + free(argv_expanded); restore_redirects(squirrel); debug_printf_exec("run_pipe_real return %d\n", rcode); return rcode; @@ -1774,7 +1842,7 @@ static int run_pipe_real(struct pipe *pi) /* Every child adds itself to new process group * with pgid == pid of first child in pipe */ #if ENABLE_HUSH_JOB - if (interactive_fd) { + if (run_list_level == 1 && interactive_fd) { /* Don't do pgrp restore anymore on fatal signals */ set_fatal_sighandler(SIG_DFL); if (pi->pgrp < 0) /* true for 1st process only */ @@ -1786,7 +1854,7 @@ static int run_pipe_real(struct pipe *pi) } } #endif - // in non-interactive case fatal sigs are already SIG_DFL + /* in non-interactive case fatal sigs are already SIG_DFL */ close_all(); if (nextin != 0) { dup2(nextin, 0); @@ -1817,13 +1885,6 @@ static int run_pipe_real(struct pipe *pi) if (pi->pgrp < 0) pi->pgrp = child->pid; #endif - - /* Don't check for errors. The child may be dead already, - * in which case setpgid returns error code EACCES. */ - //why we do it at all?? child does it itself - //if (interactive_fd) - // setpgid(child->pid, pi->pgrp); - if (nextin != 0) close(nextin); if (nextout != 1) @@ -1848,26 +1909,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]; @@ -1895,55 +1961,60 @@ static void debug_print_tree(struct pipe *pi, int lvl) } #endif -// NB: called by pseudo_exec, and therefore must not modify any -// global data until exec/_exit (we can be a child after vfork!) +/* 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) { -#if ENABLE_HUSH_JOB - static int level; -#else - enum { level = 0 }; -#endif - - char *save_name = NULL; - char **list = NULL; - char **save_list = NULL; struct pipe *rpipe; +#if ENABLE_HUSH_LOOPS + char *for_varname = NULL; + char **for_lcur = NULL; + char **for_list = NULL; int flag_rep = 0; +#endif int save_num_progs; 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_real 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_real 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_real 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 */ @@ -1951,7 +2022,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"); @@ -1981,71 +2052,76 @@ static int run_list_real(struct pipe *pi) #endif for (; pi; pi = flag_restore ? rpipe : pi->next) { - rmode = pi->r_mode; - if (rmode == RES_WHILE || rmode == RES_UNTIL || rmode == RES_FOR) { + 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) { - if (!list) { +#endif +#if ENABLE_HUSH_LOOPS + if (rword == RES_FOR && pi->num_progs) { + if (!for_lcur) { /* if no variable values after "in" we skip "for" */ if (!pi->next->progs->argv) continue; /* create list of variable values */ - list = make_list_in(pi->next->progs->argv, - pi->progs->argv[0]); - save_list = list; - save_name = pi->progs->argv[0]; + 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; flag_rep = 1; } - if (!*list) { - free(pi->progs->argv[0]); - free(save_list); - list = NULL; + free(pi->progs->argv[0]); + if (!*for_lcur) { + free(for_list); + for_lcur = NULL; flag_rep = 0; - pi->progs->argv[0] = save_name; + pi->progs->argv[0] = for_varname; pi->progs->glob_result.gl_pathv[0] = pi->progs->argv[0]; continue; } - /* insert new value from list for variable */ - free(pi->progs->argv[0]); - pi->progs->argv[0] = *list++; + /* 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 */ @@ -2056,24 +2132,24 @@ static int run_list_real(struct pipe *pi) * of run_pipe_real(), 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) { + /* Paranoia, just "interactive_fd" should be enough? */ + 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); @@ -2081,16 +2157,20 @@ static int run_list_real(struct pipe *pi) 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) +#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); } @@ -2102,9 +2182,9 @@ static int run_list_real(struct pipe *pi) exit(rcode); } ret: - level--; + run_list_level--; #endif - debug_printf_exec("run_list_real lvl %d return %d\n", level + 1, rcode); + debug_printf_exec("run_list_real lvl %d return %d\n", run_list_level + 1, rcode); return rcode; } @@ -2166,7 +2246,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; @@ -2209,9 +2289,7 @@ static int globhack(const char *src, int flags, glob_t *pglob) if (*s == '\\') s++; cnt++; } - dest = malloc(cnt); - if (!dest) - return GLOB_NOSPACE; + dest = xmalloc(cnt); if (!(flags & GLOB_APPEND)) { pglob->gl_pathv = NULL; pglob->gl_pathc = 0; @@ -2219,9 +2297,7 @@ static int globhack(const char *src, int flags, glob_t *pglob) pglob->gl_offs = 0; } pathc = ++pglob->gl_pathc; - pglob->gl_pathv = realloc(pglob->gl_pathv, (pathc+1) * sizeof(*pglob->gl_pathv)); - if (pglob->gl_pathv == NULL) - return GLOB_NOSPACE; + pglob->gl_pathv = xrealloc(pglob->gl_pathv, (pathc+1) * sizeof(*pglob->gl_pathv)); pglob->gl_pathv[pathc-1] = dest; pglob->gl_pathv[pathc] = NULL; for (s = src; s && *s; s++, dest++) { @@ -2277,84 +2353,338 @@ static int xglob(o_string *dest, int flags, glob_t *pglob) return gr; } -static char **make_list_in(char **inp, char *name) +/* 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). + * This new list is allocated as a single malloc block. + * NULL-terminated list of char* pointers is at the beginning of it, + * followed by strings themself. + * Caller can deallocate entire list by single free(list). */ + +/* Helpers first: + * count_XXX estimates size of the block we need. It's okay + * to over-estimate sizes a bit, if it makes code simpler */ +static int count_ifs(const char *str) { - int len, i; - int name_len = strlen(name); - int n = 0; - char **list; - char *p1, *p2, *p3; - - /* create list of variable values */ - list = xmalloc(sizeof(*list)); - for (i = 0; inp[i]; i++) { - p3 = insert_var_value(inp[i]); - p1 = p3; - while (*p1) { - if ((*p1 == ' ')) { - p1++; - continue; + int cnt = 0; + debug_printf_expand("count_ifs('%s') ifs='%s'", str, ifs); + while (1) { + str += strcspn(str, ifs); + if (!*str) break; + str++; /* str += strspn(str, ifs); */ + cnt++; /* cnt += strspn(str, ifs); - but this code is larger */ + } + debug_printf_expand(" return %d\n", cnt); + return cnt; +} + +static void count_var_expansion_space(int *countp, int *lenp, char *arg) +{ + char first_ch; + int i; + int len = *lenp; + int count = *countp; + const char *val; + char *p; + + while ((p = strchr(arg, SPECIAL_VAR_SYMBOL))) { + len += p - arg; + arg = ++p; + p = strchr(p, SPECIAL_VAR_SYMBOL); + first_ch = arg[0]; + + switch (first_ch & 0x7f) { + /* high bit in 1st_ch indicates that var is double-quoted */ + case '$': /* pid */ + case '!': /* bg pid */ + case '?': /* exitcode */ + case '#': /* argc */ + len += sizeof(int)*3 + 1; /* enough for int */ + break; + case '*': + case '@': + for (i = 1; i < global_argc; i++) { + len += strlen(global_argv[i]) + 1; + count++; + if (!(first_ch & 0x80)) + count += count_ifs(global_argv[i]); } - p2 = strchr(p1, ' '); - if (p2) { - len = p2 - p1; - } else { - len = strlen(p1); - p2 = p1 + len; + break; + default: + *p = '\0'; + arg[0] = first_ch & 0x7f; + if (isdigit(arg[0])) { + i = xatoi_u(arg); + val = NULL; + if (i < global_argc) + val = global_argv[i]; + } else + val = lookup_param(arg); + arg[0] = first_ch; + *p = SPECIAL_VAR_SYMBOL; + + if (val) { + len += strlen(val) + 1; + if (!(first_ch & 0x80)) + count += count_ifs(val); } - /* we use n + 2 in realloc for list, because we add - * new element and then we will add NULL element */ - list = xrealloc(list, sizeof(*list) * (n + 2)); - list[n] = xmalloc(2 + name_len + len); - strcpy(list[n], name); - strcat(list[n], "="); - strncat(list[n], p1, len); - list[n++][name_len + len + 1] = '\0'; - p1 = p2; - } - if (p3 != inp[i]) free(p3); + } + arg = ++p; } - list[n] = NULL; - return list; + + len += strlen(arg) + 1; + count++; + *lenp = len; + *countp = count; } -static char *insert_var_value(char *inp) +/* Store given string, finalizing the word and starting new one whenever + * we encounter ifs char(s). This is used for expanding variable values. + * End-of-string does NOT finalize word: think about 'echo -$VAR-' */ +static int expand_on_ifs(char **list, int n, char **posp, const char *str) { - int res_str_len = 0; - int len; - int done = 0; - char *p, *res_str = NULL; - const char *p1; - - 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; + char *pos = *posp; + while (1) { + int word_len = strcspn(str, ifs); + if (word_len) { + memcpy(pos, str, word_len); /* store non-ifs chars */ + pos += word_len; + str += word_len; } - inp = ++p; - p = strchr(inp, SPECIAL_VAR_SYMBOL); - *p = '\0'; - p1 = lookup_param(inp); - 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; + if (!*str) /* EOL - do not finalize word */ + break; + *pos++ = '\0'; + if (n) debug_printf_expand("expand_on_ifs 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++] = pos; + str += strspn(str, ifs); /* skip ifs chars */ + } + *posp = pos; + return n; +} + +/* Expand all variable references in given string, adding words to list[] + * at n, n+1,... positions. Return updated n (so that list[n] is next one + * to be filled). This routine is extremely tricky: has to deal with + * variables/parameters with whitespace, $* and $@, and constructs like + * '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, 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; + char *p; + char *pos = *posp; + + ored_ch = 0; + + if (n) debug_printf_expand("expand_vars_to_list 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++] = pos; + + while ((p = strchr(arg, SPECIAL_VAR_SYMBOL))) { + memcpy(pos, arg, p - arg); + pos += (p - arg); + arg = ++p; + p = strchr(p, SPECIAL_VAR_SYMBOL); + + 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()); + break; + case '!': /* bg pid */ + val = last_bg_pid ? utoa(last_bg_pid) : (char*)""; + break; + case '?': /* exitcode */ + val = utoa(last_return_code); + break; + case '#': /* argc */ + val = utoa(global_argc ? global_argc-1 : 0); + break; + case '*': + case '@': + i = 1; + if (!(first_ch & 0x80)) { /* unquoted $* or $@ */ + while (i < global_argc) { + 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) { + /* this argv[] is not empty and not last: + * put terminating NUL, start new word */ + *pos++ = '\0'; + if (n) debug_printf_expand("expand_vars_to_list 2 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++] = pos; + } + } + } else + /* If or_mask is nonzero, we handle assignment 'a=....$@.....' + * and in this case should theat it like '$*' */ + if (first_ch == ('@'|0x80) && !or_mask) { /* quoted $@ */ + while (1) { + strcpy(pos, global_argv[i]); + pos += strlen(global_argv[i]); + if (++i >= global_argc) + break; + *pos++ = '\0'; + if (n) debug_printf_expand("expand_vars_to_list 3 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++] = pos; + } + } else { /* quoted $*: add as one word */ + while (1) { + strcpy(pos, global_argv[i]); + pos += strlen(global_argv[i]); + if (++i >= global_argc) + break; + if (ifs[0]) + *pos++ = ifs[0]; + } + } + break; + default: + *p = '\0'; + arg[0] = first_ch & 0x7f; + if (isdigit(arg[0])) { + i = xatoi_u(arg); + val = NULL; + if (i < global_argc) + val = global_argv[i]; + } else + val = lookup_param(arg); + arg[0] = first_ch; + *p = SPECIAL_VAR_SYMBOL; + if (!(first_ch & 0x80)) { /* unquoted $VAR */ + if (val) { + n = expand_on_ifs(list, n, &pos, val); + val = NULL; + } + } /* else: quoted $VAR, val will be appended at pos */ + } + if (val) { + strcpy(pos, val); + pos += strlen(val); + } + arg = ++p; + } + debug_printf_expand("expand_vars_to_list adding tail '%s' at %p\n", arg, pos); + strcpy(pos, arg); + pos += strlen(arg) + 1; + if (pos == list[n-1] + 1) { /* expansion is empty */ + if (!(ored_ch & 0x80)) { /* all vars were not quoted... */ + debug_printf_expand("expand_vars_to_list list[%d] empty, going back\n", n); + pos--; + n--; } - *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 = ' '; + + *posp = pos; + return n; +} + +static char **expand_variables(char **argv, char or_mask) +{ + int n; + int count = 1; + int len = 0; + char *pos, **v, **list; + + v = argv; + if (!*v) debug_printf_expand("count_var_expansion_space: " + "argv[0]=NULL count=%d len=%d alloc_space=%d\n", + count, len, sizeof(char*) * count + len); + while (*v) { + count_var_expansion_space(&count, &len, *v); + debug_printf_expand("count_var_expansion_space: " + "'%s' count=%d len=%d alloc_space=%d\n", + *v, count, len, sizeof(char*) * count + len); + v++; + } + len += sizeof(char*) * count; /* total to alloc */ + list = xmalloc(len); + pos = (char*)(list + count); + debug_printf_expand("list=%p, list[0] should be %p\n", list, pos); + n = 0; + v = argv; + while (*v) + n = expand_vars_to_list(list, n, &pos, *v++, or_mask); + + 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; + +#ifdef DEBUG_EXPAND + { + int m = 0; + while (m <= n) { + debug_printf_expand("list[%d]=%p '%s'\n", m, list[m], list[m]); + m++; } + debug_printf_expand("used_space=%d\n", pos - (char*)list); } - return (res_str == NULL) ? inp : res_str; +#endif + 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 *expand_string_to_string(const char *str) +{ + char *argv[2], **list; + + 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++; + } + } + 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 */ @@ -2364,9 +2694,10 @@ static const char *get_local_var(const char *s) if (!s) return NULL; - for (cur = top_vars; cur; cur = cur->next) + for (cur = top_vars; cur; cur = cur->next) { if (strcmp(cur->name, s) == 0) return cur->value; + } return NULL; } @@ -2380,7 +2711,7 @@ static int set_local_var(const char *s, int flg_export) int result = 0; struct variables *cur; - name = strdup(s); + name = xstrdup(s); /* Assume when we enter this function that we are already in * NAME=VALUE format. So the first order of business is to @@ -2394,48 +2725,38 @@ static int set_local_var(const char *s, int flg_export) *value++ = '\0'; for (cur = top_vars; cur; cur = cur->next) { - if (strcmp(cur->name, name) == 0) - break; - } - - if (cur) { - if (strcmp(cur->value, value) == 0) { - if (flg_export > 0 && cur->flg_export == 0) - 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 = strdup(value); - } - } else { - cur = malloc(sizeof(struct variables)); - if (!cur) { - result = -1; - } else { - cur->name = strdup(name); - if (!cur->name) { - free(cur); + 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 { - struct variables *bottom = top_vars; - cur->value = strdup(value); - cur->next = 0; - cur->flg_export = flg_export; - cur->flg_read_only = 0; - while (bottom->next) - bottom = bottom->next; - bottom->next = cur; + if (flg_export > 0 || cur->flg_export > 1) + cur->flg_export = 1; + free((char*)cur->value); + cur->value = xstrdup(value); } + goto skip; } } + cur = xzalloc(sizeof(*cur)); + /*cur->next = 0;*/ + cur->name = xstrdup(name); + cur->value = xstrdup(value); + 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); @@ -2541,20 +2862,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 */ } @@ -2563,6 +2883,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 { @@ -2576,61 +2897,70 @@ 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(); + 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. */ @@ -2649,11 +2979,11 @@ static int done_word(o_string *dest, struct p_context *ctx) glob_target = &ctx->pending_redirect->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)); @@ -2681,10 +3011,12 @@ static int done_word(o_string *dest, struct p_context *ctx) } else { child->argv = glob_target->gl_pathv; } +#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; } @@ -2724,8 +3056,8 @@ static int done_command(struct p_context *ctx) /*child->group = NULL;*/ /*child->glob_result.gl_pathv = NULL;*/ child->family = pi; - /*child->sp = 0;*/ - child->type = ctx->parse_type; + //sp: /*child->sp = 0;*/ + //pt: child->parse_type = ctx->parse_type; ctx->child = child; /* but ctx->pipe and ctx->list_head remain unchanged */ @@ -2741,7 +3073,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. */ @@ -2812,6 +3144,7 @@ static int redirect_opt_num(o_string *o) return num; } +#if ENABLE_HUSH_TICK static FILE *generate_stream_from_list(struct pipe *head) { FILE *pf; @@ -2843,16 +3176,18 @@ static FILE *generate_stream_from_list(struct pipe *head) static int process_command_subs(o_string *dest, struct p_context *ctx, struct in_str *input, const char *subst_end) { - int retcode; + int retcode, ch, eol_cnt; o_string result = NULL_O_STRING; struct p_context inner; FILE *p; struct in_str pipe_str; + initialize_context(&inner); /* 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); @@ -2860,31 +3195,26 @@ static int process_command_subs(o_string *dest, struct p_context *ctx, p = generate_stream_from_list(inner.list_head); if (p == NULL) return 1; mark_open(fileno(p)); -// FIXME: need to flag pipe_str to somehow discard all trailing newlines. -// Example: echo "TEST`date;echo;echo`BEST" -// must produce one line: TESTBEST setup_file_in_str(&pipe_str, p); /* now send results of command back into original context */ -// FIXME: must not do quote parsing of the output! -// Example: echo "TEST`echo '$(echo ZZ)'`BEST" -// must produce TEST$(echo ZZ)BEST, not TESTZZBEST. -// Example: echo "TEST`echo "'"`BEST" -// must produce TEST'BEST -// (maybe by setting all chars flagged as literals in map[]?) - - retcode = parse_stream(dest, ctx, &pipe_str, NULL); - /* XXX In case of a syntax error, should we try to kill the child? - * That would be tough to do right, so just read until EOF. */ - if (retcode == 1) { - while (b_getch(&pipe_str) != EOF) - /* discard */; + eol_cnt = 0; + while ((ch = b_getch(&pipe_str)) != EOF) { + if (ch == '\n') { + eol_cnt++; + continue; + } + while (eol_cnt) { + b_addqchr(dest, '\n', dest->quote); + eol_cnt--; + } + b_addqchr(dest, ch, dest->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)); @@ -2893,6 +3223,7 @@ static int process_command_subs(o_string *dest, struct p_context *ctx, debug_printf("pclosed, retcode=%d\n", retcode); return retcode; } +#endif static int parse_group(o_string *dest, struct p_context *ctx, struct in_str *input, int ch) @@ -2904,21 +3235,15 @@ 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); done_word(dest, &sub); /* finish off the final word in the subcontext */ @@ -2943,100 +3268,68 @@ static const char *lookup_param(const char *src) return p; } -/* Make new string for parser */ -static char* make_string(char ** inp) -{ - char *p; - char *str = NULL; - int n; - int len = 2; - - for (n = 0; inp[n]; n++) { - p = insert_var_value(inp[n]); - str = xrealloc(str, (len + strlen(p))); - if (n) { - strcat(str, " "); - } else { - *str = '\0'; - } - strcat(str, p); - len = strlen(str) + 3; - if (p != inp[n]) free(p); - } - len = strlen(str); - str[len] = '\n'; - str[len+1] = '\0'; - return str; -} - /* 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 i, advance = 0; - char sep[] = " "; - int ch = input->peek(input); /* first character after the $ */ - debug_printf("handle_dollar: ch=%c\n", ch); + int ch = b_peek(input); /* first character after the $ */ + unsigned char quote_mask = dest->quote ? 0x80 : 0; + + debug_printf_parse("handle_dollar entered: ch='%c'\n", ch); if (isalpha(ch)) { b_addchr(dest, SPECIAL_VAR_SYMBOL); - ctx->child->sp++; - while (ch = b_peek(input), isalnum(ch) || ch == '_') { + //sp: ctx->child->sp++; + while (1) { + debug_printf_parse(": '%c'\n", ch); b_getch(input); - b_addchr(dest, ch); + b_addchr(dest, ch | quote_mask); + quote_mask = 0; + ch = b_peek(input); + if (!isalnum(ch) && ch != '_') + break; } b_addchr(dest, SPECIAL_VAR_SYMBOL); } else if (isdigit(ch)) { - i = ch - '0'; /* XXX is $0 special? */ - if (i < global_argc) { - parse_string(dest, ctx, global_argv[i]); /* recursion */ - } - advance = 1; + make_one_char_var: + b_addchr(dest, SPECIAL_VAR_SYMBOL); + //sp: ctx->child->sp++; + debug_printf_parse(": '%c'\n", ch); + b_getch(input); + b_addchr(dest, ch | quote_mask); + b_addchr(dest, SPECIAL_VAR_SYMBOL); } else switch (ch) { - case '$': - b_adduint(dest, getpid()); - advance = 1; - break; - case '!': - if (last_bg_pid > 0) b_adduint(dest, last_bg_pid); - advance = 1; - break; - case '?': - b_adduint(dest, last_return_code); - advance = 1; - break; - case '#': - b_adduint(dest, global_argc ? global_argc-1 : 0); - advance = 1; - break; + case '$': /* pid */ + case '!': /* last bg pid */ + case '?': /* last exit code */ + case '#': /* number of args */ + case '*': /* args */ + case '@': /* args */ + goto make_one_char_var; case '{': b_addchr(dest, SPECIAL_VAR_SYMBOL); - ctx->child->sp++; + //sp: ctx->child->sp++; b_getch(input); /* XXX maybe someone will try to escape the '}' */ while (1) { ch = b_getch(input); - if (ch == EOF || ch == '}') + if (ch == '}') break; - b_addchr(dest, ch); - } - if (ch != '}') { - syntax(); - return 1; + if (!isalnum(ch) && ch != '_') { + syntax("unterminated ${name}"); + debug_printf_parse("handle_dollar return 1: unterminated ${name}\n"); + return 1; + } + 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; - case '*': - sep[0] = ifs[0]; - for (i = 1; i < global_argc; i++) { - parse_string(dest, ctx, global_argv[i]); - if (i+1 < global_argc) - parse_string(dest, ctx, sep); - } - break; - case '@': +#endif case '-': case '_': /* still unhandled, but should be eventually */ @@ -3044,24 +3337,12 @@ 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->quote); } - /* Eat the character if the flag was set. If the compiler - * is smart enough, we could substitute "b_getch(input);" - * for all the "advance = 1;" above, and also end up with - * a nice size-optimized program. Hah! That'll be the day. - */ - if (advance) b_getch(input); + debug_printf_parse("handle_dollar return 0\n"); return 0; } -static int parse_string(o_string *dest, struct p_context *ctx, const char *src) -{ - struct in_str foo; - setup_string_in_str(&foo, src); - return parse_stream(dest, ctx, &foo, NULL); -} - /* return code is 0 for normal exit, 1 for syntax error */ static int parse_stream(o_string *dest, struct p_context *ctx, struct in_str *input, const char *end_trigger) @@ -3077,22 +3358,35 @@ static int parse_stream(o_string *dest, struct p_context *ctx, debug_printf_parse("parse_stream entered, end_trigger='%s'\n", end_trigger); - while ((ch = b_getch(input)) != EOF) { - m = map[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); - if (m == MAP_ORDINARY - || (m != MAP_NEVER_FLOWTROUGH && dest->quote) + if (m == CHAR_ORDINARY + || (m != CHAR_SPECIAL && dest->quote) ) { + if (ch == EOF) { + syntax("unterminated \""); + debug_printf_parse("parse_stream return 1: unterminated \"\n"); + return 1; + } b_addqchr(dest, ch, dest->quote); continue; } - if (m == MAP_IFS_IF_UNQUOTED) { + if (m == CHAR_IFS) { if (done_word(dest, 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] */ @@ -3106,7 +3400,7 @@ static int parse_stream(o_string *dest, struct p_context *ctx, debug_printf_parse("parse_stream return 0: end_trigger char found\n"); return 0; } - if (m == MAP_IFS_IF_UNQUOTED) + if (m == CHAR_IFS) continue; switch (ch) { case '#': @@ -3123,7 +3417,7 @@ static int parse_stream(o_string *dest, struct p_context *ctx, break; case '\\': if (next == EOF) { - syntax(); + syntax("\\"); debug_printf_parse("parse_stream return 1: \\\n"); return 1; } @@ -3145,7 +3439,7 @@ 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; } @@ -3154,9 +3448,11 @@ static int parse_stream(o_string *dest, struct p_context *ctx, dest->nonnull = 1; dest->quote = !dest->quote; 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); @@ -3164,11 +3460,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 '<': @@ -3181,11 +3480,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 ';': @@ -3222,13 +3524,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 @@ -3245,46 +3546,47 @@ static int parse_stream(o_string *dest, struct p_context *ctx, return 0; } -static void mapset(const char *set, int code) +static void set_in_charmap(const char *set, int code) { while (*set) - map[(unsigned char)*set++] = code; + charmap[(unsigned char)*set++] = code; } -static void update_ifs_map(void) +static void update_charmap(void) { - /* char *ifs and char map[256] are both globals. */ + /* char *ifs and char charmap[256] are both globals. */ ifs = getenv("IFS"); if (ifs == NULL) ifs = " \t\n"; /* Precompute a list of 'flow through' behavior so it can be treated * quickly up front. Computation is necessary because of IFS. * Special case handling of IFS == " \t\n" is not implemented. - * The map[] array only really needs two bits each, and on most machines - * that would be faster because of the reduced L1 cache footprint. + * The charmap[] array only really needs two bits each, + * and on most machines that would be faster (reduced L1 cache use). */ - memset(map, MAP_ORDINARY, sizeof(map)); /* most chars flow through always */ - mapset("\\$'\"`", MAP_NEVER_FLOWTROUGH); - mapset("<>;&|(){}#", MAP_FLOWTROUGH_IF_QUOTED); - mapset(ifs, MAP_IFS_IF_UNQUOTED); /* also flow through if quoted */ + 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); /* 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) { -// FIXME: '{ true | exit 3; echo $? }' is parsed as a whole, -// as a result $? is replaced by 0, not 3! - struct p_context ctx; o_string temp = NULL_O_STRING; int rcode; do { ctx.parse_type = parse_flag; initialize_context(&ctx); - update_ifs_map(); - if (!(parse_flag & FLAG_PARSE_SEMICOLON) || (parse_flag & FLAG_REPARSING)) - mapset(";$&|", MAP_ORDINARY); + update_charmap(); + if (!(parse_flag & PARSEFLAG_SEMICOLON) || (parse_flag & PARSEFLAG_REPARSING)) + set_in_charmap(";$&|", CHAR_ORDINARY); #if ENABLE_HUSH_INTERACTIVE inp->promptmode = 1; #endif @@ -3293,7 +3595,7 @@ static int parse_stream_outer(struct in_str *inp, int parse_flag) * 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); @@ -3312,23 +3614,23 @@ static int parse_stream_outer(struct in_str *inp, int parse_flag) free_pipe_list(ctx.list_head, 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; } @@ -3374,40 +3676,25 @@ int hush_main(int argc, char **argv) FILE *input; char **e; + PTR_TO_GLOBALS = xzalloc(sizeof(G)); + top_vars = &shell_ver; + shell_ver = const_shell_ver; /* copying struct here */ + #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; - /* map[] is taken care of with call to update_ifs_map() */ - 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; @@ -3422,7 +3709,7 @@ int hush_main(int argc, char **argv) input = fopen("/etc/profile", "r"); if (input != NULL) { mark_open(fileno(input)); - parse_file_outer(input); + parse_and_run_file(input); mark_closed(fileno(input)); fclose(input); } @@ -3434,15 +3721,15 @@ 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, - // we have to have some stuff (ctty, etc) - /*interactive_fd++;*/ + /* Well, we cannot just declare interactiveness, + * we have to have some stuff (ctty, etc) */ + /* interactive_fd++; */ break; case 'f': - fake_mode++; + fake_mode = 1; break; default: #ifndef BB_VER @@ -3515,7 +3802,7 @@ int hush_main(int argc, char **argv) #endif if (argv[optind] == NULL) { - opt = parse_file_outer(stdin); + opt = parse_and_run_file(stdin); goto final_return; } @@ -3523,7 +3810,7 @@ int hush_main(int argc, char **argv) global_argv = argv + optind; global_argc = argc - optind; input = xfopen(argv[optind], "r"); - opt = parse_file_outer(input); + opt = parse_and_run_file(input); #if ENABLE_FEATURE_CLEAN_UP fclose(input);