ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

more simplifying

Browse source
This commit is contained in:
kaashoek 2006-09-07 03:16:15 +00:00
parent e00baa9f5d
commit 44e6909a6d
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sh.c
View file

@ -6,7 +6,7 @@
#define BUFSIZ 512 #define BUFSIZ 512
#define MAXARGS 10 #define MAXARGS 10
#define MAXNODE 2 #define MAXIO 2
#define MAXCMD 2 #define MAXCMD 2
// an embarrassingly naive shell // an embarrassingly naive shell
@ -22,7 +22,7 @@ struct cmd {
char argv0buf[BUFSIZ]; char argv0buf[BUFSIZ];
int argc; int argc;
int token; int token;
struct ionode iolist[MAXNODE]; struct ionode iolist[MAXIO];
struct ionode *io; struct ionode *io;
}; };
struct cmd cmdlist[MAXCMD]; struct cmd cmdlist[MAXCMD];
@ -75,30 +75,28 @@ parse(char *s)
cmd->argv[cmd->argc++] = t; cmd->argv[cmd->argc++] = t;
break; break;
case '<': // Input redirection case '>': // Input and output redirection
// Grab the filename from the argument list case '<':
if(gettoken(0, &t) != 'w') {
printf(2, "syntax error: < not followed by word\n");
return -1;
}
cmd->io->token = '<';
cmd->io->s = t;
cmd->io++;
break;
case '>': // Output redirection
// Grab the filename from the argument list // Grab the filename from the argument list
if(gettoken(0, &t) != 'w') { if(gettoken(0, &t) != 'w') {
printf(2, "syntax error: > not followed by word\n"); printf(2, "syntax error: > not followed by word\n");
return -1; return -1;
} }
cmd->io->token = '>'; if(cmd->io - cmd->iolist >= MAXIO) {
printf(2, "too many redirections\n");
return -1;
}
cmd->io->token = c;
cmd->io->s = t; cmd->io->s = t;
cmd->io++; cmd->io++;
break; break;
case ';': // command sequence case ';': // command sequence
case '|': // pipe case '|': // pipe
if(cmd->io - cmd->iolist >= MAXIO) {
printf(2, "too many redirections\n");
return -1;
}
cmd->token = c; cmd->token = c;
cmd++; cmd++;
break; break;
@ -114,7 +112,6 @@ parse(char *s)
} }
} }
void void
runcmd(void) runcmd(void)
{ {