* 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 <ctype.h> /* isalpha, isdigit */
-#include <unistd.h> /* getpid */
-#include <stdlib.h> /* getenv, atoi */
-#include <string.h> /* strchr */
-#include <stdio.h> /* popen etc. */
+
+#include "busybox.h"
#include <glob.h> /* glob, of course */
-#include <stdarg.h> /* va_list */
-#include <errno.h>
-#include <fcntl.h>
#include <getopt.h> /* should be pretty obvious */
-#include <sys/stat.h> /* ulimit */
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
+//#include <sys/wait.h>
+//#include <signal.h>
/* #include <dmalloc.h> */
/* #define DEBUG_SHELL */
-#if 1
-#include "busybox.h"
-#include "cmdedit.h"
-#else
-#define bb_applet_name "hush"
-#include "standalone.h"
-#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 */
/* 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, ">" },
struct pipe *pipe;
struct redir_struct *pending_redirect;
reserved_style w;
- int old_flag; /* for figuring out valid reserved words */
+ int old_flag; /* for figuring out valid reserved words */
struct p_context *stack;
- int type; /* define type of parser : ";$" common or special symbol */
+ int type; /* define type of parser : ";$" common or special symbol */
/* How about quoting status? */
};
struct redir_struct {
- redir_type type; /* type of redirection */
- int fd; /* file descriptor being redirected */
- int dup; /* -1, or file descriptor being duplicated */
- struct redir_struct *next; /* pointer to the next redirect in the list */
- glob_t word; /* *word.gl_pathv is the filename */
+ redir_type type; /* type of redirection */
+ int fd; /* file descriptor being redirected */
+ int dup; /* -1, or file descriptor being duplicated */
+ struct redir_struct *next; /* pointer to the next redirect in the list */
+ glob_t word; /* *word.gl_pathv is the filename */
};
struct child_prog {
- pid_t pid; /* 0 if exited */
- char **argv; /* program name and arguments */
- struct pipe *group; /* if non-NULL, first in group or subshell */
- int subshell; /* flag, non-zero if group must be forked */
- struct redir_struct *redirects; /* I/O redirections */
- glob_t glob_result; /* result of parameter globbing */
- int is_stopped; /* is the program currently running? */
- struct pipe *family; /* pointer back to the child's parent pipe */
- int sp; /* number of SPECIAL_VAR_SYMBOL */
+ pid_t pid; /* 0 if exited */
+ char **argv; /* program name and arguments */
+ struct pipe *group; /* if non-NULL, first in group or subshell */
+ int subshell; /* flag, non-zero if group must be forked */
+ struct redir_struct *redirects; /* I/O redirections */
+ glob_t glob_result; /* result of parameter globbing */
+ int is_stopped; /* is the program currently running? */
+ struct pipe *family; /* pointer back to the child's parent pipe */
+ int sp; /* number of SPECIAL_VAR_SYMBOL */
int type;
};
struct pipe {
- int jobid; /* job number */
- int num_progs; /* total number of programs in job */
- int running_progs; /* number of programs running */
- char *text; /* name of job */
- char *cmdbuf; /* buffer various argv's point into */
- pid_t pgrp; /* process group ID for the job */
- struct child_prog *progs; /* array of commands in pipe */
- struct pipe *next; /* to track background commands */
- int stopped_progs; /* number of programs alive, but stopped */
- int job_context; /* bitmask defining current context */
- pipe_style followup; /* PIPE_BG, PIPE_SEQ, PIPE_OR, PIPE_AND */
- reserved_style r_mode; /* supports if, for, while, until */
+ int jobid; /* job number */
+ int num_progs; /* total number of programs in job */
+ int running_progs; /* number of programs running */
+ char *text; /* name of job */
+ char *cmdbuf; /* buffer various argv's point into */
+ pid_t pgrp; /* process group ID for the job */
+ struct child_prog *progs; /* array of commands in pipe */
+ struct pipe *next; /* to track background commands */
+ int stopped_progs; /* number of programs alive, but stopped */
+ int job_context; /* bitmask defining current context */
+ pipe_style followup; /* PIPE_BG, PIPE_SEQ, PIPE_OR, PIPE_AND */
+ reserved_style r_mode; /* supports if, for, while, until */
};
struct close_me {
};
struct variables {
- char *name;
- char *value;
+ const char *name;
+ const char *value;
int flg_export;
int flg_read_only;
struct variables *next;
/* globals, connect us to the outside world
* the first three support $?, $#, and $1 */
-char **global_argv;
-unsigned int global_argc;
-unsigned int last_return_code;
+static char **global_argv;
+static int global_argc;
+static int last_return_code;
extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */
/* "globals" within this file */
-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 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;
-struct variables shell_ver = { "HUSH_VERSION", "0.01", 1, 1, 0 };
-struct variables *top_vars = &shell_ver;
+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 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;
}
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) {
+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 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);
static void mark_closed(int fd);
static void close_all(void);
/* "run" the final data structures: */
-static char *indenter(int i);
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 run_list_real(struct pipe *pi);
-static void pseudo_exec(struct child_prog *child) __attribute__ ((noreturn));
+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);
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 char *lookup_param(char *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);
/* 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 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_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 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==bb_msg_unknown)
- cwd = NULL; /* xgetcwd(arg) called free(arg) */
- cwd = xgetcwd((char *)cwd);
+ if (cwd == bb_msg_unknown)
+ cwd = NULL; /* xrealloc_getcwd_or_warn(arg) calls free(arg)! */
+ cwd = xrealloc_getcwd_or_warn((char *)cwd);
if (!cwd)
cwd = bb_msg_unknown;
return cwd;
}
/* 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;
}
{
if (child->argv[1] == NULL)
exit(last_return_code);
- exit (atoi(child->argv[1]));
+ exit(atoi(child->argv[1]));
}
/* built-in 'export VAR=value' handler */
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;
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);
}
}
}
- if (res<0)
+ if (res < 0)
bb_perror_msg("export");
- else if(res==0)
+ else if (res == 0)
res = set_local_var(name, 1);
else
res = 0;
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;
for (i = 0; i < pi->num_progs; i++)
pi->progs[i].is_stopped = 0;
- if ( (i=kill(- pi->pgrp, SIGCONT)) < 0) {
+ i = kill(- pi->pgrp, SIGCONT);
+ if (i < 0) {
if (i == ESRCH) {
remove_bg_job(pi);
} else {
}
/* 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);
}
}
/* 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; job; job = job->next) {
if (job->running_progs == job->stopped_progs)
/* 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;
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 */
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<global_argc) {
+ if (n >= 0 && n < global_argc) {
/* XXX This probably breaks $0 */
global_argc -= n;
global_argv += n;
/* XXX search through $PATH is missing */
input = fopen(child->argv[1], "r");
if (!input) {
- bb_error_msg("Couldn't open file '%s'", child->argv[1]);
+ bb_error_msg("cannot open '%s'", child->argv[1]);
return EXIT_FAILURE;
}
status = parse_file_outer(input);
mark_closed(fileno(input));
fclose(input);
- return (status);
+ return status;
}
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;
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;
}
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';
{
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)
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;
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;
}
return *i->p;
}
-static inline void cmdedit_set_initial_prompt(void)
+static void cmdedit_set_initial_prompt(void)
{
-#ifndef CONFIG_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
}
-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 CONFIG_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) {
- 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==1)? 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 CONFIG_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);
+ 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;
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) {
- while(! i->p || (interactive && strlen(i->p)==0) ) {
+ while (!i->p || !(interactive && strlen(i->p))) {
get_user_input(i);
}
- i->promptmode=2;
+ i->promptmode = 2;
i->__promptme = 0;
if (i->p && *i->p) {
- ch=*i->p++;
+ ch = *i->p++;
}
} else {
ch = fgetc(i->file);
debug_printf("b_getch: got a %d\n", ch);
}
- if (ch == '\n') i->__promptme=1;
+ if (ch == '\n')
+ i->__promptme = 1;
return ch;
}
{
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;
}
{
i->peek = static_peek;
i->get = static_get;
- i->__promptme=1;
- i->promptmode=1;
+ i->__promptme = 1;
+ i->promptmode = 1;
i->p = s;
}
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;
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;
- openfd = open(redir->word.gl_pathv[0], mode, 0666);
+ mode = redir_table[redir->type].mode;
+ openfd = open3_or_warn(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!) */
- bb_perror_msg("error opening %s", redir->word.gl_pathv[0]);
return 1;
}
} else {
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
{
int i, rcode;
char *p;
- struct built_in_command *x;
+ 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]);
+ 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);
+ 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,
* if this is one of those cases.
*/
for (x = bltins; x->cmd; x++) {
- if (strcmp(child->argv[0], x->cmd) == 0 ) {
+ if (strcmp(child->argv[0], x->cmd) == 0) {
debug_printf("builtin exec %s\n", child->argv[0]);
rcode = x->function(child);
fflush(stdout);
* 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 CONFIG_FEATURE_SH_STANDALONE_SHELL
+#if ENABLE_FEATURE_SH_STANDALONE
{
int argc_l;
- char** argv_l=child->argv;
+ char** argv_l = child->argv;
char *name = child->argv[0];
-#ifdef CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN
- /* Following discussions from November 2000 on the busybox mailing
- * list, the default configuration, (without
- * bb_get_last_path_component()) lets the user force use of an
- * external command by specifying the full (with slashes) filename.
- * If you enable CONFIG_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 = bb_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;
+ for (argc_l = 0; *argv_l; argv_l++, argc_l++)
+ continue;
debug_printf("running applet %s\n", name);
- run_applet_by_name(name, argc_l, child->argv);
+ run_applet_and_exit(name, argc_l, child->argv);
}
#endif
- debug_printf("exec of %s\n",child->argv[0]);
- execvp(child->argv[0],child->argv);
- bb_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 free_pipe_list,
* since this process is about to exit */
if (!job_list) {
thejob = job_list = xmalloc(sizeof(*thejob));
} else {
- for (thejob = job_list; thejob->next; thejob = thejob->next) /* nothing */;
+ for (thejob = job_list; thejob->next; thejob = thejob->next)
+ /* nothing */;
thejob->next = xmalloc(sizeof(*thejob));
thejob = thejob->next;
}
//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
pid_t childpid;
attributes = WUNTRACED;
- if (fg_pipe==NULL) {
+ 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++) {
+ 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);
+ if (i == fg_pipe->num_progs-1)
+ rcode = WEXITSTATUS(status);
+ fg_pipe->num_progs--;
+ return rcode;
}
}
}
break;
}
- if(pi==NULL) {
- debug_printf("checkjobs: pid %d was not in our list!\n", childpid);
+ if (pi == NULL) {
+ debug_printf("checkjobs: pid %d was not in our list!\n",
+ childpid);
continue;
}
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 {
/* 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("\n"JOB_STATUS_FORMAT, pi->jobid, "Stopped", pi->text);
- }
-#endif
}
}
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, ...); */
-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;
-}
-
/* run_pipe_real() starts all the jobs, but doesn't wait for anything
* to finish. See checkjobs().
*
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;
nextin = 0;
* 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) child = & (pi->progs[0]);
+ child = &(pi->progs[0]);
if (pi->num_progs == 1 && child->group && child->subshell == 0) {
- int squirrel[] = {-1, -1, -1};
+ int squirrel[] = { -1, -1, -1 };
int rcode;
debug_printf("non-subshell grouping\n");
setup_redirects(child, squirrel);
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) {
+ 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++) {
-
+ 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;
+ int export_me = 0;
char *name, *value;
- name = bb_xstrdup(child->argv[i]);
+ 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;
+ *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);
+ if (p != child->argv[i])
+ free(p);
}
return EXIT_SUCCESS; /* don't worry about errors in set_local_var() yet */
}
}
}
if (child->sp) {
- char * str = NULL;
+ char *str = NULL;
str = make_string((child->argv + i));
parse_string_outer(str, FLAG_EXIT_FROM_LOOP | FLAG_REPARSING);
return last_return_code;
}
for (x = bltins; x->cmd; x++) {
- if (strcmp(child->argv[i], x->cmd) == 0 ) {
- int squirrel[] = {-1, -1, -1};
+ if (strcmp(child->argv[i], x->cmd) == 0) {
+ 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;
* Is it really safe for inline use? Experimentally,
* things seem to work with glibc. */
setup_redirects(child, squirrel);
- 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;
}
}
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) bb_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 !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
- if (!(child->pid = fork()))
+#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
+ child->pid = fork();
#else
- if (!(child->pid = vfork()))
+ 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);
dup2(nextout, 1);
close(nextout);
}
- if (pipefds[0]!=-1) {
+ if (pipefds[0] != -1) {
close(pipefds[0]); /* opposite end of our output pipe */
}
* 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) {
pseudo_exec(child);
}
-
/* put our child in the process group whose leader is the
first process in this pipe */
if (pi->pgrp < 0) {
struct pipe *rpipe;
int flag_rep = 0;
int save_num_progs;
- int rcode=0, flag_skip=1;
+ 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;
+ 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->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;
+ 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;
- }
+ 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);
+ 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;
+ 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_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;
+ if (!pi->next->progs->argv)
+ continue;
/* create list of variable values */
list = make_list_in(pi->next->progs->argv,
- pi->progs->argv[0]);
+ pi->progs->argv[0]);
save_list = list;
save_name = pi->progs->argv[0];
pi->progs->argv[0] = NULL;
flag_rep = 1;
}
- if (!(*list)) {
+ 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];
+ 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];
+ pi->progs->glob_result.gl_pathv[0] = pi->progs->argv[0];
}
}
- if (rmode == RES_IN) continue;
+ if (rmode == RES_IN)
+ continue;
if (rmode == RES_DO) {
- if (!flag_rep) continue;
- }
+ if (!flag_rep)
+ continue;
+ }
if ((rmode == RES_DONE)) {
if (flag_rep) {
flag_restore = 1;
rpipe = NULL;
}
}
- if (pi->num_progs == 0) continue;
+ 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) {
+ 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? */
}
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 */
+ 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;
+ if ((rcode == EXIT_SUCCESS && pi->followup == PIPE_OR)
+ || (rcode != EXIT_SUCCESS && pi->followup == PIPE_AND)
+ ) {
+ skip_more_in_this_rmode = rmode;
+ }
checkjobs(NULL);
}
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 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);
+ int a, i, ret_code = 0;
if (pi->stopped_progs > 0)
return ret_code;
- final_printf("%s run pipe: (pid %d)\n",ind,getpid());
- for (i=0; i<pi->num_progs; i++) {
+ 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 = free_pipe_list(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) {
/* guard against the case >$FOO, where foo is unset or blank */
if (r->word.gl_pathv) {
} 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 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) {
- final_printf("%s pipe reserved mode %d\n", ind, pi->r_mode);
+ 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", ind, pi->followup);
- next=pi->next;
- pi->next=NULL;
+ final_printf("%s pipe followup code %d\n", indenter(indent), pi->followup);
+ next = pi->next;
+ pi->next = NULL;
free(pi);
}
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);
}
/* free_pipe_list has the side effect of clearing memory
*/
static int globhack(const char *src, int flags, glob_t *pglob)
{
- int cnt=0, pathc;
+ int cnt = 0, pathc;
const char *s;
char *dest;
- for (cnt=1, s=src; s && *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; 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;
}
{
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; i<pglob->gl_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)
bb_error_msg_and_die("out of memory during glob");
if (gr != 0) { /* GLOB_ABORTED ? */
- bb_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;
- 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' */
value = strchr(name, '=');
- if (value==0 && ++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)
+ 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;
+ 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) {
+ 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);
+ 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) {
+ if (!cur) {
result = -1;
} else {
cur->name = strdup(name);
- if(cur->name == 0) {
+ if (cur->name) {
free(cur);
result = -1;
} else {
cur->next = 0;
cur->flg_export = flg_export;
cur->flg_read_only = 0;
- while(bottom->next) bottom=bottom->next;
+ 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;
}
return result;
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) {
+ 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);
}
}
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
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->word.gl_pathv=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);
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->old_flag=0;
+ 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 */
}
* 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;
};
* 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 },
{ "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)
- r<reserved_list+NRES; r++) {
+ const struct reserved_combo *r;
+#define NRES sizeof(reserved_list)/sizeof(reserved_list[0])
+
+ for (r = reserved_list; r < reserved_list+NRES; r++) {
if (strcmp(dest->data, r->literal) == 0) {
debug_printf("found reserved word %s, code %d\n",r->literal,r->code);
if (r->flag & FLAG_START) {
}
*new = *ctx; /* physical copy */
initialize_context(ctx);
- ctx->stack=new;
- } else if ( ctx->w == RES_NONE || ! (ctx->old_flag & (1<<r->code))) {
+ ctx->stack = new;
+ } else if (ctx->w == RES_NONE || !(ctx->old_flag & (1 << r->code))) {
syntax();
ctx->w = RES_SNTX;
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;
*ctx = *old; /* physical copy */
free(old);
}
- b_reset (dest);
+ b_reset(dest);
return 1;
}
}
* 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;
}
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) {
bb_error_msg("ambiguous redirect");
return 1;
* 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
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;
*/
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);
}
{
int num;
- if (o->length==0) return -1;
- for(num=0; num<o->length; 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) bb_perror_msg_and_die("pipe");
-#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
- pid=fork();
+ if (pipe(channel) < 0) bb_perror_msg_and_die("pipe");
+#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
+ pid = fork();
#else
- pid=vfork();
+ pid = vfork();
#endif
- if (pid<0) {
+ if (pid < 0) {
bb_perror_msg_and_die("fork");
- } else if (pid==0) {
+ } 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
- free_pipe_list(head,0);
- pf=popen("echo surrogate response","r");
- debug_printf("started fake pipe on FILE *%p\n",pf);
-#endif
return pf;
}
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;
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);
/* 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");
* 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 */
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) {
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;
/* basically useful version until someone wants to get fancier,
* see the bash man page under "Parameter Expansion" */
-static char *lookup_param(char *src)
+static const char *lookup_param(const char *src)
{
- char *p=NULL;
+ const char *p = NULL;
if (src) {
p = getenv(src);
if (!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;
- 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)) {
b_addchr(dest, SPECIAL_VAR_SYMBOL);
ctx->child->sp++;
- while(ch=b_peek(input),isalnum(ch) || ch=='_') {
+ while (ch = b_peek(input),isalnum(ch) || ch == '_') {
b_getch(input);
b_addchr(dest,ch);
}
b_addchr(dest, SPECIAL_VAR_SYMBOL);
} else if (isdigit(ch)) {
i = ch-'0'; /* XXX is $0 special? */
- if (i<global_argc) {
+ if (i < global_argc) {
parse_string(dest, ctx, global_argv[i]); /* recursion */
}
advance = 1;
ctx->child->sp++;
b_getch(input);
/* XXX maybe someone will try to escape the '}' */
- 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 != '}') {
process_command_subs(dest, ctx, input, ')');
break;
case '*':
- sep[0]=ifs[0];
- for (i=1; i<global_argc; i++) {
+ sep[0] = ifs[0];
+ for (i = 1; i < global_argc; i++) {
parse_string(dest, ctx, global_argv[i]);
- if (i+1 < global_argc) parse_string(dest, ctx, sep);
+ if (i+1 < global_argc)
+ parse_string(dest, ctx, sep);
}
break;
case '@':
int parse_stream(o_string *dest, struct p_context *ctx,
struct in_str *input, int end_trigger)
{
- unsigned int ch, m;
+ int ch, m;
int redir_fd;
redir_type redir_style;
int next;
* found. When recursing, quote state is passed in via dest->quote. */
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 */
- 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 (triggered)\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);
}
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;
}
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 */
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 */
break;
case '&':
done_word(dest, ctx);
- if (next=='&') {
+ if (next == '&') {
b_getch(input);
done_pipe(ctx,PIPE_AND);
} else {
break;
case '|':
done_word(dest, ctx);
- if (next=='|') {
+ if (next == '|') {
b_getch(input);
done_pipe(ctx,PIPE_OR);
} else {
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
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 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();
if (!(flag & FLAG_PARSE_SEMICOLON) || (flag & FLAG_REPARSING)) mapset(";$&|", 0);
- inp->promptmode=1;
+ inp->promptmode = 1;
rcode = parse_stream(&temp, &ctx, inp, '\n');
if (rcode != 1 && ctx.old_flag != 0) {
syntax();
static pid_t shell_pgrp;
/* Loop until we are in the foreground. */
while (tcgetpgrp (shell_terminal) != (shell_pgrp = getpgrp ()))
- kill (- shell_pgrp, SIGTTIN);
+ kill(- shell_pgrp, SIGTTIN);
/* Ignore interactive and job-control signals. */
signal(SIGINT, SIG_IGN);
/* Put ourselves in our own process group. */
setsid();
- shell_pgrp = getpid ();
- setpgid (shell_pgrp, shell_pgrp);
+ 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 hush_main(int argc, char **argv)
{
int opt;
FILE *input;
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;
/* Initialize some more globals to non-zero values */
set_cwd();
-#ifdef CONFIG_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
set_local_var(*e, 2); /* without call putenv() */
}
- last_return_code=EXIT_SUCCESS;
-
+ last_return_code = EXIT_SUCCESS;
if (argv[0] && argv[0][0] == '-') {
debug_printf("\nsourcing /etc/profile\n");
fclose(input);
}
}
- input=stdin;
+ input = stdin;
while ((opt = getopt(argc, argv, "c:xif")) > 0) {
switch (opt) {
* 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 */
-#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET
- printf( "\n\n" BB_BANNER " hush - the humble shell v0.01 (testing)\n");
+#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;
- input = bb_xfopen(argv[optind], "r");
+ global_argv = argv + optind;
+ global_argc = argc - optind;
+ input = xfopen(argv[optind], "r");
opt = parse_file_outer(input);
-#ifdef CONFIG_FEATURE_CLEAN_UP
+#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) {
+ for (cur = top_vars; cur; cur = tmp) {
tmp = cur->next;
if (!cur->flg_read_only) {
- free(cur->name);
- free(cur->value);
+ 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, *p1, *res_str = NULL;
+ char *p, *res_str = NULL;
+ const char *p1;
while ((p = strchr(inp, SPECIAL_VAR_SYMBOL))) {
if (p != inp) {
inp = ++p;
p = strchr(inp, SPECIAL_VAR_SYMBOL);
*p = '\0';
- if ((p1 = lookup_param(inp))) {
+ 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);
}
/* Make new string for parser */
-static char * make_string(char ** inp)
+static char* make_string(char ** inp)
{
char *p;
char *str = NULL;
projects / oweals / busybox.git / blobdiff