aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-09-08 17:21:19 +0000
committerGravatar Rob Landley <rob@landley.net>2006-09-08 17:21:19 +0000
commitef08184d9e0c4217aa7aed1c604c68d2a66b90e5 (patch)
tree3b3156f5914b418483b5eedb132efa48c913ff1e /shell
parent3476ad651dc023a35abe87a49478d806dee22f97 (diff)
downloadbusybox-ef08184d9e0c4217aa7aed1c604c68d2a66b90e5.tar.gz
busybox-ef08184d9e0c4217aa7aed1c604c68d2a66b90e5.tar.bz2
Fix warnings.
Diffstat (limited to 'shell')
-rw-r--r--shell/bbsh.c30
1 files changed, 14 insertions, 16 deletions
diff --git a/shell/bbsh.c b/shell/bbsh.c
index 57a103bf8..2194bdad6 100644
--- a/shell/bbsh.c
+++ b/shell/bbsh.c
@@ -105,14 +105,14 @@ static char *parse_word(char *start, struct command **cmd)
// Parse a line of text into a pipeline.
// Returns a pointer to the next line.
-static char *parse_pipeline(char *cmdline, struct pipeline *pipe)
+static char *parse_pipeline(char *cmdline, struct pipeline *line)
{
- struct command **cmd = &(pipe->cmd);
- char *start = pipe->cmdline = cmdline;
+ struct command **cmd = &(line->cmd);
+ char *start = line->cmdline = cmdline;
if (!cmdline) return 0;
- if (ENABLE_BBSH_JOBCTL) pipe->cmdline = cmdline;
+ if (ENABLE_BBSH_JOBCTL) line->cmdline = cmdline;
// Parse command into argv[]
for (;;) {
@@ -121,7 +121,7 @@ static char *parse_pipeline(char *cmdline, struct pipeline *pipe)
// Skip leading whitespace and detect end of line.
while (isspace(*start)) start++;
if (!*start || *start=='#') {
- if (ENABLE_BBSH_JOBCTL) pipe->cmdlinelen = start-cmdline;
+ if (ENABLE_BBSH_JOBCTL) line->cmdlinelen = start-cmdline;
return 0;
}
@@ -145,15 +145,15 @@ static char *parse_pipeline(char *cmdline, struct pipeline *pipe)
start = end;
}
- if (ENABLE_BBSH_JOBCTL) pipe->cmdlinelen = start-cmdline;
+ if (ENABLE_BBSH_JOBCTL) line->cmdlinelen = start-cmdline;
return start;
}
// Execute the commands in a pipeline
-static int run_pipeline(struct pipeline *pipe)
+static int run_pipeline(struct pipeline *line)
{
- struct command *cmd = pipe->cmd;
+ struct command *cmd = line->cmd;
if (!cmd || !cmd->argc) return 0;
// Handle local commands. This is totally fake and plastic.
@@ -185,16 +185,16 @@ static void free_cmd(void *data)
static void handle(char *command)
{
- struct pipeline pipe;
+ struct pipeline line;
char *start = command;
for (;;) {
- memset(&pipe,0,sizeof(struct pipeline));
- start = parse_pipeline(start, &pipe);
- if (!pipe.cmd) break;
+ memset(&line,0,sizeof(struct pipeline));
+ start = parse_pipeline(start, &line);
+ if (!line.cmd) break;
- run_pipeline(&pipe);
- free_list(pipe.cmd, free_cmd);
+ run_pipeline(&line);
+ free_list(line.cmd, free_cmd);
}
}
@@ -210,8 +210,6 @@ int bbsh_main(int argc, char *argv[])
else {
unsigned cmdlen=0;
for (;;) {
- struct pipeline pipe;
-
if(!f) putchar('$');
if(1 > getline(&command, &cmdlen,f ? : stdin)) break;