/* vi: set ts=4 :
- *
+ *
* bbsh - busybox shell
*
* Copyright 2006 Rob Landley <rob@landley.net>
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
// What we know about a single process.
struct command {
struct command *next;
- int flags; // exit, suspend, && ||
+ 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.
static void free_list(void *list, void (*freeit)(void *data))
{
- while(list) {
+ while (list) {
void **next = (void **)list;
void *list_next = *next;
freeit(list);
// Grab next word. (Add dequote and envvar logic here)
end = start;
- while (*end && !isspace(*end)) end++;
+ end = skip_non_whitespace(end);
(*cmd)->argv[(*cmd)->argc++] = xstrndup(start, end-start);
// Allocate more space if there's no room for NULL terminator.
char *end;
// Skip leading whitespace and detect end of line.
- while (isspace(*start)) start++;
+ start = skip_whitespace(start);
if (!*start || *start=='#') {
if (ENABLE_BBSH_JOBCTL) line->cmdlinelen = start-cmdline;
return 0;
}
- // Allocate next command structure if necessary
+ // Allocate next command structure if necessary
if (!*cmd) *cmd = xzalloc(sizeof(struct command)+8*sizeof(char *));
-
+
// Parse next argument and add the results to argv[]
end = parse_word(start, cmd);
start++;
break;
}
- // handle | & < > >> << || &&
+ // handle | & < > >> << || &&
}
break;
}
// 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"))
- exit(cmd->argc>1 ? atoi(cmd->argv[1]) : 0);
+ else if (!strcmp(cmd->argv[0],"exit"))
+ 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);
+ printf("No %s", cmd->argv[0]);
+ exit(EXIT_FAILURE);
} else waitpid(pid, &status, 0);
}
{
struct command *cmd=(struct command *)data;
- while(cmd->argc) free(cmd->argv[--cmd->argc]);
+ while (cmd->argc) free(cmd->argv[--cmd->argc]);
}
}
}
-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;
- getopt32(argc, argv, "c:", &command);
+ getopt32(argv, "c:", &command);
- f = argv[optind] ? xfopen(argv[optind],"r") : NULL;
+ f = argv[optind] ? xfopen_for_read(argv[optind]) : 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 ? f : stdin)) break;
handle(command);
}
if (ENABLE_FEATURE_CLEAN_UP) free(command);
}
-
+
return 1;
}