#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)
/* 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 ),
};
#define B_NOSPAC 1
#define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n"
-static void __syntax(int line)
+#if 1
+/* Normal */
+static void syntax(const char *msg)
+{
+ (interactive_fd ? bb_error_msg : bb_error_msg_and_die)
+ (msg ? "%s: %s" : "syntax error", "syntax error", msg);
+}
+#else
+/* Debug */
+static void syntax_lineno(int line)
{
- bb_error_msg("syntax error hush.c:%d", line);
+ (interactive_fd ? bb_error_msg : bb_error_msg_and_die)
+ ("syntax error hush.c:%d", line);
}
-#define syntax() __syntax(__LINE__)
+#define syntax(str) syntax_lineno(__LINE__)
+#endif
/* Index of subroutines: */
/* function prototypes for builtins */
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);
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);
#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
int checkjobs_and_fg_shell(struct pipe* fg_pipe); /* never called */
#endif
/* local variable support */
-static char **expand_variables_to_list(char **argv);
+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_variables_to_string(const char *str);
+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);
* still be set at the end. */
struct built_in_command {
const char *cmd; /* name */
- const char *descr; /* description */
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
/* 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, PARSEFLAG_EXIT_FROM_LOOP |
+ 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;
/* built-in 'cd <path>' 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)) {
#endif
/* built-in 'help' handler */
+#if ENABLE_HUSH_HELP
static int builtin_help(char **argv ATTRIBUTE_UNUSED)
{
const struct built_in_command *x;
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 */
* (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;
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)
{
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)
- */
+ /* 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 */
debug_printf_exec("pid %d environment modification: %s\n",
getpid(), argv[i]);
// FIXME: vfork case??
- p = expand_variables_to_string(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,
_exit(EXIT_SUCCESS);
}
- argv = expand_variables_to_list(argv);
+ argv = expand_strvec_to_strvec(argv);
/*
* Check if the command matches any of the builtins.
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;
* 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)
{
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) {
export_me = 1;
}
free(name);
- p = expand_variables_to_string(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 = expand_variables_to_string(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) {
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 = expand_variables_to_list(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);
save_nofork_data(&nofork_save);
argv_expanded = argv + i;
//sp: if (child->sp)
- argv_expanded = expand_variables_to_list(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);
/* 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 */
};
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" ,
};
* global data until exec/_exit (we can be a child after vfork!) */
static int run_list_real(struct pipe *pi)
{
+ 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;
+#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 */
+#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", run_list_level + 1);
+#if ENABLE_HUSH_LOOPS
/* check syntax for "for" */
for (rpipe = pi; rpipe; rpipe = rpipe->next) {
if ((rpipe->res_word == RES_IN || rpipe->res_word == RES_FOR)
&& (rpipe->next == NULL)
) {
- syntax(); /* unterminated FOR (no IN or no commands after IN) */
+ 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;
}
|| (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) */
+ 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".
for (; pi; pi = flag_restore ? rpipe : pi->next) {
rword = pi->res_word;
+#if ENABLE_HUSH_LOOPS
if (rword == RES_WHILE || rword == RES_UNTIL || rword == RES_FOR) {
flag_restore = 0;
if (!rpipe) {
rpipe = pi;
}
}
+#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) {
}
flag_skip = 1;
skip_more_for_this_rword = RES_XXXX;
+#if ENABLE_HUSH_IF
if (rword == RES_THEN || rword == RES_ELSE)
if_code = next_if_code;
if (rword == RES_THEN && if_code)
continue;
if (rword == RES_ELIF && !if_code)
break;
+#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 */
- for_list = expand_variables_to_list(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;
rpipe = NULL;
}
}
+#endif
if (pi->num_progs == 0)
continue;
save_num_progs = pi->num_progs; /* save number of programs */
* 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 (run_list_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 */
+ /* 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);
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 ENABLE_HUSH_IF
if (rword == RES_IF || rword == RES_ELIF)
next_if_code = rcode; /* can be overwritten a number of times */
+#endif
+#if ENABLE_HUSH_LOOPS
if (rword == RES_WHILE)
flag_rep = !last_return_code;
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)
) {
return gr;
}
-/* expand_variables_to_list() 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).
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_variables_to_list(char **argv)
+static char **expand_strvec_to_strvec(char **argv)
{
return expand_variables(argv, 0);
}
-static char *expand_variables_to_string(const char *str)
+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 */
- /* To be removed / made conditional later. */
- if (!list[0] || list[1])
- bb_error_msg_and_die("BUG in varexp");
+ 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;
}
}
cur = xzalloc(sizeof(*cur));
+ /*cur->next = 0;*/
cur->name = xstrdup(name);
cur->value = xstrdup(value);
- /*cur->next = 0;*/
cur->flg_export = flg_export;
/*cur->flg_read_only = 0;*/
{
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 */
}
* 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 {
* 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. */
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;
}
} 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;
}
/* 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);
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 */
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 = expand_variables_to_string(inp[n]);
- val_len = strlen(p);
- str = xrealloc(str, len + val_len + 3); /* +3: space, '\n', <nul>*/
- 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;
-}
-
/* return code: 0 for OK, 1 for syntax error */
static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *input)
{
/* 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;
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);
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;
}
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] */
break;
case '\\':
if (next == EOF) {
- syntax();
+ syntax("\\<eof>");
debug_printf_parse("parse_stream return 1: \\<eof>\n");
return 1;
}
b_addchr(dest, ch);
}
if (ch == EOF) {
- syntax();
+ syntax("unterminated '");
debug_printf_parse("parse_stream return 1: unterminated '\n");
return 1;
}
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 '<':
} 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 ';':
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
}
/* 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;
* 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);
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, PARSEFLAG_SEMICOLON);
+ rcode = parse_and_run_stream(&input, PARSEFLAG_SEMICOLON);
return rcode;
}
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);
}
case 'c':
global_argv = argv + optind;
global_argc = argc - optind;
- opt = parse_string_outer(optarg, PARSEFLAG_SEMICOLON);
+ opt = parse_and_run_string(optarg, PARSEFLAG_SEMICOLON);
goto final_return;
case 'i':
/* Well, we cannot just declare interactiveness,
#endif
if (argv[optind] == NULL) {
- opt = parse_file_outer(stdin);
+ opt = parse_and_run_file(stdin);
goto final_return;
}
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);