X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=shell%2Fhush.c;h=e83d49a86e8761487fc61d5bd82c7c9684f030e0;hb=032e2cbf20bd54a7b5ded482ed1ba9d3deb574f9;hp=9f1614d1f80dbdb76099515357f2c79ec8d38ad3;hpb=78a7c99f7fd2f6e9ed7b386e28b88319dad157de;p=oweals%2Fbusybox.git diff --git a/shell/hush.c b/shell/hush.c index 9f1614d1f..e83d49a86 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -9,14 +9,16 @@ * * Credits: * The parser routines proper are all original material, first - * written Dec 2000 and Jan 2001 by Larry Doolittle. - * The execution engine, the builtins, and much of the underlying - * support has been adapted from busybox-0.49pre's lash, - * which is Copyright (C) 2000 by Lineo, Inc., and - * written by Erik Andersen , . - * That, in turn, is based in part on ladsh.c, by Michael K. Johnson and - * Erik W. Troan, which they placed in the public domain. I don't know - * how much of the Johnson/Troan code has survived the repeated rewrites. + * written Dec 2000 and Jan 2001 by Larry Doolittle. The + * execution engine, the builtins, and much of the underlying + * support has been adapted from busybox-0.49pre's lash, which is + * Copyright (C) 1999-2004 by Erik Andersen + * written by Erik Andersen . That, in turn, + * is based in part on ladsh.c, by Michael K. Johnson and Erik W. + * Troan, which they placed in the public domain. I don't know + * how much of the Johnson/Troan code has survived the repeated + * rewrites. + * * Other credits: * simple_itoa() was lifted from boa-0.93.15 * b_addchr() derived from similar w_addchar function in glibc-2.2 @@ -55,7 +57,6 @@ * to-do: * port selected bugfixes from post-0.49 busybox lash - done? * finish implementing reserved words: for, while, until, do, done - * finish implementing local variable assignment * change { and } from special chars to reserved words * builtins: break, continue, eval, return, set, trap, ulimit * test magic exec @@ -107,15 +108,20 @@ /* #include */ /* #define DEBUG_SHELL */ -#ifdef BB_VER +#if 1 #include "busybox.h" #include "cmdedit.h" #else -#define applet_name "hush" +#define bb_applet_name "hush" #include "standalone.h" -#define shell_main main -#define BB_FEATURE_SH_SIMPLE_PROMPT +#define hush_main main +#undef CONFIG_FEATURE_SH_FANCY_PROMPT +#define BB_BANNER #endif +#define SPECIAL_VAR_SYMBOL 03 +#define FLAG_EXIT_FROM_LOOP 1 +#define FLAG_PARSE_SEMICOLON (1 << 1) /* symbol ';' is special for parser */ +#define FLAG_REPARSING (1 << 2) /* >=2nd pass */ typedef enum { REDIRECT_INPUT = 1, @@ -127,7 +133,7 @@ typedef enum { /* The descrip member of this structure is only used to make debugging * output pretty */ -struct {int mode; int default_fd; char *descrip;} redir_table[] = { +static const struct {int mode; int default_fd; const char *descrip;} redir_table[] = { { 0, 0, "()" }, { O_RDONLY, 0, "<" }, { O_CREAT|O_TRUNC|O_WRONLY, 1, ">" }, @@ -157,7 +163,8 @@ typedef enum { RES_DO = 9, RES_DONE = 10, RES_XXXX = 11, - RES_SNTX = 12 + RES_IN = 12, + RES_SNTX = 13 } reserved_style; #define FLAG_END (1<, but protected with __USE_GNU */ - -/* Variables we export */ -unsigned int shell_context; /* Used in cmdedit.c to reset the - * context when someone hits ^C */ /* "globals" within this file */ -static char *ifs=NULL; +static char *ifs; static char map[256]; -static int fake_mode=0; -static int interactive=0; -static struct close_me *close_me_head = NULL; +static int fake_mode; +static int interactive; +static struct close_me *close_me_head; static const char *cwd; -static struct jobset *job_list; -static unsigned int last_bg_pid=0; +static struct pipe *job_list; +static unsigned int last_bg_pid; +static unsigned int last_jobid; +static unsigned int shell_terminal; static char *PS1; -static char *PS2 = "> "; +static char *PS2; +static struct variables shell_ver = { "HUSH_VERSION", "0.01", 1, 1, 0 }; +static struct variables *top_vars = &shell_ver; + #define B_CHUNK (100) #define B_NOSPAC 1 -#define MAX_LINE 256 /* for cwd */ -#define MAX_READ 256 /* for builtin_read */ typedef struct { char *data; @@ -271,6 +284,7 @@ typedef struct { * available? Where is it documented? */ struct in_str { const char *p; + char peek_buf[2]; int __promptme; int promptmode; FILE *file; @@ -283,8 +297,8 @@ struct in_str { #define JOB_STATUS_FORMAT "[%d] %-22s %.40s\n" struct built_in_command { - char *cmd; /* name */ - char *descr; /* description */ + const char *cmd; /* name */ + const char *descr; /* description */ int (*function) (struct child_prog *); /* function ptr */ }; @@ -303,12 +317,12 @@ static void debug_printf(const char *format, ...) va_end(args); } #else -static void debug_printf(const char *format, ...) { } +static inline void debug_printf(const char *format, ...) { } #endif #define final_printf debug_printf -void __syntax(char *file, int line) { - fprintf(stderr,"syntax error %s:%d\n",file,line); +static void __syntax(char *file, int line) { + bb_error_msg("syntax error %s:%d", file, line); } #define syntax() __syntax(__FILE__, __LINE__) @@ -316,6 +330,7 @@ void __syntax(char *file, int line) { /* function prototypes for builtins */ static int builtin_cd(struct child_prog *child); static int builtin_env(struct child_prog *child); +static int builtin_eval(struct child_prog *child); static int builtin_exec(struct child_prog *child); static int builtin_exit(struct child_prog *child); static int builtin_export(struct child_prog *child); @@ -324,6 +339,7 @@ static int builtin_help(struct child_prog *child); static int builtin_jobs(struct child_prog *child); static int builtin_pwd(struct child_prog *child); static int builtin_read(struct child_prog *child); +static int builtin_set(struct child_prog *child); static int builtin_shift(struct child_prog *child); static int builtin_source(struct child_prog *child); static int builtin_umask(struct child_prog *child); @@ -345,14 +361,13 @@ static void setup_string_in_str(struct in_str *i, const char *s); /* close_me manipulations: */ static void mark_open(int fd); static void mark_closed(int fd); -static void close_all(); +static void close_all(void); /* "run" the final data structures: */ static char *indenter(int i); -static int run_list_test(struct pipe *head, int indent); -static int run_pipe_test(struct pipe *pi, int indent); +static int free_pipe_list(struct pipe *head, int indent); +static int free_pipe(struct pipe *pi, int indent); /* really run the final data structures: */ static int setup_redirects(struct child_prog *prog, int squirrel[]); -static int pipe_wait(struct pipe *pi); static int run_list_real(struct pipe *pi); static void pseudo_exec(struct child_prog *child) __attribute__ ((noreturn)); static int run_pipe_real(struct pipe *pi); @@ -361,7 +376,6 @@ static int globhack(const char *src, int flags, glob_t *pglob); static int glob_needed(const char *s); static int xglob(o_string *dest, int flags, glob_t *pglob); /* variable assignment: */ -static int set_local_var(const char *s); static int is_assignment(const char *s); /* data structure manipulation: */ static int setup_redirect(struct p_context *ctx, int fd, redir_type style, struct in_str *input); @@ -374,19 +388,25 @@ static int redirect_dup_num(struct in_str *input); static int redirect_opt_num(o_string *o); static int process_command_subs(o_string *dest, struct p_context *ctx, struct in_str *input, int subst_end); static int parse_group(o_string *dest, struct p_context *ctx, struct in_str *input, int ch); -static void lookup_param(o_string *dest, struct p_context *ctx, o_string *src); +static char *lookup_param(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, int end_trigger); /* setup: */ -static int parse_stream_outer(struct in_str *inp); -static int parse_string_outer(const char *s); +static int parse_stream_outer(struct in_str *inp, int flag); +static int parse_string_outer(const char *s, int flag); static int parse_file_outer(FILE *f); /* job management: */ -static void checkjobs(); +static int checkjobs(struct pipe* fg_pipe); static void insert_bg_job(struct pipe *pi); static void remove_bg_job(struct pipe *pi); -static void free_pipe(struct pipe *pi); +/* local variable support */ +static char **make_list_in(char **inp, char *name); +static char *insert_var_value(char *inp); +static char *get_local_var(const char *var); +static void unset_local_var(const char *name); +static int set_local_var(const char *s, int flg_export); /* Table of built-in functions. They can be forked or not, depending on * context: within pipes, they fork. As simple commands, they do not. @@ -394,14 +414,15 @@ static void free_pipe(struct pipe *pi); * in the parent shell process. If forked, of course they can not. * For example, 'unset foo | whatever' will parse and run, but foo will * still be set at the end. */ -static struct built_in_command bltins[] = { +static const struct built_in_command bltins[] = { {"bg", "Resume a job in the background", builtin_fg_bg}, {"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}, {"env", "Print all environment variables", builtin_env}, - {"eval", "Construct and run shell command", builtin_not_written}, - {"exec", "Exec command, replacing this shell with the exec'd process", builtin_exec}, + {"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}, {"fg", "Bring job into the foreground", builtin_fg_bg}, @@ -409,7 +430,7 @@ static struct built_in_command bltins[] = { {"pwd", "Print current directory", builtin_pwd}, {"read", "Input environment variable", builtin_read}, {"return", "Return from a function", builtin_not_written}, - {"set", "Set/unset shell options", 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}, @@ -420,6 +441,32 @@ static struct built_in_command bltins[] = { {NULL, NULL, NULL} }; +static const char *set_cwd(void) +{ + if(cwd==bb_msg_unknown) + cwd = NULL; /* xgetcwd(arg) called free(arg) */ + cwd = xgetcwd((char *)cwd); + if (!cwd) + cwd = bb_msg_unknown; + return cwd; +} + +/* built-in 'eval' handler */ +static int builtin_eval(struct child_prog *child) +{ + char *str = NULL; + int rcode = EXIT_SUCCESS; + + if (child->argv[1]) { + str = make_string(child->argv + 1); + parse_string_outer(str, FLAG_EXIT_FROM_LOOP | + FLAG_PARSE_SEMICOLON); + free(str); + rcode = last_return_code; + } + return rcode; +} + /* built-in 'cd ' handler */ static int builtin_cd(struct child_prog *child) { @@ -432,9 +479,7 @@ static int builtin_cd(struct child_prog *child) printf("cd: %s: %s\n", newdir, strerror(errno)); return EXIT_FAILURE; } - cwd = xgetcwd((char *)cwd); - if (!cwd) - cwd = unknown; + set_cwd(); return EXIT_SUCCESS; } @@ -470,18 +515,48 @@ static int builtin_exit(struct child_prog *child) /* built-in 'export VAR=value' handler */ static int builtin_export(struct child_prog *child) { - int res; + int res = 0; + char *name = child->argv[1]; - if (child->argv[1] == NULL) { + if (name == NULL) { return (builtin_env(child)); } - /* FIXME -- I leak memory. This will be - * fixed up properly when we add local - * variable support -- I hope */ - res = putenv(strdup(child->argv[1])); - if (res) - fprintf(stderr, "export: %s\n", strerror(errno)); - return (res); + + name = strdup(name); + + if(name) { + char *value = strchr(name, '='); + + if (!value) { + char *tmp; + /* They are exporting something without an =VALUE */ + + value = get_local_var(name); + if (value) { + size_t ln = strlen(name); + + tmp = realloc(name, ln+strlen(value)+2); + if(tmp==NULL) + res = -1; + else { + sprintf(tmp+ln, "=%s", value); + name = tmp; + } + } else { + /* bash does not return an error when trying to export + * an undefined variable. Do likewise. */ + res = 1; + } + } + } + if (res<0) + bb_perror_msg("export"); + else if(res==0) + res = set_local_var(name, 1); + else + res = 0; + free(name); + return res; } /* built-in 'fg' and 'bg' handler */ @@ -490,48 +565,51 @@ static int builtin_fg_bg(struct child_prog *child) int i, jobnum; struct pipe *pi=NULL; + if (!interactive) + return EXIT_FAILURE; /* If they gave us no args, assume they want the last backgrounded task */ if (!child->argv[1]) { - for (pi = job_list->head; pi; pi = pi->next) { - if (pi->progs && pi->progs->pid == last_bg_pid) { + for (pi = job_list; pi; pi = pi->next) { + if (pi->jobid == last_jobid) { break; } } if (!pi) { - error_msg("%s: no current job", child->argv[0]); + bb_error_msg("%s: no current job", child->argv[0]); return EXIT_FAILURE; } } else { if (sscanf(child->argv[1], "%%%d", &jobnum) != 1) { - error_msg("%s: bad argument '%s'", child->argv[0], child->argv[1]); + bb_error_msg("%s: bad argument '%s'", child->argv[0], child->argv[1]); return EXIT_FAILURE; } - - for (pi = job_list->head; pi; pi = pi->next) { + for (pi = job_list; pi; pi = pi->next) { if (pi->jobid == jobnum) { break; } } if (!pi) { - error_msg("%s: %d: no such job", child->argv[0], jobnum); + bb_error_msg("%s: %d: no such job", child->argv[0], jobnum); return EXIT_FAILURE; } } + if (*child->argv[0] == 'f') { - /* Make this job the foreground job */ - signal(SIGTTOU, SIG_IGN); - /* suppress messages when run from /linuxrc mag@sysgo.de */ - if (tcsetpgrp(0, pi->pgrp) && errno != ENOTTY) - perror_msg("tcsetpgrp"); - signal(SIGTTOU, SIG_DFL); - job_list->fg = pi; + /* Put the job into the foreground. */ + tcsetpgrp(shell_terminal, pi->pgrp); } /* Restart the processes in the job */ for (i = 0; i < pi->num_progs; i++) pi->progs[i].is_stopped = 0; - kill(-pi->pgrp, SIGCONT); + if ( (i=kill(- pi->pgrp, SIGCONT)) < 0) { + if (i == ESRCH) { + remove_bg_job(pi); + } else { + bb_perror_msg("kill (SIGCONT)"); + } + } pi->stopped_progs = 0; return EXIT_SUCCESS; @@ -540,7 +618,7 @@ static int builtin_fg_bg(struct child_prog *child) /* built-in 'help' handler */ static int builtin_help(struct child_prog *dummy) { - struct built_in_command *x; + const struct built_in_command *x; printf("\nBuilt-in commands:\n"); printf("-------------------\n"); @@ -559,11 +637,12 @@ static int builtin_jobs(struct child_prog *child) struct pipe *job; char *status_string; - for (job = job_list->head; job; job = job->next) { + for (job = job_list; job; job = job->next) { if (job->running_progs == job->stopped_progs) status_string = "Stopped"; else status_string = "Running"; + printf(JOB_STATUS_FORMAT, job->jobid, status_string, job->text); } return EXIT_SUCCESS; @@ -573,48 +652,55 @@ static int builtin_jobs(struct child_prog *child) /* built-in 'pwd' handler */ static int builtin_pwd(struct child_prog *dummy) { - cwd = xgetcwd((char *)cwd); - if (!cwd) - cwd = unknown; - puts(cwd); + puts(set_cwd()); return EXIT_SUCCESS; } /* built-in 'read VAR' handler */ static int builtin_read(struct child_prog *child) { - int res = 0, len, newlen; - char *s; - char string[MAX_READ]; + int res; if (child->argv[1]) { - /* argument (VAR) given: put "VAR=" into buffer */ - strcpy(string, child->argv[1]); - len = strlen(string); - string[len++] = '='; - string[len] = '\0'; - /* XXX would it be better to go through in_str? */ - fgets(&string[len], sizeof(string) - len, stdin); /* read string */ - newlen = strlen(string); - if(newlen > len) - string[--newlen] = '\0'; /* chomp trailing newline */ - /* - ** string should now contain "VAR=" - ** copy it (putenv() won't do that, so we must make sure - ** the string resides in a static buffer!) - */ - res = -1; - if((s = strdup(string))) - res = putenv(s); + char string[BUFSIZ]; + char *var = 0; + + string[0] = 0; /* In case stdin has only EOF */ + /* read string */ + fgets(string, sizeof(string), stdin); + chomp(string); + var = malloc(strlen(child->argv[1])+strlen(string)+2); + if(var) { + sprintf(var, "%s=%s", child->argv[1], string); + res = set_local_var(var, 0); + } else + res = -1; if (res) - fprintf(stderr, "read: %s\n", strerror(errno)); + fprintf(stderr, "read: %m\n"); + free(var); /* So not move up to avoid breaking errno */ + return res; + } else { + do res=getchar(); while(res!='\n' && res!=EOF); + return 0; } +} + +/* built-in 'set VAR=value' handler */ +static int builtin_set(struct child_prog *child) +{ + char *temp = child->argv[1]; + struct variables *e; + + if (temp == NULL) + for(e = top_vars; e; e=e->next) + printf("%s=%s\n", e->name, e->value); else - fgets(string, sizeof(string), stdin); + set_local_var(temp, 0); - return (res); + return EXIT_SUCCESS; } + /* Built-in 'shift' handler */ static int builtin_shift(struct child_prog *child) { @@ -644,7 +730,7 @@ static int builtin_source(struct child_prog *child) /* XXX search through $PATH is missing */ input = fopen(child->argv[1], "r"); if (!input) { - fprintf(stderr, "Couldn't open file '%s'\n", child->argv[1]); + bb_error_msg("Couldn't open file '%s'", child->argv[1]); return EXIT_FAILURE; } @@ -679,11 +765,8 @@ static int builtin_umask(struct child_prog *child) /* built-in 'unset VAR' handler */ static int builtin_unset(struct child_prog *child) { - if (child->argv[1] == NULL) { - fprintf(stderr, "unset: parameter required.\n"); - return EXIT_FAILURE; - } - unsetenv(child->argv[1]); + /* bash returned already true */ + unset_local_var(child->argv[1]); return EXIT_SUCCESS; } @@ -729,7 +812,7 @@ static void b_reset(o_string *o) static void b_free(o_string *o) { b_reset(o); - if (o->data != NULL) free(o->data); + free(o->data); o->data = NULL; o->maxlen = 0; } @@ -748,7 +831,7 @@ static int b_addqchr(o_string *o, int ch, int quote) } /* belongs in utility.c */ -char *simple_itoa(unsigned int i) +static char *simple_itoa(unsigned int i) { /* 21 digits plus null terminator, good for 64-bit or smaller ints */ static char local[22]; @@ -784,23 +867,22 @@ static int static_peek(struct in_str *i) static inline void cmdedit_set_initial_prompt(void) { -#ifdef BB_FEATURE_SH_SIMPLE_PROMPT +#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT PS1 = NULL; #else PS1 = getenv("PS1"); if(PS1==0) PS1 = "\\w \\$ "; -#endif +#endif } static inline void setup_prompt_string(int promptmode, char **prompt_str) { debug_printf("setup_prompt_string %d ",promptmode); -#ifdef BB_FEATURE_SH_SIMPLE_PROMPT +#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT /* Set up the prompt */ if (promptmode == 1) { - if (PS1) - free(PS1); + free(PS1); PS1=xmalloc(strlen(cwd)+4); sprintf(PS1, "%s %s", cwd, ( geteuid() != 0 ) ? "$ ":"# "); *prompt_str = PS1; @@ -808,7 +890,7 @@ static inline void setup_prompt_string(int promptmode, char **prompt_str) *prompt_str = PS2; } #else - *prompt_str = (promptmode==0)? PS1 : PS2; + *prompt_str = (promptmode==1)? PS1 : PS2; #endif debug_printf("result %s\n",*prompt_str); } @@ -819,7 +901,7 @@ static void get_user_input(struct in_str *i) static char the_command[BUFSIZ]; setup_prompt_string(i->promptmode, &prompt_str); -#ifdef BB_FEATURE_COMMAND_EDITING +#ifdef CONFIG_FEATURE_COMMAND_EDITING /* ** enable command line editing only while a command line ** is actually being read; otherwise, we'll end up bequeathing @@ -827,17 +909,17 @@ static void get_user_input(struct in_str *i) ** child processes (rob@sysgo.de) */ cmdedit_read_input(prompt_str, the_command); - cmdedit_terminate(); #else fputs(prompt_str, stdout); fflush(stdout); the_command[0]=fgetc(i->file); the_command[1]='\0'; #endif + fflush(stdout); i->p = the_command; } -/* This is the magic location that prints prompts +/* This is the magic location that prints prompts * and gets data back from the user */ static int file_get(struct in_str *i) { @@ -851,7 +933,9 @@ static int file_get(struct in_str *i) /* need to double check i->file because we might be doing something * more complicated by now, like sourcing or substituting. */ if (i->__promptme && interactive && i->file == stdin) { - get_user_input(i); + while(! i->p || (interactive && strlen(i->p)==0) ) { + get_user_input(i); + } i->promptmode=2; i->__promptme = 0; if (i->p && *i->p) { @@ -875,12 +959,11 @@ static int file_peek(struct in_str *i) if (i->p && *i->p) { return *i->p; } else { - static char buffer[2]; - buffer[0] = fgetc(i->file); - buffer[1] = '\0'; - i->p = buffer; + i->peek_buf[0] = fgetc(i->file); + i->peek_buf[1] = '\0'; + i->p = i->peek_buf; debug_printf("b_peek: got a %d\n", *i->p); - return *i->p; + return *i->p; } } @@ -915,13 +998,13 @@ static void mark_closed(int fd) { struct close_me *tmp; if (close_me_head == NULL || close_me_head->fd != fd) - error_msg_and_die("corrupt close_me"); + bb_error_msg_and_die("corrupt close_me"); tmp = close_me_head; close_me_head = close_me_head->next; free(tmp); } -static void close_all() +static void close_all(void) { struct close_me *c; for (c=close_me_head; c; c=c->next) { @@ -938,14 +1021,17 @@ static int setup_redirects(struct child_prog *prog, int squirrel[]) struct redir_struct *redir; for (redir=prog->redirects; redir; redir=redir->next) { + if (redir->dup == -1 && redir->word.gl_pathv == NULL) { + /* something went wrong in the parse. Pretend it didn't happen */ + continue; + } if (redir->dup == -1) { mode=redir_table[redir->type].mode; openfd = open(redir->word.gl_pathv[0], mode, 0666); if (openfd < 0) { /* this could get lost if stderr has been redirected, but bash and ash both lose it as well (though zsh doesn't!) */ - fprintf(stderr,"error opening %s: %s\n", redir->word.gl_pathv[0], - strerror(errno)); + bb_perror_msg("error opening %s", redir->word.gl_pathv[0]); return 1; } } else { @@ -960,7 +1046,8 @@ static int setup_redirects(struct child_prog *prog, int squirrel[]) close(openfd); } else { dup2(openfd, redir->fd); - close(openfd); + if (redir->dup == -1) + close (openfd); } } } @@ -981,35 +1068,21 @@ static void restore_redirects(int squirrel[]) } } -/* XXX this definitely needs some more thought, work, and - * cribbing from other shells */ -static int pipe_wait(struct pipe *pi) -{ - int rcode=0, i, pid, running, status; - running = pi->num_progs; - while (running) { - pid=waitpid(-1, &status, 0); - if (pid < 0) perror_msg_and_die("waitpid"); - for (i=0; i < pi->num_progs; i++) { - if (pi->progs[i].pid == pid) { - if (i==pi->num_progs-1) rcode=WEXITSTATUS(status); - pi->progs[i].pid = 0; - running--; - break; - } - } - } - return rcode; -} - -/* very simple version for testing */ +/* never returns */ +/* XXX no exit() here. If you don't exec, use _exit instead. + * The at_exit handlers apparently confuse the calling process, + * in particular stdin handling. Not sure why? */ static void pseudo_exec(struct child_prog *child) { int i, rcode; - struct built_in_command *x; + char *p; + const struct built_in_command *x; if (child->argv) { for (i=0; is_assignment(child->argv[i]); i++) { - putenv(strdup(child->argv[i])); + debug_printf("pid %d environment modification: %s\n",getpid(),child->argv[i]); + p = insert_var_value(child->argv[i]); + putenv(strdup(p)); + if (p != child->argv[i]) free(p); } child->argv+=i; /* XXX this hack isn't so horrible, since we are about to exit, and therefore don't need to keep data @@ -1017,7 +1090,9 @@ static void pseudo_exec(struct child_prog *child) /* If a variable is assigned in a forest, and nobody listens, * was it ever really set? */ - if (child->argv[0] == NULL) exit(EXIT_SUCCESS); + if (child->argv[0] == NULL) { + _exit(EXIT_SUCCESS); + } /* * Check if the command matches any of the builtins. @@ -1028,37 +1103,27 @@ static void pseudo_exec(struct child_prog *child) for (x = bltins; x->cmd; x++) { if (strcmp(child->argv[0], x->cmd) == 0 ) { debug_printf("builtin exec %s\n", child->argv[0]); - exit(x->function(child)); + rcode = x->function(child); + fflush(stdout); + _exit(rcode); } } /* Check if the command matches any busybox internal commands - * ("applets") here. + * ("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... */ -#ifdef BB_FEATURE_SH_STANDALONE_SHELL + * to find ourself... */ +#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL { int argc_l; char** argv_l=child->argv; char *name = child->argv[0]; -#ifdef BB_FEATURE_SH_APPLETS_ALWAYS_WIN - /* Following discussions from November 2000 on the busybox mailing - * list, the default configuration, (without - * get_last_path_component()) lets the user force use of an - * external command by specifying the full (with slashes) filename. - * If you enable BB_FEATURE_SH_APPLETS_ALWAYS_WIN, then applets - * _aways_ override external commands, so if you want to run - * /bin/cat, it will use BusyBox cat even if /bin/cat exists on the - * filesystem and is _not_ busybox. Some systems may want this, - * most do not. */ - name = get_last_path_component(name); -#endif /* Count argc for use in a second... */ for(argc_l=0;*argv_l!=NULL; argv_l++, argc_l++); optind = 1; @@ -1068,19 +1133,19 @@ static void pseudo_exec(struct child_prog *child) #endif debug_printf("exec of %s\n",child->argv[0]); execvp(child->argv[0],child->argv); - perror("execvp"); - exit(1); + bb_perror_msg("couldn't exec: %s",child->argv[0]); + _exit(1); } else if (child->group) { debug_printf("runtime nesting to group\n"); interactive=0; /* crucial!!!! */ rcode = run_list_real(child->group); - /* OK to leak memory by not calling run_list_test, + /* OK to leak memory by not calling free_pipe_list, * since this process is about to exit */ - exit(rcode); + _exit(rcode); } else { /* Can happen. See what bash does with ">foo" by itself. */ debug_printf("trying to pseudo_exec null command\n"); - exit(EXIT_SUCCESS); + _exit(EXIT_SUCCESS); } } @@ -1090,15 +1155,15 @@ static void insert_bg_job(struct pipe *pi) /* Linear search for the ID of the job to use */ pi->jobid = 1; - for (thejob = job_list->head; thejob; thejob = thejob->next) + for (thejob = job_list; thejob; thejob = thejob->next) if (thejob->jobid >= pi->jobid) pi->jobid = thejob->jobid + 1; /* add thejob to the list of running jobs */ - if (!job_list->head) { - thejob = job_list->head = xmalloc(sizeof(*thejob)); + if (!job_list) { + thejob = job_list = xmalloc(sizeof(*thejob)); } else { - for (thejob = job_list->head; thejob->next; thejob = thejob->next) /* nothing */; + for (thejob = job_list; thejob->next; thejob = thejob->next) /* nothing */; thejob->next = xmalloc(sizeof(*thejob)); thejob = thejob->next; } @@ -1108,7 +1173,7 @@ static void insert_bg_job(struct pipe *pi) thejob->next = NULL; thejob->running_progs = thejob->num_progs; thejob->stopped_progs = 0; - thejob->text = xmalloc(MAX_LINE); + thejob->text = xmalloc(BUFSIZ); /* cmdedit buffer size */ //if (pi->progs[0] && pi->progs[0].argv && pi->progs[0].argv[0]) { @@ -1119,68 +1184,78 @@ static void insert_bg_job(struct pipe *pi) } } - /* we don't wait for background thejobs to return -- append it + /* we don't wait for background thejobs to return -- append it to the list of backgrounded thejobs and leave it alone */ printf("[%d] %d\n", thejob->jobid, thejob->progs[0].pid); last_bg_pid = thejob->progs[0].pid; + last_jobid = thejob->jobid; } -/* remove a backgrounded job from a jobset */ +/* remove a backgrounded job */ static void remove_bg_job(struct pipe *pi) { struct pipe *prev_pipe; - free_pipe(pi); - if (pi == job_list->head) { - job_list->head = pi->next; + if (pi == job_list) { + job_list = pi->next; } else { - prev_pipe = job_list->head; + prev_pipe = job_list; while (prev_pipe->next != pi) prev_pipe = prev_pipe->next; prev_pipe->next = pi->next; } + if (job_list) + last_jobid = job_list->jobid; + else + last_jobid = 0; + pi->stopped_progs = 0; + free_pipe(pi, 0); free(pi); } -/* free up all memory from a pipe */ -static void free_pipe(struct pipe *pi) -{ - int i; - - for (i = 0; i < pi->num_progs; i++) { - free(pi->progs[i].argv); - if (pi->progs[i].redirects) - free(pi->progs[i].redirects); - } - if (pi->progs) - free(pi->progs); - if (pi->text) - free(pi->text); - if (pi->cmdbuf) - free(pi->cmdbuf); - memset(pi, 0, sizeof(struct pipe)); -} - - -/* Checks to see if any background processes have exited -- if they +/* Checks to see if any processes have exited -- if they have, figure out why and see if a job has completed */ -static void checkjobs() +static int checkjobs(struct pipe* fg_pipe) { + int attributes; int status; int prognum = 0; struct pipe *pi; pid_t childpid; - while ((childpid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) { - for (pi = job_list->head; pi; pi = pi->next) { + attributes = WUNTRACED; + if (fg_pipe==NULL) { + attributes |= WNOHANG; + } + + while ((childpid = waitpid(-1, &status, attributes)) > 0) { + if (fg_pipe) { + int i, rcode = 0; + for (i=0; i < fg_pipe->num_progs; i++) { + if (fg_pipe->progs[i].pid == childpid) { + if (i==fg_pipe->num_progs-1) + rcode=WEXITSTATUS(status); + (fg_pipe->num_progs)--; + return(rcode); + } + } + } + + for (pi = job_list; pi; pi = pi->next) { prognum = 0; - while (prognum < pi->num_progs && - pi->progs[prognum].pid != childpid) prognum++; + while (prognum < pi->num_progs && pi->progs[prognum].pid != childpid) { + prognum++; + } if (prognum < pi->num_progs) break; } + if(pi==NULL) { + debug_printf("checkjobs: pid %d was not in our list!\n", childpid); + continue; + } + if (WIFEXITED(status) || WIFSIGNALED(status)) { /* child exited */ pi->running_progs--; @@ -1191,28 +1266,58 @@ static void checkjobs() remove_bg_job(pi); } } else { - if(pi==NULL) - break; /* child stopped */ pi->stopped_progs++; pi->progs[prognum].is_stopped = 1; +#if 0 + /* Printing this stuff is a pain, since it tends to + * overwrite the prompt an inconveinient moments. So + * don't do that. */ if (pi->stopped_progs == pi->num_progs) { - printf(JOB_STATUS_FORMAT, pi->jobid, "Stopped", pi->text); + printf("\n"JOB_STATUS_FORMAT, pi->jobid, "Stopped", pi->text); } +#endif } } if (childpid == -1 && errno != ECHILD) - perror_msg("waitpid"); + bb_perror_msg("waitpid"); /* move the shell to the foreground */ - if (tcsetpgrp(0, getpgrp()) && errno != ENOTTY) - perror_msg("tcsetpgrp"); + //if (interactive && tcsetpgrp(shell_terminal, getpgid(0))) + // bb_perror_msg("tcsetpgrp-2"); + return -1; } +/* Figure out our controlling tty, checking in order stderr, + * stdin, and stdout. If check_pgrp is set, also check that + * we belong to the foreground process group associated with + * that tty. The value of shell_terminal is needed in order to call + * tcsetpgrp(shell_terminal, ...); */ +#if 0 +static void controlling_tty(int check_pgrp) +{ + pid_t curpgrp; + + if ((curpgrp = tcgetpgrp(shell_terminal = 2)) < 0 + && (curpgrp = tcgetpgrp(shell_terminal = 0)) < 0 + && (curpgrp = tcgetpgrp(shell_terminal = 1)) < 0) + goto shell_terminal_error; + + if (check_pgrp && curpgrp != getpgid(0)) + goto shell_terminal_error; + + return; + +shell_terminal_error: + shell_terminal = -1; + return; +} +#endif + /* run_pipe_real() starts all the jobs, but doesn't wait for anything - * to finish. See pipe_wait(). + * to finish. See checkjobs(). * * return code is normally -1, when the caller has to wait for children * to finish to determine the exit status of the pipe. If the pipe @@ -1230,52 +1335,75 @@ static void checkjobs() static int run_pipe_real(struct pipe *pi) { int i; - int ctty; int nextin, nextout; int pipefds[2]; /* pipefds[0] is for reading */ struct child_prog *child; - struct built_in_command *x; + const struct built_in_command *x; + char *p; - ctty = -1; nextin = 0; - pi->pgrp = 0; - - /* Check if we are supposed to run in the foreground */ - if (interactive && pi->followup!=PIPE_BG) { - if ((pi->pgrp = tcgetpgrp(ctty = 2)) < 0 - && (pi->pgrp = tcgetpgrp(ctty = 0)) < 0 - && (pi->pgrp = tcgetpgrp(ctty = 1)) < 0) - return errno = ENOTTY, -1; - - if (pi->pgrp < 0 && pi->pgrp != getpgrp()) - return errno = EPERM, -1; - } + pi->pgrp = -1; /* Check if this is a simple builtin (not part of a pipe). * Builtins within pipes have to fork anyway, and are handled in * pseudo_exec. "echo foo | read bar" doesn't work on bash, either. */ - if (pi->num_progs == 1 && pi->progs[0].argv != NULL) { - child = & (pi->progs[0]); - if (child->group && ! child->subshell) { - int squirrel[] = {-1, -1, -1}; - int rcode; - debug_printf("non-subshell grouping\n"); - setup_redirects(child, squirrel); - /* XXX could we merge code with following builtin case, - * by creating a pseudo builtin that calls run_list_real? */ - rcode = run_list_real(child->group); - restore_redirects(squirrel); - return rcode; - } + if (pi->num_progs == 1) child = & (pi->progs[0]); + if (pi->num_progs == 1 && child->group && child->subshell == 0) { + int squirrel[] = {-1, -1, -1}; + int rcode; + debug_printf("non-subshell grouping\n"); + setup_redirects(child, squirrel); + /* XXX could we merge code with following builtin case, + * by creating a pseudo builtin that calls run_list_real? */ + rcode = run_list_real(child->group); + restore_redirects(squirrel); + return rcode; + } else if (pi->num_progs == 1 && pi->progs[0].argv != NULL) { for (i=0; is_assignment(child->argv[i]); i++) { /* nothing */ } if (i!=0 && child->argv[i]==NULL) { /* assignments, but no command: set the local environment */ for (i=0; child->argv[i]!=NULL; i++) { - set_local_var(child->argv[i]); + + /* Ok, this case is tricky. We have to decide if this is a + * local variable, or an already exported variable. If it is + * already exported, we have to export the new value. If it is + * not exported, we need only set this as a local variable. + * This junk is all to decide whether or not to export this + * variable. */ + int export_me=0; + char *name, *value; + name = bb_xstrdup(child->argv[i]); + debug_printf("Local environment set: %s\n", name); + value = strchr(name, '='); + if (value) + *value=0; + if ( get_local_var(name)) { + export_me=1; + } + free(name); + p = insert_var_value(child->argv[i]); + set_local_var(p, export_me); + if (p != child->argv[i]) free(p); } return EXIT_SUCCESS; /* don't worry about errors in set_local_var() yet */ } + for (i = 0; is_assignment(child->argv[i]); i++) { + p = insert_var_value(child->argv[i]); + putenv(strdup(p)); + if (p != child->argv[i]) { + child->sp--; + free(p); + } + } + if (child->sp) { + char * str = NULL; + + str = make_string((child->argv + i)); + parse_string_outer(str, FLAG_EXIT_FROM_LOOP | FLAG_REPARSING); + free(str); + return last_return_code; + } for (x = bltins; x->cmd; x++) { if (strcmp(child->argv[i], x->cmd) == 0 ) { int squirrel[] = {-1, -1, -1}; @@ -1291,9 +1419,6 @@ static int run_pipe_real(struct pipe *pi) * Is it really safe for inline use? Experimentally, * things seem to work with glibc. */ setup_redirects(child, squirrel); - for (i=0; is_assignment(child->argv[i]); i++) { - putenv(strdup(child->argv[i])); - } child->argv+=i; /* XXX horrible hack */ rcode = x->function(child); child->argv-=i; /* XXX restore hack so free() can work right */ @@ -1308,7 +1433,7 @@ static int run_pipe_real(struct pipe *pi) /* pipes are inserted between pairs of commands */ if ((i + 1) < pi->num_progs) { - if (pipe(pipefds)<0) perror_msg_and_die("pipe"); + if (pipe(pipefds)<0) bb_perror_msg_and_die("pipe"); nextout = pipefds[1]; } else { nextout=1; @@ -1316,10 +1441,21 @@ static int run_pipe_real(struct pipe *pi) } /* XXX test for failed fork()? */ - if (!(child->pid = fork())) { - +#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__) + if (!(child->pid = fork())) +#else + if (!(child->pid = vfork())) +#endif + { + /* Set the handling for job control signals back to the default. */ + signal(SIGINT, SIG_DFL); + signal(SIGQUIT, SIG_DFL); + signal(SIGTERM, SIG_DFL); + signal(SIGTSTP, SIG_DFL); + signal(SIGTTIN, SIG_DFL); signal(SIGTTOU, SIG_DFL); - + signal(SIGCHLD, SIG_DFL); + close_all(); if (nextin != 0) { @@ -1337,26 +1473,24 @@ static int run_pipe_real(struct pipe *pi) /* Like bash, explicit redirects override pipes, * and the pipe fd is available for dup'ing. */ setup_redirects(child,NULL); - - if (pi->followup!=PIPE_BG) { - /* Put our child in the process group whose leader is the - * first process in this pipe. */ + + if (interactive && pi->followup!=PIPE_BG) { + /* If we (the child) win the race, put ourselves in the process + * group whose leader is the first process in this pipe. */ if (pi->pgrp < 0) { - pi->pgrp = child->pid; + pi->pgrp = getpid(); } - /* Don't check for errors. The child may be dead already, - * in which case setpgid returns error code EACCES. */ if (setpgid(0, pi->pgrp) == 0) { - signal(SIGTTOU, SIG_IGN); - tcsetpgrp(ctty, pi->pgrp); - signal(SIGTTOU, SIG_DFL); + tcsetpgrp(2, pi->pgrp); } } pseudo_exec(child); } - /* Put our child in the process group whose leader is the - * first process in this pipe. */ + + + /* put our child in the process group whose leader is the + first process in this pipe */ if (pi->pgrp < 0) { pi->pgrp = child->pid; } @@ -1369,7 +1503,7 @@ static int run_pipe_real(struct pipe *pi) if (nextout != 1) close(nextout); - /* If there isn't another process, nextin is garbage + /* If there isn't another process, nextin is garbage but it doesn't matter */ nextin = pipefds[0]; } @@ -1378,20 +1512,99 @@ static int run_pipe_real(struct pipe *pi) static int run_list_real(struct pipe *pi) { - int rcode=0; + char *save_name = NULL; + char **list = NULL; + char **save_list = NULL; + struct pipe *rpipe; + int flag_rep = 0; + int save_num_progs; + int rcode=0, flag_skip=1; + int flag_restore = 0; int if_code=0, next_if_code=0; /* need double-buffer to handle elif */ reserved_style rmode, skip_more_in_this_rmode=RES_XXXX; - for (;pi;pi=pi->next) { + /* check syntax for "for" */ + for (rpipe = pi; rpipe; rpipe = rpipe->next) { + if ((rpipe->r_mode == RES_IN || + rpipe->r_mode == RES_FOR) && + (rpipe->next == NULL)) { + syntax(); + return 1; + } + if ((rpipe->r_mode == RES_IN && + (rpipe->next->r_mode == RES_IN && + rpipe->next->progs->argv != NULL))|| + (rpipe->r_mode == RES_FOR && + rpipe->next->r_mode != RES_IN)) { + syntax(); + return 1; + } + } + for (; pi; pi = (flag_restore != 0) ? rpipe : pi->next) { + if (pi->r_mode == RES_WHILE || pi->r_mode == RES_UNTIL || + pi->r_mode == RES_FOR) { + flag_restore = 0; + if (!rpipe) { + flag_rep = 0; + rpipe = pi; + } + } rmode = pi->r_mode; debug_printf("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) continue; + if (rmode == skip_more_in_this_rmode && 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) if_code = next_if_code; if (rmode == RES_THEN && if_code) continue; if (rmode == RES_ELSE && !if_code) continue; - if (rmode == RES_ELIF && !if_code) continue; + if (rmode == RES_ELIF && !if_code) break; + if (rmode == RES_FOR && pi->num_progs) { + if (!list) { + /* 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]; + pi->progs->argv[0] = NULL; + flag_rep = 1; + } + if (!(*list)) { + free(pi->progs->argv[0]); + free(save_list); + list = NULL; + flag_rep = 0; + pi->progs->argv[0] = save_name; + pi->progs->glob_result.gl_pathv[0] = + pi->progs->argv[0]; + continue; + } else { + /* insert new value from list for variable */ + if (pi->progs->argv[0]) + free(pi->progs->argv[0]); + pi->progs->argv[0] = *list++; + pi->progs->glob_result.gl_pathv[0] = + pi->progs->argv[0]; + } + } + if (rmode == RES_IN) continue; + if (rmode == RES_DO) { + if (!flag_rep) continue; + } + if ((rmode == RES_DONE)) { + if (flag_rep) { + flag_restore = 1; + } else { + rpipe = NULL; + } + } if (pi->num_progs == 0) continue; + save_num_progs = pi->num_progs; /* save number of programs */ rcode = run_pipe_real(pi); + debug_printf("run_pipe_real returned %d\n",rcode); if (rcode!=-1) { /* We only ran a builtin: rcode was set by the return value * of run_pipe_real(), and we don't need to wait for anything. */ @@ -1402,32 +1615,32 @@ static int run_list_real(struct pipe *pi) insert_bg_job(pi); rcode = EXIT_SUCCESS; } else { - if (interactive) { /* move the new process group into the foreground */ - /* suppress messages when run from /linuxrc mag@sysgo.de */ - //signal(SIGTTIN, SIG_IGN); - //signal(SIGTTOU, SIG_IGN); - if (tcsetpgrp(0, pi->pgrp) && errno != ENOTTY) - perror_msg("tcsetpgrp"); - rcode = pipe_wait(pi); - if (tcsetpgrp(0, getpgrp()) && errno != ENOTTY) - perror_msg("tcsetpgrp"); - //signal(SIGTTIN, SIG_DFL); - //signal(SIGTTOU, SIG_DFL); + if (tcsetpgrp(shell_terminal, pi->pgrp) && errno != ENOTTY) + bb_perror_msg("tcsetpgrp-3"); + rcode = checkjobs(pi); + /* move the shell to the foreground */ + if (tcsetpgrp(shell_terminal, getpgid(0)) && errno != ENOTTY) + bb_perror_msg("tcsetpgrp-4"); } else { - rcode = pipe_wait(pi); + rcode = checkjobs(pi); } + debug_printf("checkjobs returned %d\n",rcode); } last_return_code=rcode; + pi->num_progs = save_num_progs; /* restore number of programs */ if ( rmode == RES_IF || rmode == RES_ELIF ) next_if_code=rcode; /* can be overwritten a number of times */ + if (rmode == RES_WHILE) + flag_rep = !last_return_code; + if (rmode == RES_UNTIL) + flag_rep = last_return_code; if ( (rcode==EXIT_SUCCESS && pi->followup==PIPE_OR) || (rcode!=EXIT_SUCCESS && pi->followup==PIPE_AND) ) skip_more_in_this_rmode=rmode; - /* return rcode; */ /* XXX broken if list is part of if/then/else */ + checkjobs(NULL); } - checkjobs(); return rcode; } @@ -1439,13 +1652,16 @@ static char *indenter(int i) } /* return code is the exit status of the pipe */ -static int run_pipe_test(struct pipe *pi, int indent) +static int free_pipe(struct pipe *pi, int indent) { char **p; struct child_prog *child; struct redir_struct *r, *rnext; int a, i, ret_code=0; char *ind = indenter(indent); + + if (pi->stopped_progs > 0) + return ret_code; final_printf("%s run pipe: (pid %d)\n",ind,getpid()); for (i=0; inum_progs; i++) { child = &pi->progs[i]; @@ -1458,7 +1674,7 @@ static int run_pipe_test(struct pipe *pi, int indent) child->argv=NULL; } else if (child->group) { final_printf("%s begin group (subshell:%d)\n",ind, child->subshell); - ret_code = run_list_test(child->group,indent+3); + ret_code = free_pipe_list(child->group,indent+3); final_printf("%s end group\n",ind); } else { final_printf("%s (nil)\n",ind); @@ -1466,8 +1682,11 @@ static int run_pipe_test(struct pipe *pi, int indent) for (r=child->redirects; r; r=rnext) { final_printf("%s redirect %d%s", ind, r->fd, redir_table[r->type].descrip); if (r->dup == -1) { - final_printf(" %s\n", *r->word.gl_pathv); - globfree(&r->word); + /* guard against the case >$FOO, where foo is unset or blank */ + if (r->word.gl_pathv) { + final_printf(" %s\n", *r->word.gl_pathv); + globfree(&r->word); + } } else { final_printf("&%d\n", r->dup); } @@ -1481,21 +1700,20 @@ static int run_pipe_test(struct pipe *pi, int indent) return ret_code; } -static int run_list_test(struct pipe *head, int indent) +static int free_pipe_list(struct pipe *head, int indent) { int rcode=0; /* if list has no members */ struct pipe *pi, *next; char *ind = indenter(indent); for (pi=head; pi; pi=next) { - if (pi->num_progs == 0) break; final_printf("%s pipe reserved mode %d\n", ind, pi->r_mode); - rcode = run_pipe_test(pi, indent); + rcode = free_pipe(pi, indent); final_printf("%s pipe followup code %d\n", ind, pi->followup); next=pi->next; pi->next=NULL; free(pi); } - return rcode; + return rcode; } /* Select which version we will use */ @@ -1504,11 +1722,11 @@ static int run_list(struct pipe *pi) int rcode=0; if (fake_mode==0) { rcode = run_list_real(pi); - } - /* run_list_test has the side effect of clearing memory + } + /* free_pipe_list has the side effect of clearing memory * In the long run that function can be merged with run_list_real, * but doing that now would hobble the debugging effort. */ - run_list_test(pi,0); + free_pipe_list(pi,0); return rcode; } @@ -1521,10 +1739,10 @@ static int run_list(struct pipe *pi) */ static int globhack(const char *src, int flags, glob_t *pglob) { - int cnt, pathc; + int cnt=0, pathc; const char *s; char *dest; - for (cnt=1, s=src; *s; s++) { + for (cnt=1, s=src; s && *s; s++) { if (*s == '\\') s++; cnt++; } @@ -1541,7 +1759,7 @@ static int globhack(const char *src, int flags, glob_t *pglob) if (pglob->gl_pathv == NULL) return GLOB_NOSPACE; pglob->gl_pathv[pathc-1]=dest; pglob->gl_pathv[pathc]=NULL; - for (s=src; *s; s++, dest++) { + for (s=src; s && *s; s++, dest++) { if (*s == '\\') s++; *dest = *s; } @@ -1598,23 +1816,131 @@ static int xglob(o_string *dest, int flags, glob_t *pglob) gr = globhack(dest->data, flags, pglob); debug_printf("globhack returned %d\n",gr); } - if (gr == GLOB_NOSPACE) { - fprintf(stderr,"out of memory during glob\n"); - exit(1); - } + if (gr == GLOB_NOSPACE) + bb_error_msg_and_die("out of memory during glob"); if (gr != 0) { /* GLOB_ABORTED ? */ - fprintf(stderr,"glob(3) error %d\n",gr); + bb_error_msg("glob(3) error %d",gr); } /* globprint(glob_target); */ return gr; } +/* This is used to get/check local shell variables */ +static char *get_local_var(const char *s) +{ + struct variables *cur; + + if (!s) + return NULL; + for (cur = top_vars; cur; cur=cur->next) + if(strcmp(cur->name, s)==0) + return cur->value; + return NULL; +} -static int set_local_var(const char *s) +/* This is used to set local shell variables + flg_export==0 if only local (not exporting) variable + flg_export==1 if "new" exporting environ + flg_export>1 if current startup environ (not call putenv()) */ +static int set_local_var(const char *s, int flg_export) { - /* when you write this, also need to update lookup_param() */ - printf("assignment %s not handled: write me!\n",s); - return 0; + char *name, *value; + int result=0; + struct variables *cur; + + name=strdup(s); + + /* Assume when we enter this function that we are already in + * NAME=VALUE format. So the first order of business is to + * split 's' on the '=' into 'name' and 'value' */ + value = strchr(name, '='); + if (value==0 && ++value==0) { + free(name); + return -1; + } + *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(cur->value); + + cur->value = strdup(value); + } + } + } else { + cur = malloc(sizeof(struct variables)); + if(!cur) { + result = -1; + } else { + cur->name = strdup(name); + if(cur->name == 0) { + free(cur); + 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(result==0 && cur->flg_export==1) { + *(value-1) = '='; + result = putenv(name); + } else { + free(name); + if(result>0) /* equivalent to previous set */ + result = 0; + } + return result; +} + +static void unset_local_var(const char *name) +{ + struct variables *cur; + + if (name) { + for (cur = top_vars; cur; cur=cur->next) { + if(strcmp(cur->name, name)==0) + break; + } + if(cur!=0) { + struct variables *next = top_vars; + if(cur->flg_read_only) { + bb_error_msg("%s: readonly variable", name); + return; + } else { + if(cur->flg_export) + unsetenv(cur->name); + free(cur->name); + free(cur->value); + while (next->next != cur) + next = next->next; + next->next = cur->next; + } + free(cur); + } + } } static int is_assignment(const char *s) @@ -1643,6 +1969,7 @@ static int setup_redirect(struct p_context *ctx, int fd, redir_type style, } redir = xmalloc(sizeof(struct redir_struct)); redir->next=NULL; + redir->word.gl_pathv=NULL; if (last_redir) { last_redir->next=redir; } else { @@ -1654,7 +1981,7 @@ static int setup_redirect(struct p_context *ctx, int fd, redir_type style, debug_printf("Redirect type %d%s\n", redir->fd, redir_table[style].descrip); - /* Check for a '2>&1' type redirect */ + /* Check for a '2>&1' type redirect */ redir->dup = redirect_dup_num(input); if (redir->dup == -2) return 1; /* syntax error */ if (redir->dup != -1) { @@ -1673,13 +2000,14 @@ static int setup_redirect(struct p_context *ctx, int fd, redir_type style, return 0; } -struct pipe *new_pipe(void) { +static struct pipe *new_pipe(void) { struct pipe *pi; pi = xmalloc(sizeof(struct pipe)); pi->num_progs = 0; pi->progs = NULL; pi->next = NULL; pi->followup = 0; /* invalid */ + pi->r_mode = RES_NONE; return pi; } @@ -1692,6 +2020,7 @@ static void initialize_context(struct p_context *ctx) ctx->pipe=ctx->list_head; ctx->w=RES_NONE; ctx->stack=NULL; + ctx->old_flag=0; done_command(ctx); /* creates the memory for working child */ } @@ -1700,7 +2029,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. */ -int reserved_word(o_string *dest, struct p_context *ctx) +static int reserved_word(o_string *dest, struct p_context *ctx) { struct reserved_combo { char *literal; @@ -1718,9 +2047,10 @@ int reserved_word(o_string *dest, struct p_context *ctx) { "elif", RES_ELIF, FLAG_THEN }, { "else", RES_ELSE, FLAG_FI }, { "fi", RES_FI, FLAG_END }, - { "for", RES_FOR, FLAG_DO | FLAG_START }, + { "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 } }; @@ -1733,13 +2063,20 @@ int reserved_word(o_string *dest, struct p_context *ctx) if (r->flag & FLAG_START) { struct p_context *new = xmalloc(sizeof(struct p_context)); debug_printf("push stack\n"); + if (ctx->w == RES_IN || ctx->w == RES_FOR) { + syntax(); + free(new); + ctx->w = RES_SNTX; + b_reset(dest); + return 1; + } *new = *ctx; /* physical copy */ initialize_context(ctx); ctx->stack=new; } else if ( ctx->w == RES_NONE || ! (ctx->old_flag & (1<code))) { syntax(); ctx->w = RES_SNTX; - b_reset (dest); + b_reset(dest); return 1; } ctx->w=r->code; @@ -1747,8 +2084,10 @@ int reserved_word(o_string *dest, struct p_context *ctx) 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); } @@ -1779,7 +2118,7 @@ static int done_word(o_string *dest, struct p_context *ctx) syntax(); return 1; /* syntax error, groups and arglists don't mix */ } - if (!child->argv) { + if (!child->argv && (ctx->type & FLAG_PARSE_SEMICOLON)) { debug_printf("checking %s for reserved-ness\n",dest->data); if (reserved_word(dest,ctx)) return ctx->w==RES_SNTX; } @@ -1793,12 +2132,16 @@ static int done_word(o_string *dest, struct p_context *ctx) if (ctx->pending_redirect) { ctx->pending_redirect=NULL; if (glob_target->gl_pathc != 1) { - fprintf(stderr, "ambiguous redirect\n"); + bb_error_msg("ambiguous redirect"); return 1; } } else { child->argv = glob_target->gl_pathv; } + if (ctx->w == RES_FOR) { + done_word(dest,ctx); + done_pipe(ctx,PIPE_SEQ); + } return 0; } @@ -1834,8 +2177,10 @@ static int done_command(struct p_context *ctx) prog->group = NULL; prog->glob_result.gl_pathv = NULL; prog->family = pi; + prog->sp = 0; + ctx->child = prog; + prog->type = ctx->type; - ctx->child=prog; /* but ctx->pipe and ctx->list_head remain unchanged */ return 0; } @@ -1879,7 +2224,7 @@ static int redirect_dup_num(struct in_str *input) } if (ok) return d; - fprintf(stderr, "ambiguous redirect\n"); + bb_error_msg("ambiguous redirect"); return -2; } @@ -1910,15 +2255,19 @@ static int redirect_opt_num(o_string *o) return num; } -FILE *generate_stream_from_list(struct pipe *head) +static FILE *generate_stream_from_list(struct pipe *head) { FILE *pf; #if 1 int pid, channel[2]; - if (pipe(channel)<0) perror_msg_and_die("pipe"); + if (pipe(channel)<0) bb_perror_msg_and_die("pipe"); +#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__) pid=fork(); +#else + pid=vfork(); +#endif if (pid<0) { - perror_msg_and_die("fork"); + bb_perror_msg_and_die("fork"); } else if (pid==0) { close(channel[0]); if (channel[1] != 1) { @@ -1928,9 +2277,9 @@ FILE *generate_stream_from_list(struct pipe *head) #if 0 #define SURROGATE "surrogate response" write(1,SURROGATE,sizeof(SURROGATE)); - exit(run_list(head)); + _exit(run_list(head)); #else - exit(run_list_real(head)); /* leaks memory */ + _exit(run_list_real(head)); /* leaks memory */ #endif } debug_printf("forked child %d\n",pid); @@ -1938,7 +2287,7 @@ FILE *generate_stream_from_list(struct pipe *head) pf = fdopen(channel[0],"r"); debug_printf("pipe on FILE *%p\n",pf); #else - run_list_test(head,0); + free_pipe_list(head,0); pf=popen("echo surrogate response","r"); debug_printf("started fake pipe on FILE *%p\n",pf); #endif @@ -1984,6 +2333,7 @@ static int process_command_subs(o_string *dest, struct p_context *ctx, struct in * to the KISS philosophy of this program. */ mark_closed(fileno(p)); retcode=pclose(p); + free_pipe_list(inner.list_head,0); debug_printf("pclosed, retcode=%d\n",retcode); /* XXX this process fails to trim a single trailing newline */ return retcode; @@ -2015,28 +2365,32 @@ static int parse_group(o_string *dest, struct p_context *ctx, /* basically useful version until someone wants to get fancier, * see the bash man page under "Parameter Expansion" */ -static void lookup_param(o_string *dest, struct p_context *ctx, o_string *src) +static char *lookup_param(char *src) { - const char *p=NULL; - if (src->data) p = getenv(src->data); - if (p) parse_string(dest, ctx, p); /* recursion */ - b_free(src); + char *p=NULL; + if (src) { + p = getenv(src); + if (!p) + p = get_local_var(src); + } + return p; } /* 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; - o_string alt=NULL_O_STRING; char sep[]=" "; int ch = input->peek(input); /* first character after the $ */ debug_printf("handle_dollar: ch=%c\n",ch); if (isalpha(ch)) { + b_addchr(dest, SPECIAL_VAR_SYMBOL); + ctx->child->sp++; while(ch=b_peek(input),isalnum(ch) || ch=='_') { b_getch(input); - b_addchr(&alt,ch); + b_addchr(dest,ch); } - lookup_param(dest, ctx, &alt); + b_addchr(dest, SPECIAL_VAR_SYMBOL); } else if (isdigit(ch)) { i = ch-'0'; /* XXX is $0 special? */ if (ichild->sp++; b_getch(input); /* XXX maybe someone will try to escape the '}' */ while(ch=b_getch(input),ch!=EOF && ch!='}') { - b_addchr(&alt,ch); + b_addchr(dest,ch); } if (ch != '}') { syntax(); return 1; } - lookup_param(dest, ctx, &alt); + b_addchr(dest, SPECIAL_VAR_SYMBOL); break; case '(': b_getch(input); @@ -2087,7 +2443,7 @@ static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *i case '-': case '_': /* still unhandled, but should be eventually */ - fprintf(stderr,"unhandled syntax: $%c\n",ch); + bb_error_msg("unhandled syntax: $%c",ch); return 1; break; default: @@ -2132,14 +2488,16 @@ int parse_stream(o_string *dest, struct p_context *ctx, b_addqchr(dest, ch, dest->quote); } else { if (m==2) { /* unquoted IFS */ - done_word(dest, ctx); + if (done_word(dest, ctx)) { + return 1; + } /* If we aren't performing a substitution, treat a newline as a * command separator. */ if (end_trigger != '\0' && ch=='\n') done_pipe(ctx,PIPE_SEQ); } if (ch == end_trigger && !dest->quote && ctx->w==RES_NONE) { - debug_printf("leaving parse_stream\n"); + debug_printf("leaving parse_stream (triggered)\n"); return 0; } #if 0 @@ -2257,23 +2615,24 @@ int parse_stream(o_string *dest, struct p_context *ctx, } /* complain if quote? No, maybe we just finished a command substitution * that was quoted. Example: - * $ echo "`cat foo` plus more" + * $ echo "`cat foo` plus more" * and we just got the EOF generated by the subshell that ran "cat foo" * The only real complaint is if we got an EOF when end_trigger != '\0', * that is, we were really supposed to get end_trigger, and never got * one before the EOF. Can't use the standard "syntax error" return code, * so that parse_stream_outer can distinguish the EOF and exit smoothly. */ + debug_printf("leaving parse_stream (EOF)\n"); if (end_trigger != '\0') return -1; return 0; } -void mapset(const unsigned char *set, int code) +static void mapset(const unsigned char *set, int code) { const unsigned char *s; for (s=set; *s; s++) map[*s] = code; } -void update_ifs_map(void) +static void update_ifs_map(void) { /* char *ifs and char map[256] are both globals. */ ifs = getenv("IFS"); @@ -2284,37 +2643,54 @@ void update_ifs_map(void) * The map[] array only really needs two bits each, and on most machines * that would be faster because of the reduced L1 cache footprint. */ - memset(map,0,256); /* most characters flow through always */ - mapset("\\$'\"`", 3); /* never flow through */ - mapset("<>;&|(){}#", 1); /* flow through if quoted */ - mapset(ifs, 2); /* also flow through if quoted */ + memset(map,0,sizeof(map)); /* most characters flow through always */ + mapset("\\$'\"`", 3); /* never flow through */ + mapset("<>;&|(){}#", 1); /* flow through if quoted */ + mapset(ifs, 2); /* also flow through if quoted */ } -/* most recursion does not come through here, the exeception is +/* most recursion does not come through here, the exception is * from builtin_source() */ -int parse_stream_outer(struct in_str *inp) +int parse_stream_outer(struct in_str *inp, int flag) { struct p_context ctx; o_string temp=NULL_O_STRING; int rcode; do { + ctx.type = flag; initialize_context(&ctx); update_ifs_map(); + if (!(flag & FLAG_PARSE_SEMICOLON) || (flag & FLAG_REPARSING)) mapset(";$&|", 0); inp->promptmode=1; rcode = parse_stream(&temp, &ctx, inp, '\n'); - done_word(&temp, &ctx); - done_pipe(&ctx,PIPE_SEQ); - run_list(ctx.list_head); - } while (rcode != -1); /* loop on syntax errors, return on EOF */ + if (rcode != 1 && ctx.old_flag != 0) { + syntax(); + } + if (rcode != 1 && ctx.old_flag == 0) { + done_word(&temp, &ctx); + done_pipe(&ctx,PIPE_SEQ); + run_list(ctx.list_head); + } else { + if (ctx.old_flag != 0) { + free(ctx.stack); + b_reset(&temp); + } + temp.nonnull = 0; + temp.quote = 0; + inp->p = NULL; + free_pipe_list(ctx.list_head,0); + } + b_free(&temp); + } while (rcode != -1 && !(flag & FLAG_EXIT_FROM_LOOP)); /* loop on syntax errors, return on EOF */ return 0; } -static int parse_string_outer(const char *s) +static int parse_string_outer(const char *s, int flag) { struct in_str input; setup_string_in_str(&input, s); - return parse_stream_outer(&input); + return parse_stream_outer(&input, flag); } static int parse_file_outer(FILE *f) @@ -2322,54 +2698,97 @@ static int parse_file_outer(FILE *f) int rcode; struct in_str input; setup_file_in_str(&input, f); - rcode = parse_stream_outer(&input); + rcode = parse_stream_outer(&input, FLAG_PARSE_SEMICOLON); return rcode; } -int shell_main(int argc, char **argv) +/* Make sure we have a controlling tty. If we get started under a job + * aware app (like bash for example), make sure we are now in charge so + * we don't fight over who gets the foreground */ +static void setup_job_control(void) +{ + static pid_t shell_pgrp; + /* Loop until we are in the foreground. */ + while (tcgetpgrp (shell_terminal) != (shell_pgrp = getpgrp ())) + kill (- shell_pgrp, SIGTTIN); + + /* Ignore interactive and job-control signals. */ + signal(SIGINT, SIG_IGN); + signal(SIGQUIT, SIG_IGN); + signal(SIGTERM, SIG_IGN); + signal(SIGTSTP, SIG_IGN); + signal(SIGTTIN, SIG_IGN); + signal(SIGTTOU, SIG_IGN); + signal(SIGCHLD, SIG_IGN); + + /* Put ourselves in our own process group. */ + setsid(); + shell_pgrp = getpid (); + setpgid (shell_pgrp, shell_pgrp); + + /* Grab control of the terminal. */ + tcsetpgrp(shell_terminal, shell_pgrp); +} + +int hush_main(int argc, char **argv) { int opt; FILE *input; - struct jobset joblist_end = { NULL, NULL }; - job_list = &joblist_end; - - last_return_code=EXIT_SUCCESS; + char **e = environ; /* XXX what should these be while sourcing /etc/profile? */ global_argc = argc; global_argv = argv; - /* don't pay any attention to this signal; it just confuses - things and isn't really meant for shells anyway */ - signal(SIGTTOU, SIG_IGN); + /* (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; + interactive = 0; + close_me_head = NULL; + last_bg_pid = 0; + job_list = NULL; + last_jobid = 0; - if (argv[0] && argv[0][0] == '-') { - debug_printf("\nsourcing /etc/profile\n"); - input = xfopen("/etc/profile", "r"); - mark_open(fileno(input)); - parse_file_outer(input); - mark_closed(fileno(input)); - fclose(input); - } - input=stdin; - - /* initialize the cwd -- this is never freed...*/ - cwd = xgetcwd(0); - if (!cwd) - cwd = unknown; -#ifdef BB_FEATURE_COMMAND_EDITING + /* Initialize some more globals to non-zero values */ + set_cwd(); +#ifdef CONFIG_FEATURE_COMMAND_EDITING cmdedit_set_initial_prompt(); #else PS1 = NULL; #endif - + PS2 = "> "; + + /* initialize our shell local variables with the values + * currently living in the environment */ + if (e) { + for (; *e; e++) + set_local_var(*e, 2); /* without call putenv() */ + } + + last_return_code=EXIT_SUCCESS; + + + if (argv[0] && argv[0][0] == '-') { + debug_printf("\nsourcing /etc/profile\n"); + if ((input = fopen("/etc/profile", "r")) != NULL) { + mark_open(fileno(input)); + parse_file_outer(input); + mark_closed(fileno(input)); + fclose(input); + } + } + input=stdin; + while ((opt = getopt(argc, argv, "c:xif")) > 0) { switch (opt) { case 'c': { global_argv = argv+optind; global_argc = argc-optind; - opt = parse_string_outer(optarg); + opt = parse_string_outer(optarg, FLAG_PARSE_SEMICOLON); goto final_return; } break; @@ -2380,9 +2799,13 @@ int shell_main(int argc, char **argv) fake_mode++; break; default: +#ifndef BB_VER fprintf(stderr, "Usage: sh [FILE]...\n" " or: sh -c command [args]...\n\n"); exit(EXIT_FAILURE); +#else + bb_show_usage(); +#endif } } /* A shell is interactive if the `-i' flag was given, or if all of @@ -2393,14 +2816,21 @@ int shell_main(int argc, char **argv) * standard output is a terminal * Refer to Posix.2, the description of the `sh' utility. */ if (argv[optind]==NULL && input==stdin && - isatty(fileno(stdin)) && isatty(fileno(stdout))) { + isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) { interactive++; } debug_printf("\ninteractive=%d\n", interactive); if (interactive) { /* Looks like they want an interactive shell */ - fprintf(stdout, "\nhush -- the humble shell v0.01 (testing)\n\n"); +#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET + printf( "\n\n" BB_BANNER " hush - the humble shell v0.01 (testing)\n"); + printf( "Enter 'help' for a list of built-in commands.\n\n"); +#endif + setup_job_control(); + } + + if (argv[optind]==NULL) { opt=parse_file_outer(stdin); goto final_return; } @@ -2408,13 +2838,129 @@ int shell_main(int argc, char **argv) debug_printf("\nrunning script '%s'\n", argv[optind]); global_argv = argv+optind; global_argc = argc-optind; - input = xfopen(argv[optind], "r"); + input = bb_xfopen(argv[optind], "r"); opt = parse_file_outer(input); -#ifdef BB_FEATURE_CLEAN_UP - fclose(input.file); +#ifdef CONFIG_FEATURE_CLEAN_UP + fclose(input); + if (cwd && cwd != bb_msg_unknown) + free((char*)cwd); + { + struct variables *cur, *tmp; + for(cur = top_vars; cur; cur = tmp) { + tmp = cur->next; + if (!cur->flg_read_only) { + free(cur->name); + free(cur->value); + free(cur); + } + } + } #endif final_return: return(opt?opt:last_return_code); } + +static char *insert_var_value(char *inp) +{ + int res_str_len = 0; + int len; + int done = 0; + char *p, *p1, *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'; + if ((p1 = lookup_param(inp))) { + 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 = ' '; + } + } + return (res_str == NULL) ? inp : res_str; +} + +static char **make_list_in(char **inp, char *name) +{ + 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; + } + if ((p2 = strchr(p1, ' '))) { + len = p2 - p1; + } else { + len = strlen(p1); + p2 = p1 + len; + } + /* 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); + } + list[n] = NULL; + return list; +} + +/* 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; +}