X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=shell%2Fhush.c;h=7658aebed8af9a6b426ab76888fba78aee19cf83;hb=1c660b4bd2c303fcb829bc93143fc454693afab4;hp=46f1a77bd11027ece6175522ffe16393401d8bf7;hpb=816867858b90485df6c304673cbd01d9664007b4;p=oweals%2Fbusybox.git diff --git a/shell/hush.c b/shell/hush.c index 46f1a77bd..7658aebed 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 @@ -73,48 +75,24 @@ * maybe change map[] to use 2-bit entries * (eventually) remove all the printf's * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ -#include /* isalpha, isdigit */ -#include /* getpid */ -#include /* getenv, atoi */ -#include /* strchr */ -#include /* popen etc. */ + +#include "busybox.h" #include /* glob, of course */ -#include /* va_list */ -#include -#include #include /* should be pretty obvious */ -#include /* ulimit */ -#include -#include -#include +//#include +//#include /* #include */ /* #define DEBUG_SHELL */ -#ifdef BB_VER -#include "busybox.h" -#include "cmdedit.h" -#else -#define applet_name "hush" -#include "standalone.h" -#define shell_main main -#undef BB_FEATURE_SH_FANCY_PROMPT -#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, @@ -126,7 +104,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, ">" }, @@ -156,7 +134,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; -static char map[256]; +static const char *ifs; +static unsigned char map[256]; 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; -static char *PS1; -static char *PS2; -struct variables shell_ver = { "HUSH_VERSION", "0.01", 1, 1, 0 }; -struct variables *top_vars = &shell_ver; +static struct pipe *job_list; +static unsigned last_bg_pid; +static int last_jobid; +static unsigned shell_terminal; +static const char *PS1; +static const 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 @@ -278,6 +255,7 @@ typedef struct { * available? Where is it documented? */ struct in_str { const char *p; + char peek_buf[2]; int __promptme; int promptmode; FILE *file; @@ -290,13 +268,14 @@ 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 */ }; /* belongs in busybox.h */ -static inline int max(int a, int b) { +static int max(int a, int b) +{ return (a>b)?a:b; } @@ -309,20 +288,29 @@ static void debug_printf(const char *format, ...) vfprintf(stderr, format, args); va_end(args); } +/* broken, of course, but OK for testing */ +static char *indenter(int i) +{ + static char blanks[] = " "; + return &blanks[sizeof(blanks)-i-1]; +} #else -static inline void debug_printf(const char *format, ...) { } +#define debug_printf(...) do {;} while (0); #endif #define final_printf debug_printf -static void __syntax(char *file, int line) { - error_msg("syntax error %s:%d", file, line); +static void __syntax(const char *file, int line) +{ + bb_error_msg("syntax error %s:%d", file, line); } -#define syntax() __syntax(__FILE__, __LINE__) +// NB: was __FILE__, but that produces full path sometimess, so... +#define syntax() __syntax("hush.c", __LINE__) /* Index of subroutines: */ /* 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); @@ -342,7 +330,7 @@ static int b_check_space(o_string *o, int len); static int b_addchr(o_string *o, int ch); static void b_reset(o_string *o); static int b_addqchr(o_string *o, int ch, int quote); -static int b_adduint(o_string *o, unsigned int i); +static int b_adduint(o_string *o, unsigned i); /* in_str manipulations: */ static int static_get(struct in_str *i); static int static_peek(struct in_str *i); @@ -353,17 +341,14 @@ 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)); -int controlling_tty(int check_pgrp); +static void pseudo_exec(struct child_prog *child) ATTRIBUTE_NORETURN; static int run_pipe_real(struct pipe *pi); /* extended glob support: */ static int globhack(const char *src, int flags, glob_t *pglob); @@ -382,68 +367,84 @@ 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 const char *lookup_param(const char *src); +static char *make_string(char **inp); static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *input); static int parse_string(o_string *dest, struct p_context *ctx, const char *src); static int parse_stream(o_string *dest, struct p_context *ctx, struct in_str *input0, 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 *get_local_var(const char *var); +static char **make_list_in(char **inp, char *name); +static char *insert_var_value(char *inp); +static const 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. * When used in non-forking context, they can change global variables - * in the parent shell process. If forked, of course they can not. + * 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. */ -static 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}, - {"exit", "Exit from shell()", builtin_exit}, - {"export", "Set environment variable", builtin_export}, - {"fg", "Bring job into the foreground", builtin_fg_bg}, - {"jobs", "Lists the active jobs", builtin_jobs}, - {"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} +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_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 }, + { "jobs", "Lists the active jobs", builtin_jobs }, + { "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 } }; static const char *set_cwd(void) { - if(cwd==unknown) - cwd = NULL; /* xgetcwd(arg) called free(arg) */ - cwd = xgetcwd((char *)cwd); + if (cwd == bb_msg_unknown) + cwd = NULL; /* xrealloc_getcwd_or_warn(arg) called free(arg) */ + cwd = xrealloc_getcwd_or_warn((char *)cwd); if (!cwd) - cwd = unknown; + 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) @@ -462,12 +463,13 @@ static int builtin_cd(struct child_prog *child) } /* built-in 'env' handler */ -static int builtin_env(struct child_prog *dummy) +static int builtin_env(struct child_prog *dummy ATTRIBUTE_UNUSED) { char **e = environ; - if (e == NULL) return EXIT_FAILURE; - for (; *e; e++) { - puts(*e); + if (e == NULL) + return EXIT_FAILURE; + while (*e) { + puts(*e++); } return EXIT_SUCCESS; } @@ -497,13 +499,13 @@ static int builtin_export(struct child_prog *child) char *name = child->argv[1]; if (name == NULL) { - return (builtin_env(child)); + return builtin_env(child); } name = strdup(name); - if(name) { - char *value = strchr(name, '='); + if (name) { + const char *value = strchr(name, '='); if (!value) { char *tmp; @@ -514,7 +516,7 @@ static int builtin_export(struct child_prog *child) size_t ln = strlen(name); tmp = realloc(name, ln+strlen(value)+2); - if(tmp==NULL) + if (tmp == NULL) res = -1; else { sprintf(tmp+ln, "=%s", value); @@ -527,9 +529,9 @@ static int builtin_export(struct child_prog *child) } } } - if (res<0) - perror_msg("export"); - else if(res==0) + if (res < 0) + bb_perror_msg("export"); + else if (res == 0) res = set_local_var(name, 1); else res = 0; @@ -541,64 +543,68 @@ static int builtin_export(struct child_prog *child) static int builtin_fg_bg(struct child_prog *child) { int i, jobnum; - struct pipe *pi=NULL; + 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-1"); - 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); + i = kill(- pi->pgrp, SIGCONT); + if (i < 0) { + if (i == ESRCH) { + remove_bg_job(pi); + } else { + bb_perror_msg("kill (SIGCONT)"); + } + } pi->stopped_progs = 0; return EXIT_SUCCESS; } /* built-in 'help' handler */ -static int builtin_help(struct child_prog *dummy) +static int builtin_help(struct child_prog *dummy ATTRIBUTE_UNUSED) { - struct built_in_command *x; + const struct built_in_command *x; printf("\nBuilt-in commands:\n"); printf("-------------------\n"); for (x = bltins; x->cmd; x++) { - if (x->descr==NULL) + if (x->descr == NULL) continue; printf("%s\t%s\n", x->cmd, x->descr); } @@ -607,16 +613,17 @@ static int builtin_help(struct child_prog *dummy) } /* built-in 'jobs' handler */ -static int builtin_jobs(struct child_prog *child) +static int builtin_jobs(struct child_prog *child ATTRIBUTE_UNUSED) { struct pipe *job; - char *status_string; + const 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; @@ -624,7 +631,7 @@ static int builtin_jobs(struct child_prog *child) /* built-in 'pwd' handler */ -static int builtin_pwd(struct child_prog *dummy) +static int builtin_pwd(struct child_prog *dummy ATTRIBUTE_UNUSED) { puts(set_cwd()); return EXIT_SUCCESS; @@ -637,26 +644,25 @@ static int builtin_read(struct child_prog *child) if (child->argv[1]) { char string[BUFSIZ]; - char *var = 0; + char *var = NULL; - string[0] = 0; /* In case stdin has only EOF */ + 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) { + 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: %m\n"); + bb_perror_msg("read"); free(var); /* So not move up to avoid breaking errno */ return res; - } else { - do res=getchar(); while(res!='\n' && res!=EOF); - return 0; } + do res = getchar(); while (res != '\n' && res != EOF); + return 0; } /* built-in 'set VAR=value' handler */ @@ -666,23 +672,23 @@ static int builtin_set(struct child_prog *child) struct variables *e; if (temp == NULL) - for(e = top_vars; e; e=e->next) + for (e = top_vars; e; e = e->next) printf("%s=%s\n", e->name, e->value); else set_local_var(temp, 0); - return EXIT_SUCCESS; + return EXIT_SUCCESS; } /* Built-in 'shift' handler */ static int builtin_shift(struct child_prog *child) { - int n=1; + int n = 1; if (child->argv[1]) { - n=atoi(child->argv[1]); + n = atoi(child->argv[1]); } - if (n>=0 && n= 0 && n < global_argc) { /* XXX This probably breaks $0 */ global_argc -= n; global_argv += n; @@ -704,7 +710,7 @@ static int builtin_source(struct child_prog *child) /* XXX search through $PATH is missing */ input = fopen(child->argv[1], "r"); if (!input) { - error_msg("Couldn't open file '%s'", child->argv[1]); + bb_error_msg("cannot open '%s'", child->argv[1]); return EXIT_FAILURE; } @@ -716,7 +722,7 @@ static int builtin_source(struct child_prog *child) status = parse_file_outer(input); mark_closed(fileno(input)); fclose(input); - return (status); + return status; } static int builtin_umask(struct child_prog *child) @@ -725,12 +731,13 @@ static int builtin_umask(struct child_prog *child) const char *arg = child->argv[1]; char *end; if (arg) { - new_umask=strtoul(arg, &end, 8); - if (*end!='\0' || end == arg) { + new_umask = strtoul(arg, &end, 8); + if (*end != '\0' || end == arg) { return EXIT_FAILURE; } } else { - printf("%.3o\n", (unsigned int) (new_umask=umask(0))); + new_umask = umask(0); + printf("%.3o\n", (unsigned) new_umask); } umask(new_umask); return EXIT_SUCCESS; @@ -746,7 +753,7 @@ static int builtin_unset(struct child_prog *child) static int builtin_not_written(struct child_prog *child) { - printf("builtin_%s not written\n",child->argv[0]); + printf("builtin_%s not written\n", child->argv[0]); return EXIT_FAILURE; } @@ -769,7 +776,8 @@ static int b_check_space(o_string *o, int len) static int b_addchr(o_string *o, int ch) { debug_printf("b_addchr: %c %d %p\n", ch, o->length, o); - if (b_check_space(o, 1)) return B_NOSPAC; + if (b_check_space(o, 1)) + return B_NOSPAC; o->data[o->length] = ch; o->length++; o->data[o->length] = '\0'; @@ -780,13 +788,14 @@ static void b_reset(o_string *o) { o->length = 0; o->nonnull = 0; - if (o->data != NULL) *o->data = '\0'; + if (o->data != NULL) + *o->data = '\0'; } 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; } @@ -799,17 +808,17 @@ static int b_addqchr(o_string *o, int ch, int quote) if (quote && strchr("*?[\\",ch)) { int rc; rc = b_addchr(o, '\\'); - if (rc) return rc; + if (rc) + return rc; } return b_addchr(o, ch); } /* belongs in utility.c */ -char *simple_itoa(unsigned int i) +static char *simple_itoa(unsigned i) { - /* 21 digits plus null terminator, good for 64-bit or smaller ints */ - static char local[22]; - char *p = &local[21]; + static char local[sizeof(int)*3 + 2]; + char *p = &local[sizeof(int)*3 + 2 - 1]; *p-- = '\0'; do { *p-- = '0' + i % 10; @@ -818,19 +827,19 @@ char *simple_itoa(unsigned int i) return p + 1; } -static int b_adduint(o_string *o, unsigned int i) +static int b_adduint(o_string *o, unsigned i) { int r; char *p = simple_itoa(i); /* no escape checking necessary */ - do r=b_addchr(o, *p++); while (r==0 && *p); + do r = b_addchr(o, *p++); while (r == 0 && *p); return r; } static int static_get(struct in_str *i) { - int ch=*i->p++; - if (ch=='\0') return EOF; + int ch = *i->p++; + if (ch == '\0') return EOF; return ch; } @@ -839,62 +848,69 @@ static int static_peek(struct in_str *i) return *i->p; } -static inline void cmdedit_set_initial_prompt(void) +static void cmdedit_set_initial_prompt(void) { -#ifndef BB_FEATURE_SH_FANCY_PROMPT +#if !ENABLE_FEATURE_EDITING_FANCY_PROMPT PS1 = NULL; #else PS1 = getenv("PS1"); - if(PS1==0) + if (PS1 == NULL) PS1 = "\\w \\$ "; -#endif +#endif } -static inline void setup_prompt_string(int promptmode, char **prompt_str) +static const char* setup_prompt_string(int promptmode) { - debug_printf("setup_prompt_string %d ",promptmode); -#ifndef BB_FEATURE_SH_FANCY_PROMPT + const char *prompt_str; + debug_printf("setup_prompt_string %d ", promptmode); +#if !ENABLE_FEATURE_EDITING_FANCY_PROMPT /* Set up the prompt */ if (promptmode == 1) { - if (PS1) - free(PS1); - PS1=xmalloc(strlen(cwd)+4); - sprintf(PS1, "%s %s", cwd, ( geteuid() != 0 ) ? "$ ":"# "); - *prompt_str = PS1; + char *ns; + free((char*)PS1); + ns = xmalloc(strlen(cwd)+4); + sprintf(ns, "%s %s", cwd, (geteuid() != 0) ? "$ " : "# "); + prompt_str = ns; + PS1 = ns; } else { - *prompt_str = PS2; + prompt_str = PS2; } #else - *prompt_str = (promptmode==0)? PS1 : PS2; + prompt_str = (promptmode == 1) ? PS1 : PS2; #endif - debug_printf("result %s\n",*prompt_str); + debug_printf("result %s\n", prompt_str); + return prompt_str; } +#if ENABLE_FEATURE_EDITING +static line_input_t *line_input_state; +#endif + static void get_user_input(struct in_str *i) { - char *prompt_str; + const char *prompt_str; static char the_command[BUFSIZ]; - setup_prompt_string(i->promptmode, &prompt_str); -#ifdef BB_FEATURE_COMMAND_EDITING + 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) */ - cmdedit_read_input(prompt_str, the_command); - cmdedit_terminate(); + read_line_input(prompt_str, the_command, BUFSIZ, line_input_state); #else fputs(prompt_str, stdout); fflush(stdout); - the_command[0]=fgetc(i->file); - the_command[1]='\0'; + 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) { @@ -903,16 +919,18 @@ static int file_get(struct in_str *i) ch = 0; /* If there is data waiting, eat it up */ if (i->p && *i->p) { - ch=*i->p++; + ch = *i->p++; } else { /* 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); - i->promptmode=2; + while (!i->p || !(interactive && strlen(i->p))) { + get_user_input(i); + } + i->promptmode = 2; i->__promptme = 0; if (i->p && *i->p) { - ch=*i->p++; + ch = *i->p++; } } else { ch = fgetc(i->file); @@ -920,7 +938,8 @@ static int file_get(struct in_str *i) debug_printf("b_getch: got a %d\n", ch); } - if (ch == '\n') i->__promptme=1; + if (ch == '\n') + i->__promptme = 1; return ch; } @@ -932,12 +951,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; } } @@ -945,8 +963,8 @@ static void setup_file_in_str(struct in_str *i, FILE *f) { i->peek = file_peek; i->get = file_get; - i->__promptme=1; - i->promptmode=1; + i->__promptme = 1; + i->promptmode = 1; i->file = f; i->p = NULL; } @@ -955,8 +973,8 @@ static void setup_string_in_str(struct in_str *i, const char *s) { i->peek = static_peek; i->get = static_get; - i->__promptme=1; - i->promptmode=1; + i->__promptme = 1; + i->promptmode = 1; i->p = s; } @@ -972,16 +990,16 @@ 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) { + for (c = close_me_head; c; c = c->next) { close(c->fd); } close_me_head = NULL; @@ -994,14 +1012,18 @@ static int setup_redirects(struct child_prog *prog, int squirrel[]) int openfd, mode; struct redir_struct *redir; - for (redir=prog->redirects; redir; redir=redir->next) { + 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; + 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!) */ - perror_msg("error opening %s", redir->word.gl_pathv[0]); + bb_perror_msg("error opening %s", redir->word.gl_pathv[0]); return 1; } } else { @@ -1016,7 +1038,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); } } } @@ -1026,7 +1049,7 @@ static int setup_redirects(struct child_prog *prog, int squirrel[]) static void restore_redirects(int squirrel[]) { int i, fd; - for (i=0; i<3; i++) { + for (i = 0; i < 3; i++) { fd = squirrel[i]; if (fd != -1) { /* No error checking. I sure wouldn't know what @@ -1037,27 +1060,6 @@ 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; -} - /* never returns */ /* XXX no exit() here. If you don't exec, use _exit instead. * The at_exit handlers apparently confuse the calling process, @@ -1065,13 +1067,18 @@ static int pipe_wait(struct pipe *pi) 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++) { - debug_printf("pid %d environment modification: %s\n",getpid(),child->argv[i]); - putenv(strdup(child->argv[i])); + for (i = 0; is_assignment(child->argv[i]); 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 + child->argv += i; /* XXX this hack isn't so horrible, since we are about to exit, and therefore don't need to keep data structures consistent for free() use. */ /* If a variable is assigned in a forest, and nobody listens, @@ -1090,53 +1097,44 @@ 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... */ +#if ENABLE_FEATURE_SH_STANDALONE_SHELL { int argc_l; - char** argv_l=child->argv; + 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++); + for (argc_l = 0; *argv_l; argv_l++, argc_l++) + /**/; optind = 1; debug_printf("running applet %s\n", name); run_applet_by_name(name, argc_l, child->argv); } #endif - debug_printf("exec of %s\n",child->argv[0]); - execvp(child->argv[0],child->argv); - perror_msg("couldn't exec: %s",child->argv[0]); + debug_printf("exec of %s\n", child->argv[0]); + execvp(child->argv[0], child->argv); + bb_perror_msg("cannot exec: %s", child->argv[0]); _exit(1); } else if (child->group) { debug_printf("runtime nesting to group\n"); - interactive=0; /* crucial!!!! */ + 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); } else { @@ -1152,15 +1150,16 @@ 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; } @@ -1174,130 +1173,114 @@ static void insert_bg_job(struct pipe *pi) //if (pi->progs[0] && pi->progs[0].argv && pi->progs[0].argv[0]) { - char *bar=thejob->text; - char **foo=pi->progs[0].argv; - while(foo && *foo) { - bar += sprintf(bar, "%s ", *foo++); - } + char *bar = thejob->text; + char **foo = pi->progs[0].argv; + if (foo) + while (*foo) + bar += sprintf(bar, "%s ", *foo++); } - /* 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; - 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; - free_pipe(pi); + 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 status, ctty; + 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--; pi->progs[prognum].pid = 0; if (!pi->running_progs) { - printf(JOB_STATUS_FORMAT, pi->jobid, "Done", pi->text); + printf(JOB_STATUS_FORMAT, pi->jobid, + "Done", pi->text); remove_bg_job(pi); } } else { - if(pi==NULL) - break; /* child stopped */ pi->stopped_progs++; pi->progs[prognum].is_stopped = 1; - - if (pi->stopped_progs == pi->num_progs) { - printf(JOB_STATUS_FORMAT, pi->jobid, "Stopped", pi->text); - } } } if (childpid == -1 && errno != ECHILD) - perror_msg("waitpid"); + bb_perror_msg("waitpid"); /* move the shell to the foreground */ - if (interactive && (ctty=controlling_tty(0))!=-1) { - if (tcsetpgrp(ctty, getpgrp())) - perror_msg("tcsetpgrp-2"); - } -} - -/* 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 ctty is needed in order to call - * tcsetpgrp(ctty, ...); */ -int controlling_tty(int check_pgrp) -{ - pid_t curpgrp; - int ctty; - - if ((curpgrp = tcgetpgrp(ctty = 2)) < 0 - && (curpgrp = tcgetpgrp(ctty = 0)) < 0 - && (curpgrp = tcgetpgrp(ctty = 1)) < 0) - return errno = ENOTTY, -1; - - if (check_pgrp && curpgrp != getpgrp()) - return errno = EPERM, -1; - - return ctty; + //if (interactive && tcsetpgrp(shell_terminal, getpgid(0))) + // bb_perror_msg("tcsetpgrp-2"); + return -1; } /* 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 @@ -1315,51 +1298,81 @@ int controlling_tty(int check_pgrp) 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 = -1; - /* Check if we are supposed to run in the foreground */ - if (interactive && pi->followup!=PIPE_BG) { - if ((ctty = controlling_tty(pi->pgrp<0)) < 0) return -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; - } - for (i=0; is_assignment(child->argv[i]); i++) { /* nothing */ } - if (i!=0 && child->argv[i]==NULL) { + 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], 0); + for (i = 0; child->argv[i] != NULL; i++) { + /* Ok, this case is tricky. We have to decide if this is a + * local variable, or an already exported variable. If it is + * already exported, we have to export the new value. If it is + * not exported, we need only set this as a local variable. + * This junk is all to decide whether or not to export this + * variable. */ + int export_me = 0; + char *name, *value; + name = xstrdup(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}; + int squirrel[] = { -1, -1, -1 }; int rcode; - if (x->function == builtin_exec && child->argv[i+1]==NULL) { + if (x->function == builtin_exec && child->argv[i+1] == NULL) { debug_printf("magic exec\n"); setup_redirects(child,NULL); return EXIT_SUCCESS; @@ -1370,12 +1383,9 @@ 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 */ + child->argv += i; /* XXX horrible hack */ rcode = x->function(child); - child->argv-=i; /* XXX restore hack so free() can work right */ + child->argv -= i; /* XXX restore hack so free() can work right */ restore_redirects(squirrel); return rcode; } @@ -1383,22 +1393,34 @@ static int run_pipe_real(struct pipe *pi) } for (i = 0; i < pi->num_progs; i++) { - child = & (pi->progs[i]); + child = &(pi->progs[i]); /* 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; + nextout = 1; pipefds[0] = -1; } /* XXX test for failed fork()? */ - if (!(child->pid = fork())) { - +#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__) + child->pid = fork(); +#else + child->pid = vfork(); +#endif + if (!child->pid) { + /* 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) { @@ -1409,31 +1431,30 @@ static int run_pipe_real(struct pipe *pi) dup2(nextout, 1); close(nextout); } - if (pipefds[0]!=-1) { + if (pipefds[0] != -1) { close(pipefds[0]); /* opposite end of our output pipe */ } /* Like bash, explicit redirects override pipes, * and the pipe fd is available for dup'ing. */ setup_redirects(child,NULL); - - if (interactive && pi->followup!=PIPE_BG) { + + 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 = getpid(); } 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; } @@ -1446,7 +1467,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]; } @@ -1455,134 +1476,221 @@ static int run_pipe_real(struct pipe *pi) static int run_list_real(struct pipe *pi) { - int rcode=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) { + 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; + /* 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; + 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 && 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 (pi->num_progs == 0) continue; + 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) + 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); - if (rcode!=-1) { + 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. */ - } else if (pi->followup==PIPE_BG) { + } else if (pi->followup == PIPE_BG) { /* XXX check bash's behavior with nontrivial pipes */ /* XXX compute jobid */ /* XXX what does bash do with attempts to background builtins? */ 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 */ - /* XXX probably this "0" should come from controlling_tty() */ - if (tcsetpgrp(0, pi->pgrp) && errno != ENOTTY) - perror_msg("tcsetpgrp-3"); - rcode = pipe_wait(pi); - if (tcsetpgrp(0, getpgrp()) && errno != ENOTTY) - perror_msg("tcsetpgrp-4"); + 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); - debug_printf("pipe_wait returned %d\n",rcode); + rcode = checkjobs(pi); } + debug_printf("checkjobs returned %d\n",rcode); } - last_return_code=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 ( (rcode==EXIT_SUCCESS && pi->followup==PIPE_OR) || - (rcode!=EXIT_SUCCESS && pi->followup==PIPE_AND) ) - skip_more_in_this_rmode=rmode; + 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; + } + checkjobs(NULL); } - checkjobs(); return rcode; } -/* broken, of course, but OK for testing */ -static char *indenter(int i) -{ - static char blanks[]=" "; - return &blanks[sizeof(blanks)-i-1]; -} - /* 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); - final_printf("%s run pipe: (pid %d)\n",ind,getpid()); - for (i=0; inum_progs; i++) { + int a, i, ret_code = 0; + + if (pi->stopped_progs > 0) + return ret_code; + final_printf("%s run pipe: (pid %d)\n", indenter(indent), getpid()); + for (i = 0; i < pi->num_progs; i++) { child = &pi->progs[i]; - final_printf("%s command %d:\n",ind,i); + final_printf("%s command %d:\n", indenter(indent), i); if (child->argv) { - for (a=0,p=child->argv; *p; a++,p++) { - final_printf("%s argv[%d] = %s\n",ind,a,*p); + for (a = 0, p = child->argv; *p; a++, p++) { + final_printf("%s argv[%d] = %s\n", indenter(indent), a, *p); } globfree(&child->glob_result); - child->argv=NULL; + 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); - final_printf("%s end group\n",ind); + final_printf("%s begin group (subshell:%d)\n", indenter(indent), child->subshell); + ret_code = free_pipe_list(child->group, indent+3); + final_printf("%s end group\n", indenter(indent)); } else { - final_printf("%s (nil)\n",ind); + final_printf("%s (nil)\n", indenter(indent)); } - for (r=child->redirects; r; r=rnext) { - final_printf("%s redirect %d%s", ind, r->fd, redir_table[r->type].descrip); + for (r = child->redirects; r; r = rnext) { + final_printf("%s redirect %d%s", indenter(indent), 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); } - rnext=r->next; + rnext = r->next; free(r); } - child->redirects=NULL; + child->redirects = NULL; } free(pi->progs); /* children are an array, they get freed all at once */ - pi->progs=NULL; + pi->progs = NULL; 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 */ + 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); - final_printf("%s pipe followup code %d\n", ind, pi->followup); - next=pi->next; - pi->next=NULL; + for (pi = head; pi; pi = next) { + final_printf("%s pipe reserved mode %d\n", indenter(indent), pi->r_mode); + rcode = free_pipe(pi, indent); + final_printf("%s pipe followup code %d\n", indenter(indent), pi->followup); + next = pi->next; + pi->next = NULL; free(pi); } - return rcode; + return rcode; } /* Select which version we will use */ static int run_list(struct pipe *pi) { - int rcode=0; - if (fake_mode==0) { + 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; } @@ -1595,31 +1703,31 @@ 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++; } dest = malloc(cnt); if (!dest) return GLOB_NOSPACE; if (!(flags & GLOB_APPEND)) { - pglob->gl_pathv=NULL; - pglob->gl_pathc=0; - pglob->gl_offs=0; - pglob->gl_offs=0; + pglob->gl_pathv = NULL; + pglob->gl_pathc = 0; + pglob->gl_offs = 0; + pglob->gl_offs = 0; } pathc = ++pglob->gl_pathc; pglob->gl_pathv = realloc(pglob->gl_pathv, (pathc+1)*sizeof(*pglob->gl_pathv)); if (pglob->gl_pathv == NULL) return GLOB_NOSPACE; - pglob->gl_pathv[pathc-1]=dest; - pglob->gl_pathv[pathc]=NULL; - for (s=src; *s; s++, dest++) { + pglob->gl_pathv[pathc-1] = dest; + pglob->gl_pathv[pathc] = NULL; + for (s = src; s && *s; s++, dest++) { if (*s == '\\') s++; *dest = *s; } - *dest='\0'; + *dest = '\0'; return 0; } @@ -1628,149 +1736,134 @@ static int glob_needed(const char *s) { for (; *s; s++) { if (*s == '\\') s++; - if (strchr("*[?",*s)) return 1; + if (strchr("*[?", *s)) return 1; } return 0; } -#if 0 -static void globprint(glob_t *pglob) -{ - int i; - debug_printf("glob_t at %p:\n", pglob); - debug_printf(" gl_pathc=%d gl_pathv=%p gl_offs=%d gl_flags=%d\n", - pglob->gl_pathc, pglob->gl_pathv, pglob->gl_offs, pglob->gl_flags); - for (i=0; igl_pathc; i++) - debug_printf("pglob->gl_pathv[%d] = %p = %s\n", i, - pglob->gl_pathv[i], pglob->gl_pathv[i]); -} -#endif - static int xglob(o_string *dest, int flags, glob_t *pglob) { int gr; - /* short-circuit for null word */ + /* short-circuit for null word */ /* we can code this better when the debug_printf's are gone */ - if (dest->length == 0) { - if (dest->nonnull) { - /* bash man page calls this an "explicit" null */ - gr = globhack(dest->data, flags, pglob); - debug_printf("globhack returned %d\n",gr); - } else { + if (dest->length == 0) { + if (dest->nonnull) { + /* bash man page calls this an "explicit" null */ + gr = globhack(dest->data, flags, pglob); + debug_printf("globhack returned %d\n", gr); + } else { return 0; } - } else if (glob_needed(dest->data)) { + } else if (glob_needed(dest->data)) { gr = glob(dest->data, flags, NULL, pglob); - debug_printf("glob returned %d\n",gr); + debug_printf("glob returned %d\n", gr); if (gr == GLOB_NOMATCH) { /* quote removal, or more accurately, backslash removal */ gr = globhack(dest->data, flags, pglob); - debug_printf("globhack returned %d\n",gr); + debug_printf("globhack returned %d\n", gr); } } else { gr = globhack(dest->data, flags, pglob); - debug_printf("globhack returned %d\n",gr); + debug_printf("globhack returned %d\n", gr); } if (gr == GLOB_NOSPACE) - error_msg_and_die("out of memory during glob"); + bb_error_msg_and_die("out of memory during glob"); if (gr != 0) { /* GLOB_ABORTED ? */ - error_msg("glob(3) error %d",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) +static const 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) + for (cur = top_vars; cur; cur = cur->next) + if (strcmp(cur->name, s) == 0) return cur->value; return NULL; } /* This is used to set local shell variables - flg_export==0 if only local (not exporting) variable - flg_export==1 if "new" exporting environ - flg_export>1 if current startup environ (not call putenv()) */ + 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) { char *name, *value; - int result=0; + int result = 0; struct variables *cur; - char *newval = 0; - name=strdup(s); + 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' */ + * split 's' on the '=' into 'name' and 'value' */ value = strchr(name, '='); - if (value==0 || (newval = strdup(value+1))==0) { - result = -1; - } else { - *value++ = 0; + 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; - } + 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++; + 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(cur->flg_read_only) { - result = -1; - error_msg("%s: readonly variable", name); - } else { - if(flg_export>0 || cur->flg_export>1) - cur->flg_export=1; - free(cur->value); - cur->value = newval; - newval = 0; /* protect free */ - } + if (flg_export > 0 || cur->flg_export > 1) + cur->flg_export = 1; + free((char*)cur->value); + + cur->value = strdup(value); } + } + } else { + cur = malloc(sizeof(struct variables)); + if (!cur) { + result = -1; } else { - cur = malloc(sizeof(struct variables)); - if(cur==0) { + cur->name = strdup(name); + if (cur->name) { + free(cur); result = -1; } else { - cur->name = strdup(name); - if(cur->name == 0) { - free(cur); - result = -1; - } else { - struct variables *bottom = top_vars; - cur->value = newval; - newval = 0; /* protect free */ - cur->next = 0; - cur->flg_export = flg_export; - cur->flg_read_only = 0; - while(bottom->next) bottom=bottom->next; - bottom->next = cur; - } + 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) { + if (result == 0 && cur->flg_export == 1) { *(value-1) = '='; result = putenv(name); } else { free(name); - if(result>0) /* equivalent to previous set */ + if (result > 0) /* equivalent to previous set */ result = 0; } - free(newval); return result; } @@ -1779,24 +1872,23 @@ 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) + for (cur = top_vars; cur; cur = cur->next) { + if (strcmp(cur->name, name) == 0) break; } - if(cur!=0) { + if (cur != 0) { struct variables *next = top_vars; - if(cur->flg_read_only) { - error_msg("%s: readonly variable", name); + 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; } + if (cur->flg_export) + unsetenv(cur->name); + free((char*)cur->name); + free((char*)cur->value); + while (next->next != cur) + next = next->next; + next->next = cur->next; free(cur); } } @@ -1804,10 +1896,12 @@ static void unset_local_var(const char *name) static int is_assignment(const char *s) { - if (s==NULL || !isalpha(*s)) return 0; - ++s; - while(isalnum(*s) || *s=='_') ++s; - return *s=='='; + if (!s || !isalpha(*s)) + return 0; + s++; + while (isalnum(*s) || *s == '_') + s++; + return *s == '='; } /* the src parameter allows us to peek forward to a possible &n syntax @@ -1817,29 +1911,30 @@ static int is_assignment(const char *s) static int setup_redirect(struct p_context *ctx, int fd, redir_type style, struct in_str *input) { - struct child_prog *child=ctx->child; + struct child_prog *child = ctx->child; struct redir_struct *redir = child->redirects; - struct redir_struct *last_redir=NULL; + struct redir_struct *last_redir = NULL; /* Create a new redir_struct and drop it onto the end of the linked list */ - while(redir) { - last_redir=redir; - redir=redir->next; + while (redir) { + last_redir = redir; + redir = redir->next; } redir = xmalloc(sizeof(struct redir_struct)); - redir->next=NULL; + redir->next = NULL; + redir->word.gl_pathv = NULL; if (last_redir) { - last_redir->next=redir; + last_redir->next = redir; } else { - child->redirects=redir; + child->redirects = redir; } - redir->type=style; - redir->fd= (fd==-1) ? redir_table[style].default_fd : fd ; + redir->type = style; + redir->fd = (fd == -1) ? redir_table[style].default_fd : fd; 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) { @@ -1858,25 +1953,27 @@ 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; } 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->w=RES_NONE; - ctx->stack=NULL; + ctx->pipe = NULL; + ctx->pending_redirect = NULL; + ctx->child = NULL; + ctx->list_head = new_pipe(); + 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 */ } @@ -1885,10 +1982,10 @@ 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; + const char *literal; int code; long flag; }; @@ -1897,43 +1994,53 @@ int reserved_word(o_string *dest, struct p_context *ctx) * to turn the compound list into a command. * FLAG_START means the word must start a new compound list. */ - static struct reserved_combo reserved_list[] = { + static const struct reserved_combo reserved_list[] = { { "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 }, - { "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 } }; - struct reserved_combo *r; - for (r=reserved_list; -#define NRES sizeof(reserved_list)/sizeof(struct reserved_combo) - rdata, 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->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))) { + ctx->stack = new; + } else if (ctx->w == RES_NONE || !(ctx->old_flag & (1 << r->code))) { syntax(); ctx->w = RES_SNTX; - b_reset (dest); + b_reset(dest); return 1; } - ctx->w=r->code; + ctx->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); } @@ -1948,7 +2055,7 @@ int reserved_word(o_string *dest, struct p_context *ctx) * Syntax or xglob errors return 1. */ static int done_word(o_string *dest, struct p_context *ctx) { - struct child_prog *child=ctx->child; + struct child_prog *child = ctx->child; glob_t *glob_target; int gr, flags = 0; @@ -1964,26 +2071,31 @@ 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; + if (reserved_word(dest,ctx)) + return (ctx->w == RES_SNTX); } glob_target = &child->glob_result; - if (child->argv) flags |= GLOB_APPEND; + if (child->argv) flags |= GLOB_APPEND; } gr = xglob(dest, flags, glob_target); if (gr != 0) return 1; b_reset(dest); if (ctx->pending_redirect) { - ctx->pending_redirect=NULL; + ctx->pending_redirect = NULL; if (glob_target->gl_pathc != 1) { - error_msg("ambiguous redirect"); + 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; } @@ -1996,8 +2108,8 @@ static int done_command(struct p_context *ctx) * Only real trickiness here is that the uncommitted * child structure, to which ctx->child points, is not * counted in pi->num_progs. */ - struct pipe *pi=ctx->pipe; - struct child_prog *prog=ctx->child; + struct pipe *pi = ctx->pipe; + struct child_prog *prog = ctx->child; if (prog && prog->group == NULL && prog->argv == NULL @@ -2019,8 +2131,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; } @@ -2032,7 +2146,7 @@ static int done_pipe(struct p_context *ctx, pipe_style type) debug_printf("done_pipe, type %d\n", type); ctx->pipe->followup = type; ctx->pipe->r_mode = ctx->w; - new_p=new_pipe(); + new_p = new_pipe(); ctx->pipe->next = new_p; ctx->pipe = new_p; ctx->child = NULL; @@ -2046,25 +2160,25 @@ static int done_pipe(struct p_context *ctx, pipe_style type) */ static int redirect_dup_num(struct in_str *input) { - int ch, d=0, ok=0; + int ch, d = 0, ok = 0; ch = b_peek(input); if (ch != '&') return -1; b_getch(input); /* get the & */ - ch=b_peek(input); + ch = b_peek(input); if (ch == '-') { b_getch(input); return -3; /* "-" represents "close me" */ } while (isdigit(ch)) { d = d*10+(ch-'0'); - ok=1; + ok = 1; b_getch(input); ch = b_peek(input); } if (ok) return d; - error_msg("ambiguous redirect"); + bb_error_msg("ambiguous redirect"); return -2; } @@ -2083,50 +2197,43 @@ static int redirect_opt_num(o_string *o) { int num; - if (o->length==0) return -1; - for(num=0; numlength; num++) { - if (!isdigit(*(o->data+num))) { + if (o->length == 0) + return -1; + for (num = 0; num < o->length; num++) { + if (!isdigit(*(o->data + num))) { return -1; } } /* reuse num (and save an int) */ - num=atoi(o->data); + num = atoi(o->data); b_reset(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"); - pid=fork(); - if (pid<0) { - perror_msg_and_die("fork"); - } else if (pid==0) { + 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) { + bb_perror_msg_and_die("fork"); + } else if (pid == 0) { close(channel[0]); if (channel[1] != 1) { dup2(channel[1],1); close(channel[1]); } -#if 0 -#define SURROGATE "surrogate response" - write(1,SURROGATE,sizeof(SURROGATE)); - _exit(run_list(head)); -#else _exit(run_list_real(head)); /* leaks memory */ -#endif } debug_printf("forked child %d\n",pid); close(channel[1]); pf = fdopen(channel[0],"r"); debug_printf("pipe on FILE *%p\n",pf); -#else - run_list_test(head,0); - pf=popen("echo surrogate response","r"); - debug_printf("started fake pipe on FILE *%p\n",pf); -#endif return pf; } @@ -2135,7 +2242,7 @@ FILE *generate_stream_from_list(struct pipe *head) static int process_command_subs(o_string *dest, struct p_context *ctx, struct in_str *input, int subst_end) { int retcode; - o_string result=NULL_O_STRING; + o_string result = NULL_O_STRING; struct p_context inner; FILE *p; struct in_str pipe_str; @@ -2148,8 +2255,8 @@ static int process_command_subs(o_string *dest, struct p_context *ctx, struct in done_pipe(&inner, PIPE_SEQ); b_free(&result); - p=generate_stream_from_list(inner.list_head); - if (p==NULL) return 1; + p = generate_stream_from_list(inner.list_head); + if (p == NULL) return 1; mark_open(fileno(p)); setup_file_in_str(&pipe_str, p); @@ -2158,7 +2265,8 @@ static int process_command_subs(o_string *dest, struct p_context *ctx, struct in /* XXX In case of a syntax error, should we try to kill the child? * That would be tough to do right, so just read until EOF. */ if (retcode == 1) { - while (b_getch(&pipe_str)!=EOF) { /* discard */ }; + while (b_getch(&pipe_str) != EOF) + /* discard */; } debug_printf("done reading from pipe, pclose()ing\n"); @@ -2168,7 +2276,8 @@ static int process_command_subs(o_string *dest, struct p_context *ctx, struct in * at the same time. That would be a lot of work, and contrary * to the KISS philosophy of this program. */ mark_closed(fileno(p)); - retcode=pclose(p); + 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; @@ -2177,7 +2286,7 @@ static int process_command_subs(o_string *dest, struct p_context *ctx, struct in static int parse_group(o_string *dest, struct p_context *ctx, struct in_str *input, int ch) { - int rcode, endch=0; + int rcode, endch = 0; struct p_context sub; struct child_prog *child = ctx->child; if (child->argv) { @@ -2185,12 +2294,18 @@ static int parse_group(o_string *dest, struct p_context *ctx, return 1; /* syntax error, groups and arglists don't mix */ } initialize_context(&sub); - switch(ch) { - case '(': endch=')'; child->subshell=1; break; - case '{': endch='}'; break; - default: syntax(); /* really logic error */ - } - rcode=parse_stream(dest,&sub,input,endch); + switch (ch) { + case '(': + 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 */ done_pipe(&sub, PIPE_SEQ); /* and the final command there, too */ child->group = sub.list_head; @@ -2200,35 +2315,35 @@ 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 const char *lookup_param(const char *src) { - const char *p=NULL; - if (src->data) { - p = getenv(src->data); - if (!p) - p = get_local_var(src->data); + const char *p = NULL; + if (src) { + p = getenv(src); + if (!p) + p = get_local_var(src); } - if (p) parse_string(dest, ctx, p); /* recursion */ - b_free(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 i, advance = 0; + char sep[] = " "; int ch = input->peek(input); /* first character after the $ */ debug_printf("handle_dollar: ch=%c\n",ch); if (isalpha(ch)) { - while(ch=b_peek(input),isalnum(ch) || 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); + while (1) { + ch = b_getch(input); + if (ch == EOF || ch == '}') + break; + 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); process_command_subs(dest, ctx, input, ')'); break; case '*': - sep[0]=ifs[0]; - for (i=1; iquote. */ debug_printf("parse_stream, end_trigger=%d\n",end_trigger); - while ((ch=b_getch(input))!=EOF) { + while ((ch = b_getch(input)) != EOF) { m = map[ch]; next = (ch == '\n') ? 0 : b_peek(input); debug_printf("parse_stream: ch=%c (%d) m=%d quote=%d\n", - ch,ch,m,dest->quote); - if (m==0 || ((m==1 || m==2) && dest->quote)) { + ch, ch, m, dest->quote); + if (m == 0 || ((m == 1 || m == 2) && dest->quote)) { b_addqchr(dest, ch, dest->quote); - } else { - if (m==2) { /* unquoted IFS */ - done_word(dest, ctx); - /* 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"); - return 0; + continue; + } + if (m == 2) { /* unquoted IFS */ + if (done_word(dest, ctx)) { + return 1; } -#if 0 - if (ch=='\n') { - /* Yahoo! Time to run with it! */ + /* 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); - run_list(ctx->list_head); - initialize_context(ctx); - } -#endif - if (m!=2) switch (ch) { + } + if (ch == end_trigger && !dest->quote && ctx->w == RES_NONE) { + debug_printf("leaving parse_stream (triggered)\n"); + return 0; + } + if (m == 2) + continue; + switch (ch) { case '#': if (dest->length == 0 && !dest->quote) { - while(ch=b_peek(input),ch!=EOF && ch!='\n') { b_getch(input); } + while (1) { + ch = b_peek(input); + if (ch == EOF || ch == '\n') + break; + b_getch(input); + } } else { b_addqchr(dest, ch, dest->quote); } @@ -2356,14 +2479,17 @@ int parse_stream(o_string *dest, struct p_context *ctx, b_addqchr(dest, b_getch(input), dest->quote); break; case '$': - if (handle_dollar(dest, ctx, input)!=0) return 1; + if (handle_dollar(dest, ctx, input) != 0) return 1; break; case '\'': dest->nonnull = 1; - while(ch=b_getch(input),ch!=EOF && ch!='\'') { + while (1) { + ch = b_getch(input); + if (ch == EOF || ch == '\'') + break; b_addchr(dest,ch); } - if (ch==EOF) { + if (ch == EOF) { syntax(); return 1; } @@ -2378,9 +2504,9 @@ int parse_stream(o_string *dest, struct p_context *ctx, case '>': redir_fd = redirect_opt_num(dest); done_word(dest, ctx); - redir_style=REDIRECT_OVERWRITE; + redir_style = REDIRECT_OVERWRITE; if (next == '>') { - redir_style=REDIRECT_APPEND; + redir_style = REDIRECT_APPEND; b_getch(input); } else if (next == '(') { syntax(); /* until we support >(list) Process Substitution */ @@ -2391,12 +2517,12 @@ int parse_stream(o_string *dest, struct p_context *ctx, case '<': redir_fd = redirect_opt_num(dest); done_word(dest, ctx); - redir_style=REDIRECT_INPUT; + redir_style = REDIRECT_INPUT; if (next == '<') { - redir_style=REDIRECT_HEREIS; + redir_style = REDIRECT_HEREIS; b_getch(input); } else if (next == '>') { - redir_style=REDIRECT_IO; + redir_style = REDIRECT_IO; b_getch(input); } else if (next == '(') { syntax(); /* until we support <(list) Process Substitution */ @@ -2410,7 +2536,7 @@ int parse_stream(o_string *dest, struct p_context *ctx, break; case '&': done_word(dest, ctx); - if (next=='&') { + if (next == '&') { b_getch(input); done_pipe(ctx,PIPE_AND); } else { @@ -2419,7 +2545,7 @@ int parse_stream(o_string *dest, struct p_context *ctx, break; case '|': done_word(dest, ctx); - if (next=='|') { + if (next == '|') { b_getch(input); done_pipe(ctx,PIPE_OR); } else { @@ -2431,79 +2557,96 @@ int parse_stream(o_string *dest, struct p_context *ctx, break; case '(': case '{': - if (parse_group(dest, ctx, input, ch)!=0) return 1; + if (parse_group(dest, ctx, input, ch) != 0) + return 1; break; case ')': case '}': syntax(); /* Proper use of this character caught by end_trigger */ return 1; - break; default: syntax(); /* this is really an internal logic error */ return 1; - } } } /* 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 char *set, int code) { const unsigned char *s; - for (s=set; *s; s++) map[*s] = code; + for (s = (const unsigned char *)set; *s; s++) map[(int)*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"); - if (ifs == NULL) ifs=" \t\n"; + if (ifs == NULL) ifs = " \t\n"; /* Precompute a list of 'flow through' behavior so it can be treated * quickly up front. Computation is necessary because of IFS. * Special case handling of IFS == " \t\n" is not implemented. * The map[] array only really needs two bits each, and on most machines * that would be faster because of the reduced L1 cache footprint. */ - 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 */ + 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; + o_string temp = NULL_O_STRING; int rcode; do { + ctx.type = flag; initialize_context(&ctx); update_ifs_map(); - inp->promptmode=1; + 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) @@ -2511,96 +2654,99 @@ 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; } - -/* I think Erik wrote this. It looks imperfect at best */ -void grab_tty_control(void) +/* 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) { - pid_t initialpgrp; - do { - initialpgrp = tcgetpgrp(fileno(stderr)); - if (initialpgrp < 0) { - error_msg("sh: can't access tty; job control disabled\n"); - } - if (initialpgrp == -1) - initialpgrp = getpgrp(); - else if (initialpgrp != getpgrp()) { - killpg(initialpgrp, SIGTTIN); - continue; - } - } while (0); + 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 shell_main(int argc, char **argv) +int hush_main(int argc, char **argv); +int hush_main(int argc, char **argv) { int opt; FILE *input; - struct jobset joblist_end = { NULL, NULL }; char **e = environ; +#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 shell_main() ends up calling - * shell_main(), therefore we cannot rely on the BSS to zero out this + + /* (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; - memset(map,0,sizeof(map)); + /* 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; /* Initialize some more globals to non-zero values */ set_cwd(); - job_list = &joblist_end; -#ifdef BB_FEATURE_COMMAND_EDITING - cmdedit_set_initial_prompt(); -#else - PS1 = NULL; -#endif + if (ENABLE_FEATURE_EDITING) + cmdedit_set_initial_prompt(); + else PS1 = NULL; PS2 = "> "; - /* initialize our shell local variables with the values + /* 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 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 */ - /* don't pay any attention to this signal; it just confuses - things and isn't really meant for shells anyway */ - signal(SIGTTOU, SIG_IGN); - setpgid(0, getpid()); - tcsetpgrp(fileno(stderr), getpid()); + last_return_code = EXIT_SUCCESS; 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; - + 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; @@ -2616,7 +2762,7 @@ int shell_main(int argc, char **argv) " or: sh -c command [args]...\n\n"); exit(EXIT_FAILURE); #else - show_usage(); + bb_show_usage(); #endif } } @@ -2627,32 +2773,156 @@ int shell_main(int argc, char **argv) * standard input is a terminal * 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))) { + if (argv[optind] == NULL && input == stdin + && 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"); - grab_tty_control(); +#if !ENABLE_FEATURE_SH_EXTRA_QUIET + printf( "\n\n%s hush - the humble shell v0.01 (testing)\n", + BB_BANNER); + 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); + + if (argv[optind] == NULL) { + opt = parse_file_outer(stdin); goto final_return; } debug_printf("\nrunning script '%s'\n", argv[optind]); - global_argv = argv+optind; - global_argc = argc-optind; + global_argv = argv + optind; + global_argc = argc - optind; input = xfopen(argv[optind], "r"); opt = parse_file_outer(input); -#ifdef BB_FEATURE_CLEAN_UP - fclose(input.file); +#if ENABLE_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((char*)cur->name); + free((char*)cur->value); + free(cur); + } + } + } #endif final_return: - return(opt?opt:last_return_code); + 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, *res_str = NULL; + const char *p1; + + while ((p = strchr(inp, SPECIAL_VAR_SYMBOL))) { + if (p != inp) { + len = p - inp; + res_str = xrealloc(res_str, (res_str_len + len)); + strncpy((res_str + res_str_len), inp, len); + res_str_len += len; + } + inp = ++p; + p = strchr(inp, SPECIAL_VAR_SYMBOL); + *p = '\0'; + p1 = lookup_param(inp); + if (p1) { + len = res_str_len + strlen(p1); + res_str = xrealloc(res_str, (1 + len)); + strcpy((res_str + res_str_len), p1); + res_str_len = len; + } + *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; }