From 88621d73980a3cb53c1f35e64a06d7cd64188987 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Tue, 29 Aug 2006 19:41:06 +0000
Subject: Svn 16007 broke the build under gcc 4.0.3. This fixes up some of the
damage (the e2fsprogs directory is too twisty and evil to easily fix, but I
plan to rewrite it anyway so I'll just bump that up in priority a bit).
---
shell/ash.c | 89 +++++++++++++++++++++------------------------------------
shell/cmdedit.c | 4 +--
shell/hush.c | 42 ++++++++++++---------------
3 files changed, 53 insertions(+), 82 deletions(-)
(limited to 'shell')
diff --git a/shell/ash.c b/shell/ash.c
index c1b2b0ed6..754c1d72b 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -1591,7 +1591,7 @@ static int varcmp(const char *, const char *);
static struct var **hashvar(const char *);
-static inline int varequal(const char *a, const char *b) {
+static int varequal(const char *a, const char *b) {
return !varcmp(a, b);
}
@@ -1649,8 +1649,7 @@ static void out2str(const char *p)
* This routine initializes the builtin variables.
*/
-static inline void
-initvar(void)
+static void initvar(void)
{
struct var *vp;
struct var *end;
@@ -1674,8 +1673,7 @@ initvar(void)
} while (++vp < end);
}
-static inline void
-init(void)
+static void init(void)
{
/* from input.c: */
@@ -1860,7 +1858,7 @@ static char *stnputs(const char *, size_t, char *);
static char *stputs(const char *, char *);
-static inline char *_STPUTC(int c, char *p) {
+static char *_STPUTC(int c, char *p) {
if (p == sstrend)
p = growstackstr();
*p++ = c;
@@ -2354,8 +2352,7 @@ out:
* cd command.
*/
-static inline const char *
-updatepwd(const char *dir)
+static const char * updatepwd(const char *dir)
{
char *new;
char *p;
@@ -2444,8 +2441,7 @@ out:
* Find out what the current directory is. If we already know the current
* directory, this routine returns immediately.
*/
-static inline char *
-getpwd(void)
+static char * getpwd(void)
{
char *dir = getcwd(0, 0);
return dir ? dir : nullstr;
@@ -3167,8 +3163,7 @@ out:
}
#ifdef CONFIG_ASH_CMDCMD
-static inline char **
-parse_command_args(char **argv, const char **path)
+static char ** parse_command_args(char **argv, const char **path)
{
char *cp, c;
@@ -3199,8 +3194,7 @@ parse_command_args(char **argv, const char **path)
}
#endif
-static inline int
-isassignment(const char *p)
+static int isassignment(const char *p)
{
const char *q = endofname(p);
if (p == q)
@@ -3520,8 +3514,7 @@ funcdone:
}
-static inline int
-goodname(const char *p)
+static int goodname(const char *p)
{
return !*endofname(p);
}
@@ -4245,8 +4238,7 @@ delete_cmd_entry(void)
* the same name - except special builtins.
*/
-static inline void
-addcmdentry(char *name, struct cmdentry *entry)
+static void addcmdentry(char *name, struct cmdentry *entry)
{
struct tblentry *cmdp;
@@ -4263,8 +4255,7 @@ addcmdentry(char *name, struct cmdentry *entry)
* Make a copy of a parse tree.
*/
-static inline struct funcnode *
-copyfunc(union node *n)
+static struct funcnode * copyfunc(union node *n)
{
struct funcnode *f;
size_t blocksize;
@@ -4529,8 +4520,7 @@ static void varunset(const char *, const char *, const char *, int)
* Returns an stalloced string.
*/
-static inline char *
-preglob(const char *pattern, int quoted, int flag) {
+static char * preglob(const char *pattern, int quoted, int flag) {
flag |= RMESCAPE_GLOB;
if (quoted) {
flag |= RMESCAPE_QUOTED;
@@ -4554,8 +4544,7 @@ esclen(const char *start, const char *p) {
* Expand shell variables and backquotes inside a here document.
*/
-static inline void
-expandhere(union node *arg, int fd)
+static void expandhere(union node *arg, int fd)
{
herefd = fd;
expandarg(arg, (struct arglist *)NULL, 0);
@@ -5783,8 +5772,7 @@ msort(struct strlist *list, int len)
* Returns true if the pattern matches the string.
*/
-static inline int
-patmatch(char *pattern, const char *string)
+static int patmatch(char *pattern, const char *string)
{
return pmatch(preglob(pattern, 0, 0), string);
}
@@ -5967,7 +5955,7 @@ static int pgetc2(void)
return c;
}
#else
-static inline int pgetc2(void)
+static int pgetc2(void)
{
return pgetc_macro();
}
@@ -5977,8 +5965,7 @@ static inline int pgetc2(void)
* Read a line from the script.
*/
-static inline char *
-pfgets(char *line, int len)
+static char * pfgets(char *line, int len)
{
char *p = line;
int nleft = len;
@@ -6007,7 +5994,7 @@ static char *cmdedit_prompt;
#else
static const char *cmdedit_prompt;
#endif
-static inline void putprompt(const char *s)
+static void putprompt(const char *s)
{
#ifdef CONFIG_ASH_EXPAND_PRMT
free(cmdedit_prompt);
@@ -6017,14 +6004,13 @@ static inline void putprompt(const char *s)
#endif
}
#else
-static inline void putprompt(const char *s)
+static void putprompt(const char *s)
{
out2str(s);
}
#endif
-static inline int
-preadfd(void)
+static int preadfd(void)
{
int nr;
char *buf = parsefile->buf;
@@ -7120,8 +7106,7 @@ growjobtab(void)
* Called with interrupts off.
*/
-static inline void
-forkchild(struct job *jp, union node *n, int mode)
+static void forkchild(struct job *jp, union node *n, int mode)
{
int oldlvl;
@@ -7168,8 +7153,7 @@ forkchild(struct job *jp, union node *n, int mode)
jobless = 0;
}
-static inline void
-forkparent(struct job *jp, union node *n, int mode, pid_t pid)
+static void forkparent(struct job *jp, union node *n, int mode, pid_t pid)
{
TRACE(("In parent shell: child = %d\n", pid));
if (!jp) {
@@ -7306,8 +7290,7 @@ waitforjob(struct job *jp)
* and the jobs command may give out of date information.
*/
-static inline int
-waitproc(int block, int *status)
+static int waitproc(int block, int *status)
{
int flags = 0;
@@ -8071,8 +8054,7 @@ readcmdfile(char *name)
* search for the file, which is necessary to find sub-commands.
*/
-static inline char *
-find_dot_file(char *name)
+static char * find_dot_file(char *name)
{
char *fullname;
const char *path = pathval();
@@ -8347,8 +8329,7 @@ growstackblock(void)
}
}
-static inline void
-grabstackblock(size_t len)
+static void grabstackblock(size_t len)
{
len = SHELL_ALIGN(len);
stacknxt += len;
@@ -8830,8 +8811,7 @@ optschanged(void)
setvimode(viflag);
}
-static inline void
-minus_o(char *name, int val)
+static void minus_o(char *name, int val)
{
int i;
@@ -10902,8 +10882,7 @@ static const char *const *findkwd(const char *s)
* Open a file in noclobber mode.
* The code was copied from bash.
*/
-static inline int
-noclobberopen(const char *fname)
+static int noclobberopen(const char *fname)
{
int r, fd;
struct stat finfo, finfo2;
@@ -10962,8 +10941,7 @@ noclobberopen(const char *fname)
* the pipe without forking.
*/
-static inline int
-openhere(union node *redir)
+static int openhere(union node *redir)
{
int pip[2];
size_t len = 0;
@@ -11055,8 +11033,7 @@ eopen:
sh_error("cannot open %s: %s", fname, errmsg(errno, E_OPEN));
}
-static inline void
-dupredirect(union node *redir, int f)
+static void dupredirect(union node *redir, int f)
{
int fd = redir->nfile.fd;
@@ -12231,8 +12208,7 @@ exportcmd(int argc, char **argv)
* "-" as a special case.
*/
-static inline void
-mklocal(char *name)
+static void mklocal(char *name)
{
struct localvar *lvp;
struct var **vpp;
@@ -13186,7 +13162,7 @@ typedef unsigned char operator;
#define NUMPTR (*numstackptr)
-static inline int tok_have_assign(operator op)
+static int tok_have_assign(operator op)
{
operator prec = PREC(op);
@@ -13195,7 +13171,7 @@ static inline int tok_have_assign(operator op)
prec == PREC_PRE || prec == PREC_POST);
}
-static inline int is_right_associativity(operator prec)
+static int is_right_associativity(operator prec)
{
return (prec == PREC(TOK_ASSIGN) || prec == PREC(TOK_EXPONENT) ||
prec == PREC(TOK_CONDITIONAL));
@@ -13258,8 +13234,7 @@ static int arith_lookup_val(v_n_t *t)
/* "applying" a token means performing it on the top elements on the integer
* stack. For a unary operator it will only change the top element, but a
* binary operator will pop two arguments and push a result */
-static inline int
-arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr)
+static int arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr)
{
v_n_t *numptr_m1;
arith_t numptr_val, rez;
diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index 03aaa3b2e..fb1946e83 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -247,13 +247,13 @@ static void goto_new_line(void)
}
-static inline void out1str(const char *s)
+static void out1str(const char *s)
{
if ( s )
fputs(s, stdout);
}
-static inline void beep(void)
+static void beep(void)
{
putchar('\007');
}
diff --git a/shell/hush.c b/shell/hush.c
index 8df91a1e8..230b0fb69 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -285,7 +285,7 @@ struct built_in_command {
};
/* belongs in busybox.h */
-static inline int max(int a, int b) {
+static int max(int a, int b) {
return (a>b)?a:b;
}
@@ -298,8 +298,14 @@ 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 ATTRIBUTE_UNUSED, ...) { }
+#define debug_printf(...) do {;} while(0);
#endif
#define final_printf debug_printf
@@ -345,7 +351,6 @@ static void mark_open(int fd);
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: */
@@ -847,7 +852,7 @@ 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 CONFIG_FEATURE_SH_FANCY_PROMPT
PS1 = NULL;
@@ -858,7 +863,7 @@ static inline void cmdedit_set_initial_prompt(void)
#endif
}
-static inline void setup_prompt_string(int promptmode, char **prompt_str)
+static void setup_prompt_string(int promptmode, char **prompt_str)
{
debug_printf("setup_prompt_string %d ",promptmode);
#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
@@ -1591,13 +1596,6 @@ static int run_list_real(struct pipe *pi)
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)
{
@@ -1605,29 +1603,28 @@ static int free_pipe(struct pipe *pi, int indent)
struct child_prog *child;
struct redir_struct *r, *rnext;
int a, i, ret_code=0;
- char *ind = indenter(indent);
if (pi->stopped_progs > 0)
return ret_code;
- final_printf("%s run pipe: (pid %d)\n",ind,getpid());
+ 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);
+ final_printf("%s argv[%d] = %s\n",indenter(indent),a,*p);
}
globfree(&child->glob_result);
child->argv=NULL;
} else if (child->group) {
- final_printf("%s begin group (subshell:%d)\n",ind, child->subshell);
+ 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",ind);
+ 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);
+ 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) {
@@ -1651,11 +1648,10 @@ static int free_pipe_list(struct pipe *head, int indent)
{
int rcode=0; /* if list has no members */
struct pipe *pi, *next;
- char *ind = indenter(indent);
for (pi=head; pi; pi=next) {
- final_printf("%s pipe reserved mode %d\n", ind, pi->r_mode);
+ 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);
+ final_printf("%s pipe followup code %d\n", indenter(indent), pi->followup);
next=pi->next;
pi->next=NULL;
free(pi);
--
cgit v1.2.3-55-g6feb