2006-08-11 15:55:18 +02:00
|
|
|
#include "types.h"
|
2006-08-14 23:22:13 +02:00
|
|
|
#include "stat.h"
|
|
|
|
#include "user.h"
|
2006-08-11 15:55:18 +02:00
|
|
|
#include "fs.h"
|
|
|
|
#include "fcntl.h"
|
|
|
|
|
2006-08-23 03:09:24 +02:00
|
|
|
#define BUFSIZ 512
|
|
|
|
#define MAXARGS 10
|
|
|
|
#define MAXNODE 2
|
2006-09-06 17:32:21 +02:00
|
|
|
#define MAXCMD 2
|
2006-08-23 03:09:24 +02:00
|
|
|
|
2006-09-06 17:32:21 +02:00
|
|
|
// an embarrassingly naive shell
|
|
|
|
|
|
|
|
// some day a real parse tree; for now ad-hoc
|
|
|
|
struct ionode {
|
2006-08-23 03:09:24 +02:00
|
|
|
int token;
|
|
|
|
char *s;
|
|
|
|
};
|
2006-09-06 17:32:21 +02:00
|
|
|
struct ionode iolist[MAXNODE];
|
|
|
|
int nextio;
|
2006-08-23 03:09:24 +02:00
|
|
|
|
2006-09-06 17:32:21 +02:00
|
|
|
struct cmd {
|
|
|
|
char *argv[MAXARGS];
|
|
|
|
char argv0buf[BUFSIZ];
|
|
|
|
int argc;
|
|
|
|
int token;
|
|
|
|
};
|
|
|
|
struct cmd cmdlist[MAXCMD];
|
|
|
|
int nextcmd;
|
2006-08-23 03:09:24 +02:00
|
|
|
|
2006-09-06 17:32:21 +02:00
|
|
|
char buf[BUFSIZ];
|
2006-08-29 21:59:52 +02:00
|
|
|
int debug = 0;
|
2006-08-23 03:09:24 +02:00
|
|
|
|
|
|
|
int parse(char *s);
|
|
|
|
void runcmd(void);
|
|
|
|
int ioredirection(void);
|
|
|
|
int gettoken(char *s, char **token);
|
|
|
|
int _gettoken(char *s, char **p1, char **p2);
|
2006-09-06 17:32:21 +02:00
|
|
|
void addio(int token, char *s);
|
2006-08-11 15:55:18 +02:00
|
|
|
|
|
|
|
int
|
|
|
|
main(void)
|
|
|
|
{
|
|
|
|
while(1){
|
2006-08-12 13:38:57 +02:00
|
|
|
puts("$ ");
|
2006-08-20 01:41:34 +02:00
|
|
|
memset (buf, '\0', sizeof(buf));
|
2006-08-11 15:55:18 +02:00
|
|
|
gets(buf, sizeof(buf));
|
2006-08-23 03:09:24 +02:00
|
|
|
if (parse(buf) < 0)
|
2006-08-11 15:55:18 +02:00
|
|
|
continue;
|
2006-08-23 03:09:24 +02:00
|
|
|
runcmd();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
parse(char *s)
|
|
|
|
{
|
|
|
|
char *t;
|
2006-09-06 17:32:21 +02:00
|
|
|
int c, i;
|
2006-08-23 03:09:24 +02:00
|
|
|
|
|
|
|
gettoken(s, 0);
|
|
|
|
|
2006-09-06 17:32:21 +02:00
|
|
|
nextio = 0;
|
|
|
|
nextcmd = 0;
|
|
|
|
for (i = 0; i < MAXCMD; i++) {
|
|
|
|
cmdlist[i].argc = 0;
|
|
|
|
cmdlist[i].token = 0;
|
|
|
|
}
|
2006-08-23 03:09:24 +02:00
|
|
|
while (1) {
|
|
|
|
switch ((c = gettoken(0, &t))) {
|
|
|
|
|
|
|
|
case 'w': // Add an argument
|
2006-09-06 17:32:21 +02:00
|
|
|
if (cmdlist[nextcmd].argc >= MAXARGS) {
|
2006-08-23 03:09:24 +02:00
|
|
|
printf(2, "too many arguments\n");
|
|
|
|
return -1;
|
2006-08-20 01:41:34 +02:00
|
|
|
}
|
2006-09-06 17:32:21 +02:00
|
|
|
cmdlist[nextcmd].argv[cmdlist[nextcmd].argc++] = t;
|
2006-08-23 03:09:24 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case '<': // Input redirection
|
|
|
|
// Grab the filename from the argument list
|
|
|
|
if (gettoken(0, &t) != 'w') {
|
|
|
|
printf(2, "syntax error: < not followed by word\n");
|
|
|
|
return -1;
|
|
|
|
}
|
2006-09-06 17:32:21 +02:00
|
|
|
addio('<', t);
|
2006-08-23 03:09:24 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case '>': // Output redirection
|
|
|
|
// Grab the filename from the argument list
|
|
|
|
if (gettoken(0, &t) != 'w') {
|
|
|
|
printf(2, "syntax error: > not followed by word\n");
|
|
|
|
return -1;
|
|
|
|
}
|
2006-09-06 17:32:21 +02:00
|
|
|
addio('>', t);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ';': // command sequence
|
|
|
|
case '|': // pipe
|
|
|
|
cmdlist[nextcmd].token = c;
|
|
|
|
nextcmd++;
|
2006-08-23 03:09:24 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 0: // String is complete
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
default:
|
|
|
|
printf(2, "syntax error: bad return %d from gettoken", c);
|
|
|
|
return -1;
|
|
|
|
|
2006-08-11 15:55:18 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-08-14 23:22:13 +02:00
|
|
|
|
2006-08-23 03:09:24 +02:00
|
|
|
|
2006-08-14 23:22:13 +02:00
|
|
|
void
|
2006-08-23 03:09:24 +02:00
|
|
|
runcmd(void)
|
|
|
|
{
|
2006-09-06 17:32:21 +02:00
|
|
|
int c, i, r, pid, tfd;
|
|
|
|
int fdarray[2];
|
2006-08-23 03:09:24 +02:00
|
|
|
|
|
|
|
// Return immediately if command line was empty.
|
2006-09-06 17:32:21 +02:00
|
|
|
if(cmdlist[0].argc == 0) {
|
2006-08-23 03:09:24 +02:00
|
|
|
if (debug)
|
|
|
|
printf(2, "EMPTY COMMAND\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-09-06 17:32:21 +02:00
|
|
|
for (c = 0; c <= nextcmd; c++) {
|
|
|
|
// Clean up command line.
|
|
|
|
// Read all commands from the filesystem: add an initial '/' to
|
|
|
|
// the command name.
|
|
|
|
// This essentially acts like 'PATH=/'.
|
|
|
|
if (cmdlist[c].argv[0][0] != '/') {
|
|
|
|
cmdlist[c].argv0buf[0] = '/';
|
|
|
|
strcpy(cmdlist[c].argv0buf + 1, cmdlist[c].argv[0]);
|
|
|
|
cmdlist[c].argv[0] = cmdlist[c].argv0buf;
|
|
|
|
}
|
|
|
|
cmdlist[c].argv[cmdlist[c].argc] = 0;
|
2006-08-23 03:09:24 +02:00
|
|
|
|
2006-09-06 17:32:21 +02:00
|
|
|
// Print the command.
|
|
|
|
if (debug) {
|
|
|
|
printf(2, "[%d] SPAWN:", getpid());
|
|
|
|
for (i = 0; cmdlist[c].argv[i]; i++)
|
|
|
|
printf(2, " %s", cmdlist[c].argv[i]);
|
|
|
|
for (i = 0; i < nextio; i++) {
|
|
|
|
printf(2, "%c %s", iolist[i].token, iolist[i].s);
|
|
|
|
}
|
|
|
|
printf(2, "\n");
|
2006-08-23 03:09:24 +02:00
|
|
|
}
|
|
|
|
|
2006-09-06 17:32:21 +02:00
|
|
|
if (strcmp(cmdlist[c].argv[0], "/cd") == 0) {
|
|
|
|
if (debug) printf (2, "/cd %s is build in\n", cmdlist[c].argv[1]);
|
|
|
|
chdir(cmdlist[c].argv[1]);
|
|
|
|
return;
|
2006-08-23 03:09:24 +02:00
|
|
|
}
|
|
|
|
|
2006-09-06 17:32:21 +02:00
|
|
|
if (cmdlist[c].token == '|')
|
|
|
|
if (pipe(fdarray) < 0)
|
|
|
|
printf(2, "cmd %d pipe failed\n", c);
|
|
|
|
|
|
|
|
pid = fork();
|
|
|
|
if (pid == 0) {
|
|
|
|
if (cmdlist[c].token == '|') {
|
|
|
|
if (close(1) < 0)
|
|
|
|
printf(2, "close 1 failed\n");
|
|
|
|
if ((tfd = dup(fdarray[1])) < 0)
|
|
|
|
printf(2, "dup failed\n");
|
|
|
|
if (close(fdarray[0]) < 0)
|
|
|
|
printf(2, "close fdarray[0] failed\n");
|
|
|
|
if (close(fdarray[1]) < 0)
|
|
|
|
printf(2, "close fdarray[1] failed\n");
|
|
|
|
}
|
|
|
|
if (c > 0 && cmdlist[c-1].token == '|') {
|
|
|
|
if (close(0) < 0)
|
|
|
|
printf(2, "close 0 failed\n");
|
|
|
|
if ((tfd = dup(fdarray[0])) < 0)
|
|
|
|
printf(2, "dup failed\n");
|
|
|
|
if (close(fdarray[0]) < 0)
|
|
|
|
printf(2, "close fdarray[0] failed\n");
|
|
|
|
if (close(fdarray[1]) < 0)
|
|
|
|
printf(2, "close fdarray[1] failed\n");
|
|
|
|
}
|
|
|
|
if (ioredirection() < 0)
|
|
|
|
exit();
|
|
|
|
if ((r = exec(cmdlist[c].argv0buf, (char**) cmdlist[c].argv)) < 0) {
|
|
|
|
printf(2, "exec %s: %d\n", cmdlist[c].argv[0], r);
|
|
|
|
exit();
|
|
|
|
}
|
|
|
|
} else if (pid > 0) {
|
|
|
|
int p;
|
|
|
|
if (debug)
|
|
|
|
printf(2, "[%d] FORKED child %d\n", getpid(), pid);
|
|
|
|
|
|
|
|
if (c > 0 && cmdlist[c-1].token == '|') {
|
|
|
|
close(fdarray[0]);
|
|
|
|
close(fdarray[1]);
|
|
|
|
}
|
|
|
|
if (cmdlist[c].token != '|') {
|
|
|
|
if (debug)
|
|
|
|
printf(2, "[%d] WAIT for children\n", getpid());
|
|
|
|
do {
|
|
|
|
p = wait();
|
|
|
|
if (debug)
|
|
|
|
printf(2, "[%d] WAIT child %d finished\n", getpid(), p);
|
|
|
|
} while (p > 0);
|
|
|
|
if (debug)
|
|
|
|
printf(2, "[%d] wait finished\n", getpid());
|
|
|
|
}
|
|
|
|
}
|
2006-08-23 03:09:24 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
ioredirection(void)
|
2006-08-14 23:22:13 +02:00
|
|
|
{
|
2006-09-06 17:32:21 +02:00
|
|
|
int i, fd;
|
2006-08-23 03:09:24 +02:00
|
|
|
|
2006-09-06 17:32:21 +02:00
|
|
|
for (i = 0; i < nextio; i++) {
|
|
|
|
switch (iolist[i].token) {
|
2006-08-23 03:09:24 +02:00
|
|
|
case '<':
|
2006-09-06 03:25:41 +02:00
|
|
|
if (close(0) < 0)
|
|
|
|
printf(2, "close 0 failed\n");
|
2006-09-06 17:32:21 +02:00
|
|
|
if ((fd = open(iolist[i].s, O_RDONLY)) < 0) {
|
|
|
|
printf(2, "failed to open %s for read: %d", iolist[i].s, fd);
|
2006-08-23 03:09:24 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (debug)
|
2006-09-06 17:32:21 +02:00
|
|
|
printf(2, "redirect 0 from %s\n", iolist[i].s);
|
2006-08-23 03:09:24 +02:00
|
|
|
break;
|
|
|
|
case '>':
|
2006-09-06 03:25:41 +02:00
|
|
|
if (close(1) < 0)
|
|
|
|
printf(2, "close 1 failed\n");
|
2006-09-06 17:32:21 +02:00
|
|
|
if ((fd = open(iolist[i].s, O_WRONLY|O_CREATE)) < 0) {
|
|
|
|
printf(2, "failed to open %s for write: %d", iolist[i].s, fd);
|
2006-08-14 23:22:13 +02:00
|
|
|
exit();
|
|
|
|
}
|
2006-08-23 03:09:24 +02:00
|
|
|
if (debug)
|
2006-09-06 17:32:21 +02:00
|
|
|
printf(2, "redirect 1 to %s\n", iolist[i].s);
|
2006-08-23 03:09:24 +02:00
|
|
|
break;
|
2006-08-14 23:22:13 +02:00
|
|
|
}
|
|
|
|
}
|
2006-08-23 03:09:24 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2006-09-06 17:32:21 +02:00
|
|
|
addio(int token, char *s)
|
2006-08-23 03:09:24 +02:00
|
|
|
{
|
2006-09-06 17:32:21 +02:00
|
|
|
if (nextio >= MAXNODE) {
|
|
|
|
printf(2, "addio: ran out of nodes\n");
|
2006-08-23 03:09:24 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-09-06 17:32:21 +02:00
|
|
|
iolist[nextio].token = token;
|
|
|
|
iolist[nextio].s = s;
|
|
|
|
nextio++;
|
2006-08-23 03:09:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// gettoken(s, 0) prepares gettoken for subsequent calls and returns 0.
|
|
|
|
// gettoken(0, token) parses a shell token from the previously set string,
|
|
|
|
// null-terminates that token, stores the token pointer in '*token',
|
|
|
|
// and returns a token ID (0, '<', '>', '|', or 'w').
|
|
|
|
// Subsequent calls to 'gettoken(0, token)' will return subsequent
|
|
|
|
// tokens from the string.
|
|
|
|
|
|
|
|
int
|
|
|
|
gettoken(char *s, char **p1)
|
|
|
|
{
|
|
|
|
static int c, nc;
|
|
|
|
static char* np1, *np2;
|
|
|
|
|
|
|
|
if (s) {
|
|
|
|
nc = _gettoken(s, &np1, &np2);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
c = nc;
|
|
|
|
*p1 = np1;
|
|
|
|
nc = _gettoken(np2, &np1, &np2);
|
|
|
|
return c;
|
2006-08-14 23:22:13 +02:00
|
|
|
}
|
2006-08-23 03:09:24 +02:00
|
|
|
|
|
|
|
|
|
|
|
// Get the next token from string s.
|
|
|
|
// Set *p1 to the beginning of the token and *p2 just past the token.
|
|
|
|
// Returns
|
|
|
|
// 0 for end-of-string;
|
|
|
|
// < for <;
|
|
|
|
// > for >;
|
|
|
|
// | for |;
|
|
|
|
// w for a word.
|
|
|
|
//
|
|
|
|
// Eventually (once we parse the space where the \0 will go),
|
|
|
|
// words get nul-terminated.
|
|
|
|
#define WHITESPACE " \t\r\n"
|
|
|
|
#define SYMBOLS "<|>&;()"
|
|
|
|
|
|
|
|
int
|
|
|
|
_gettoken(char *s, char **p1, char **p2)
|
|
|
|
{
|
|
|
|
int t;
|
|
|
|
|
|
|
|
if (s == 0) {
|
|
|
|
if (debug > 1)
|
|
|
|
printf(2, "GETTOKEN NULL\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (debug > 1)
|
|
|
|
printf(2, "GETTOKEN: %s\n", s);
|
|
|
|
|
|
|
|
*p1 = 0;
|
|
|
|
*p2 = 0;
|
|
|
|
|
|
|
|
while (strchr(WHITESPACE, *s))
|
|
|
|
*s++ = 0;
|
|
|
|
if (*s == 0) {
|
|
|
|
if (debug > 1)
|
|
|
|
printf(2, "EOL\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (strchr(SYMBOLS, *s)) {
|
|
|
|
t = *s;
|
|
|
|
*p1 = s;
|
|
|
|
*s++ = 0;
|
|
|
|
*p2 = s;
|
|
|
|
if (debug > 1)
|
|
|
|
printf(2, "TOK %c\n", t);
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
*p1 = s;
|
|
|
|
while (*s && !strchr(WHITESPACE SYMBOLS, *s))
|
|
|
|
s++;
|
|
|
|
*p2 = s;
|
|
|
|
if (debug > 1) {
|
|
|
|
t = **p2;
|
|
|
|
**p2 = 0;
|
|
|
|
printf(2, "WORD: %s\n", *p1);
|
|
|
|
**p2 = t;
|
|
|
|
}
|
|
|
|
return 'w';
|
|
|
|
}
|
|
|
|
|