projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
insmod: code shrink, stop exporting insmod_ng_main.
[oweals/busybox.git]
/
shell
/
bbsh.c
diff --git
a/shell/bbsh.c
b/shell/bbsh.c
index 06fd0131e688c71e6edf39715bcda877f94e8482..02e60508fb2032fd4f382c168d65ea901d3d3605 100644
(file)
--- a/
shell/bbsh.c
+++ b/
shell/bbsh.c
@@
-36,7
+36,7
@@
echo `echo hello#comment " woot` and more
*/
echo `echo hello#comment " woot` and more
*/
-#include "
busybox
.h"
+#include "
libbb
.h"
// A single executable, its arguments, and other information we know about it.
#define BBSH_FLAG_EXIT 1
// A single executable, its arguments, and other information we know about it.
#define BBSH_FLAG_EXIT 1
@@
-68,7
+68,7
@@
struct pipeline {
static void free_list(void *list, void (*freeit)(void *data))
{
static void free_list(void *list, void (*freeit)(void *data))
{
- while(list) {
+ while
(list) {
void **next = (void **)list;
void *list_next = *next;
freeit(list);
void **next = (void **)list;
void *list_next = *next;
freeit(list);
@@
-159,13
+159,13
@@
static int run_pipeline(struct pipeline *line)
// Handle local commands. This is totally fake and plastic.
if (cmd->argc==2 && !strcmp(cmd->argv[0],"cd"))
chdir(cmd->argv[1]);
// Handle local commands. This is totally fake and plastic.
if (cmd->argc==2 && !strcmp(cmd->argv[0],"cd"))
chdir(cmd->argv[1]);
- else if(!strcmp(cmd->argv[0],"exit"))
+ else if
(!strcmp(cmd->argv[0],"exit"))
exit(cmd->argc>1 ? atoi(cmd->argv[1]) : 0);
else {
int status;
pid_t pid=fork();
exit(cmd->argc>1 ? atoi(cmd->argv[1]) : 0);
else {
int status;
pid_t pid=fork();
- if(!pid) {
- run_applet_
by_name
(cmd->argv[0],cmd->argc,cmd->argv);
+ if
(!pid) {
+ run_applet_
and_exit
(cmd->argv[0],cmd->argc,cmd->argv);
execvp(cmd->argv[0],cmd->argv);
printf("No %s",cmd->argv[0]);
exit(1);
execvp(cmd->argv[0],cmd->argv);
printf("No %s",cmd->argv[0]);
exit(1);
@@
-179,7
+179,7
@@
static void free_cmd(void *data)
{
struct command *cmd=(struct command *)data;
{
struct command *cmd=(struct command *)data;
- while(cmd->argc) free(cmd->argv[--cmd->argc]);
+ while
(cmd->argc) free(cmd->argv[--cmd->argc]);
}
}
@@
-198,21
+198,21
@@
static void handle(char *command)
}
}
}
}
-int bbsh_main(int argc, char **argv);
+int bbsh_main(int argc, char **argv)
MAIN_EXTERNALLY_VISIBLE
;
int bbsh_main(int argc, char **argv)
{
char *command=NULL;
FILE *f;
int bbsh_main(int argc, char **argv)
{
char *command=NULL;
FILE *f;
- getopt32(arg
c, arg
v, "c:", &command);
+ getopt32(argv, "c:", &command);
f = argv[optind] ? xfopen(argv[optind],"r") : NULL;
if (command) handle(command);
else {
unsigned cmdlen=0;
for (;;) {
f = argv[optind] ? xfopen(argv[optind],"r") : NULL;
if (command) handle(command);
else {
unsigned cmdlen=0;
for (;;) {
- if(!f) putchar('$');
- if(1 > getline(&command, &cmdlen,f ? : stdin)) break;
+ if
(!f) putchar('$');
+ if
(1 > getline(&command, &cmdlen,f ? : stdin)) break;
handle(command);
}
handle(command);
}