#include <glob.h> /* glob, of course */
#include <getopt.h> /* should be pretty obvious */
/* #include <dmalloc.h> */
+extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */
/* If you comment out one of these below, it will be #defined later
#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)
#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,
/* 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 ),
};
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? */
};
pid_t pid; /* 0 if exited */
char **argv; /* program name and arguments */
struct pipe *group; /* if non-NULL, first in group or subshell */
- int subshell; /* flag, non-zero if group must be forked */
+ smallint subshell; /* flag, non-zero if group must be forked */
+ smallint is_stopped; /* is the program currently running? */
struct redir_struct *redirects; /* I/O redirections */
glob_t glob_result; /* result of parameter globbing */
- int is_stopped; /* is the program currently running? */
struct pipe *family; /* pointer back to the child's parent pipe */
//sp counting seems to be broken... so commented out, grep for '//sp:'
//sp: int sp; /* number of SPECIAL_VAR_SYMBOL */
- int type;
+ //seems to be unused, grep for '//pt:'
+ //pt: int parse_type;
};
/* argv vector may contain variable references (^Cvar^C, ^C0^C etc)
* and on execution these are substituted with their values.
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 {
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 <unistd.h>, but protected with __USE_GNU */
-
-/* "globals" within this file */
-enum {
- CHAR_ORDINARY = 0,
- CHAR_ORDINARY_IF_QUOTED = 1, /* example: *, # */
- CHAR_IFS = 2, /* treated as ordinary if quoted */
- CHAR_SPECIAL = 3, /* example: $ */
-};
-static unsigned char charmap[256];
-static const char *ifs;
-static int fake_mode;
-static struct close_me *close_me_head;
-static const char *cwd;
-static unsigned last_bg_pid;
-#if !ENABLE_HUSH_INTERACTIVE
-enum { interactive_fd = 0 };
-#else
-/* 'interactive_fd' is a fd# open to ctty, if we have one
- * _AND_ if we decided to act interactively */
-static int interactive_fd;
-#if ENABLE_HUSH_JOB
-static pid_t saved_task_pgrp;
-static pid_t saved_tty_pgrp;
-static int last_jobid;
-static struct pipe *job_list;
-#endif
-static const char *PS1;
-static const char *PS2;
-#endif
-
-#define HUSH_VER_STR "0.02"
-static struct variables shell_ver = { NULL, "HUSH_VERSION", HUSH_VER_STR, 1, 1 };
-static struct variables *top_vars = &shell_ver;
-
-#define B_CHUNK 100
-#define B_NOSPAC 1
-
typedef struct {
char *data;
int length;
int 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? */
#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 */
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);
/* primary string parsing: */
static int redirect_dup_num(struct in_str *input);
static int redirect_opt_num(o_string *o);
+#if ENABLE_HUSH_TICK
static int process_command_subs(o_string *dest, struct p_context *ctx, struct in_str *input, const char *subst_end);
+#endif
static int parse_group(o_string *dest, struct p_context *ctx, struct in_str *input, int ch);
static const char *lookup_param(const char *src);
-static char *make_string(char **inp);
static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *input);
static int parse_stream(o_string *dest, struct p_context *ctx, struct in_str *input0, const char *end_trigger);
/* setup: */
-static int parse_stream_outer(struct in_str *inp, int parse_flag);
-static int parse_string_outer(const char *s, int parse_flag);
-static int parse_file_outer(FILE *f);
+static int parse_and_run_stream(struct in_str *inp, int parse_flag);
+static int parse_and_run_string(const char *s, int parse_flag);
+static int parse_and_run_file(FILE *f);
/* job management: */
static int checkjobs(struct pipe* fg_pipe);
#if ENABLE_HUSH_JOB
int checkjobs_and_fg_shell(struct pipe* fg_pipe); /* never called */
#endif
/* local variable support */
-static char **do_variable_expansion(char **argv);
-static char *insert_var_value(char *inp);
+static 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);
* 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 }
-};
-
-#if ENABLE_FEATURE_SH_STANDALONE
-struct nofork_save_area nofork_save;
+ 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
signal(SIGCHLD, handler);
}
-static struct pipe *toplevel_list;
-static sigjmp_buf toplevel_jb;
-smallint ctrl_z_flag;
static void handler_ctrl_c(int sig)
{
debug_printf_jobs("got sig %d\n", sig);
/* 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;
}
/* 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 */
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;
* (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)
{
return prompt_str;
}
-#if ENABLE_FEATURE_EDITING
-static line_input_t *line_input_state;
-#endif
-
static void get_user_input(struct in_str *i)
{
- static char the_command[ENABLE_FEATURE_EDITING ? BUFSIZ : 2];
-
int r;
const char *prompt_str;
prompt_str = setup_prompt_string(i->promptmode);
#if ENABLE_FEATURE_EDITING
- /*
- ** enable command line editing only while a command line
- ** is actually being read; otherwise, we'll end up bequeathing
- ** atexit() handlers and other unwanted stuff to our
- ** child processes (rob@sysgo.de)
- */
- r = read_line_input(prompt_str, the_command, BUFSIZ-1, line_input_state);
+ /* Enable command line editing only while a command line
+ * is actually being read; 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 */
- the_command[0] = EOF; /* yes, it will be truncated, it's ok */
- the_command[1] = '\0';
+ user_input_buf[0] = EOF; /* yes, it will be truncated, it's ok */
+ user_input_buf[1] = '\0';
}
#else
fputs(prompt_str, stdout);
fflush(stdout);
- the_command[0] = r = fgetc(i->file);
- /*the_command[1] = '\0'; - already is and never changed */
+ user_input_buf[0] = r = fgetc(i->file);
+ /*user_input_buf[1] = '\0'; - already is and never changed */
i->eof_flag = (r == EOF);
#endif
- i->p = the_command;
+ i->p = user_input_buf;
}
#endif /* INTERACTIVE */
debug_printf_exec("pid %d environment modification: %s\n",
getpid(), argv[i]);
// FIXME: vfork case??
- p = insert_var_value(argv[i]);
- putenv(p == argv[i] ? xstrdup(p) : p);
+ p = expand_string_to_string(argv[i]);
+ putenv(p);
}
argv += i;
/* If a variable is assigned in a forest, and nobody listens,
_exit(EXIT_SUCCESS);
}
- argv = do_variable_expansion(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 = 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]);
- 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 = do_variable_expansion(argv + i);
- rcode = x->function(argv_expanded);
+ argv_expanded = expand_strvec_to_strvec(argv + i);
+ rcode = x->function(argv_expanded) & 0xff;
free(argv_expanded);
restore_redirects(squirrel);
debug_printf_exec("run_pipe_real return %d\n", rcode);
save_nofork_data(&nofork_save);
argv_expanded = argv + i;
//sp: if (child->sp)
- argv_expanded = do_variable_expansion(argv + i);
+ argv_expanded = expand_strvec_to_strvec(argv + i);
debug_printf_exec(": run_nofork_applet '%s' '%s'...\n", argv_expanded[0], argv_expanded[1]);
- rcode = run_nofork_applet_prime(&nofork_save, a, argv_expanded);
+ rcode = run_nofork_applet_prime(&nofork_save, a, argv_expanded) & 0xff;
free(argv_expanded);
restore_redirects(squirrel);
debug_printf_exec("run_pipe_real return %d\n", rcode);
/* 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" ,
};
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];
* 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
-
+ 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 */
- 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 */
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");
#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) {
+#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 = do_variable_expansion(pi->next->progs->argv);
+ for_list = expand_strvec_to_strvec(pi->next->progs->argv);
for_lcur = for_list;
for_varname = pi->progs->argv[0];
pi->progs->argv[0] = NULL;
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 */
* 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);
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);
}
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;
}
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;
return gr;
}
-
-/* do_variable_expansion() takes a list of strings, expands
+/* expand_strvec_to_strvec() takes a list of strings, expands
* all variable references within and returns a pointer to
* a list of expanded strings, possibly with larger number
* of strings. (Think VAR="a b"; echo $VAR).
* 'echo -$*-'. If you play here, you must run testsuite afterwards! */
/* NB: another bug is that we cannot detect empty strings yet:
* "" or $empty"" expands to zero words, has to expand to empty word */
-static int expand_vars_to_list(char **list, int n, char **posp, char *arg)
+static int expand_vars_to_list(char **list, int n, char **posp, char *arg, char or_mask)
{
+ /* or_mask is either 0 (normal case) or 0x80
+ * (expansion of right-hand side of assignment == 1-element expand) */
+
char first_ch, ored_ch;
int i;
const char *val;
arg = ++p;
p = strchr(p, SPECIAL_VAR_SYMBOL);
- first_ch = arg[0];
+ first_ch = arg[0] | or_mask; /* forced to "quoted" if or_mask = 0x80 */
ored_ch |= first_ch;
val = NULL;
switch (first_ch & 0x7f) {
list[n++] = pos;
}
}
- } else if (first_ch == ('@'|0x80)) { /* quoted $@ */
+ } 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]);
return n;
}
-static char **do_variable_expansion(char **argv)
+static char **expand_variables(char **argv, char or_mask)
{
int n;
int count = 1;
n = 0;
v = argv;
while (*v)
- n = expand_vars_to_list(list, n, &pos, *v++);
+ n = expand_vars_to_list(list, n, &pos, *v++, or_mask);
- if(n) debug_printf_expand("finalized list[%d]=%p '%s' "
+ if (n) debug_printf_expand("finalized list[%d]=%p '%s' "
"strlen=%d next=%p pos=%p\n", n-1, list[n-1], list[n-1],
strlen(list[n-1]), list[n-1] + strlen(list[n-1]) + 1, pos);
list[n] = NULL;
debug_printf_expand("used_space=%d\n", pos - (char*)list);
}
#endif
- /* To be removed / made conditional later. */
- if (pos - (char*)list > len)
- bb_error_msg_and_die("BUG in varexp");
+ if (ENABLE_HUSH_DEBUG)
+ if (pos - (char*)list > len)
+ bb_error_msg_and_die("BUG in varexp");
return list;
}
+static char **expand_strvec_to_strvec(char **argv)
+{
+ return expand_variables(argv, 0);
+}
-static char *insert_var_value(char *inp)
+static char *expand_string_to_string(const char *str)
{
- int res_str_len = 0;
- int len;
- int done = 0;
- int i;
- const char *p1;
- char *p, *p2;
- char *res_str = NULL;
-
- while ((p = strchr(inp, SPECIAL_VAR_SYMBOL))) {
- if (p != inp) {
- len = p - inp;
- res_str = xrealloc(res_str, (res_str_len + len));
- strncpy((res_str + res_str_len), inp, len);
- res_str_len += len;
- }
- inp = ++p;
- p = strchr(inp, SPECIAL_VAR_SYMBOL);
- *p = '\0';
-
- switch (inp[0]) {
- case '$':
- /* FIXME: (echo $$) should still print pid of main shell */
- p1 = utoa(getpid());
- break;
- case '!':
- p1 = last_bg_pid ? utoa(last_bg_pid) : (char*)"";
- break;
- case '?':
- p1 = utoa(last_return_code);
- break;
- case '#':
- p1 = utoa(global_argc ? global_argc-1 : 0);
- break;
- case '*':
- case '@': /* FIXME: we treat $@ as $* for now */
- len = 1;
- for (i = 1; i < global_argc; i++)
- len += strlen(global_argv[i]) + 1;
- p1 = p2 = alloca(--len);
- for (i = 1; i < global_argc; i++) {
- strcpy(p2, global_argv[i]);
- p2 += strlen(global_argv[i]);
- *p2++ = ifs[0];
- }
- *--p2 = '\0';
- break;
- default:
- p1 = lookup_param(inp);
- }
+ char *argv[2], **list;
- if (p1) {
- len = res_str_len + strlen(p1);
- res_str = xrealloc(res_str, 1 + len);
- strcpy(res_str + res_str_len, p1);
- res_str_len = len;
- }
- *p = SPECIAL_VAR_SYMBOL;
- inp = ++p;
- done = 1;
- }
- if (done) {
- res_str = xrealloc(res_str, (1 + res_str_len + strlen(inp)));
- strcpy((res_str + res_str_len), inp);
- while ((p = strchr(res_str, '\n'))) {
- *p = ' ';
+ argv[0] = (char*)str;
+ argv[1] = NULL;
+ list = expand_variables(argv, 0x80); /* 0x80: make one-element expansion */
+ if (ENABLE_HUSH_DEBUG)
+ if (!list[0] || list[1])
+ bb_error_msg_and_die("BUG in varexp2");
+ /* actually, just move string 2*sizeof(char*) bytes back */
+ strcpy((char*)list, list[0]);
+ debug_printf_expand("string_to_string='%s'\n", (char*)list);
+ return (char*)list;
+}
+
+static char* expand_strvec_to_string(char **argv)
+{
+ char **list;
+
+ list = expand_variables(argv, 0x80);
+ /* Convert all NULs to spaces */
+ if (list[0]) {
+ int n = 1;
+ while (list[n]) {
+ if (ENABLE_HUSH_DEBUG)
+ if (list[n-1] + strlen(list[n-1]) + 1 != list[n])
+ bb_error_msg_and_die("BUG in varexp3");
+ list[n][-1] = ' '; /* TODO: or to ifs[0]? */
+ n++;
}
}
- return (res_str == NULL) ? inp : res_str;
+ strcpy((char*)list, list[0]);
+ debug_printf_expand("strvec_to_string='%s'\n", (char*)list);
+ return (char*)list;
}
-
/* This is used to get/check local shell variables */
static const char *get_local_var(const char *s)
{
}
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;*/
{
/*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 */
}
* 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;
}
- 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));
} 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;
}
/*child->glob_result.gl_pathv = NULL;*/
child->family = pi;
//sp: /*child->sp = 0;*/
- child->type = ctx->parse_type;
+ //pt: child->parse_type = ctx->parse_type;
ctx->child = child;
/* but ctx->pipe and ctx->list_head remain unchanged */
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 <enter> on command line generates
* tree of three NOPs (!). Which is harmless but annoying.
* IOW: it is safe to do it unconditionally. */
return num;
}
+#if ENABLE_HUSH_TICK
static FILE *generate_stream_from_list(struct pipe *head)
{
FILE *pf;
/* 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("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));
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)
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 = insert_var_value(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;
}
b_addchr(dest, SPECIAL_VAR_SYMBOL);
break;
+#if ENABLE_HUSH_TICK
case '(':
b_getch(input);
process_command_subs(dest, ctx, input, ")");
break;
+#endif
case '-':
case '_':
/* still unhandled, but should be eventually */
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;
}
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);
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
* and on most machines that would be faster (reduced L1 cache use).
*/
memset(charmap, CHAR_ORDINARY, sizeof(charmap));
+#if ENABLE_HUSH_TICK
set_in_charmap("\\$\"`", CHAR_SPECIAL);
+#else
+ set_in_charmap("\\$\"", CHAR_SPECIAL);
+#endif
set_in_charmap("<>;&|(){}#'", CHAR_ORDINARY_IF_QUOTED);
- set_in_charmap(ifs, CHAR_IFS); /* also flow through if quoted */
+ set_in_charmap(ifs, CHAR_IFS); /* are ordinary if quoted */
}
/* most recursion does not come through here, the exception is
- * from builtin_source() */
-static int parse_stream_outer(struct in_str *inp, int parse_flag)
+ * from builtin_source() and builtin_eval() */
+static int parse_and_run_stream(struct in_str *inp, int parse_flag)
{
struct p_context ctx;
o_string temp = NULL_O_STRING;
ctx.parse_type = parse_flag;
initialize_context(&ctx);
update_charmap();
- if (!(parse_flag & FLAG_PARSE_SEMICOLON) || (parse_flag & FLAG_REPARSING))
+ if (!(parse_flag & PARSEFLAG_SEMICOLON) || (parse_flag & PARSEFLAG_REPARSING))
set_in_charmap(";$&|", CHAR_ORDINARY);
#if ENABLE_HUSH_INTERACTIVE
inp->promptmode = 1;
* 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);
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;
}
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;
- /* charmap[] is taken care of with call to update_charmap() */
- fake_mode = 0;
- close_me_head = NULL;
-#if ENABLE_HUSH_INTERACTIVE
- interactive_fd = 0;
-#endif
-#if ENABLE_HUSH_JOB
- last_bg_pid = 0;
- job_list = NULL;
- last_jobid = 0;
-#endif
-
/* Initialize some more globals to non-zero values */
set_cwd();
#if ENABLE_HUSH_INTERACTIVE
#if ENABLE_FEATURE_EDITING
cmdedit_set_initial_prompt();
-#else
- PS1 = NULL;
#endif
PS2 = "> ";
#endif
+
/* initialize our shell local variables with the values
* currently living in the environment */
e = environ;
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, FLAG_PARSE_SEMICOLON);
+ opt = parse_and_run_string(optarg, PARSEFLAG_SEMICOLON);
goto final_return;
case 'i':
/* Well, we cannot just declare interactiveness,
/* interactive_fd++; */
break;
case 'f':
- fake_mode++;
+ fake_mode = 1;
break;
default:
#ifndef BB_VER
#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);
projects / oweals / busybox.git / blobdiff