projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://vda@busybox.net/var/lib/git/busybox
[oweals/busybox.git]
/
shell
/
bbsh.c
diff --git
a/shell/bbsh.c
b/shell/bbsh.c
index 897c0227cce785504a9dc6076eabab41d3356fad..83132f928f415ec844655b42798220d6c775f115 100644
(file)
--- a/
shell/bbsh.c
+++ b/
shell/bbsh.c
@@
-54,7
+54,7
@@
struct command {
int flags; // exit, suspend, && ||
int pid; // pid (or exit code)
int argc;
int flags; // exit, suspend, && ||
int pid; // pid (or exit code)
int argc;
- char *argv[
0
];
+ char *argv[];
};
// A collection of processes piped into/waiting on each other.
};
// A collection of processes piped into/waiting on each other.
@@
-199,7
+199,7
@@
static void handle(char *command)
}
int bbsh_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
}
int bbsh_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int bbsh_main(int argc, char **argv)
+int bbsh_main(int argc
UNUSED_PARAM
, char **argv)
{
char *command=NULL;
FILE *f;
{
char *command=NULL;
FILE *f;
@@
-212,7
+212,7
@@
int bbsh_main(int argc, char **argv)
unsigned cmdlen=0;
for (;;) {
if (!f) putchar('$');
unsigned cmdlen=0;
for (;;) {
if (!f) putchar('$');
- if (1 > getline(&command, &cmdlen,
f ?
: stdin)) break;
+ if (1 > getline(&command, &cmdlen,
f ? f
: stdin)) break;
handle(command);
}
handle(command);
}