summaryrefslogtreecommitdiff
path: root/sh.c
diff options
context:
space:
mode:
authorrsc <rsc>2006-09-06 17:27:19 +0000
committerrsc <rsc>2006-09-06 17:27:19 +0000
commit9e9bcaf143bf8507e947f9934371744c3d50a8ea (patch)
treeb63a03929569f34ade9a940ef1416586346b8d30 /sh.c
parent03b6376f56074cd1dcbb1b35639e303c3a8a0181 (diff)
downloadxv6-labs-9e9bcaf143bf8507e947f9934371744c3d50a8ea.tar.gz
xv6-labs-9e9bcaf143bf8507e947f9934371744c3d50a8ea.tar.bz2
xv6-labs-9e9bcaf143bf8507e947f9934371744c3d50a8ea.zip
standardize various * conventions
Diffstat (limited to 'sh.c')
-rw-r--r--sh.c136
1 files changed, 68 insertions, 68 deletions
diff --git a/sh.c b/sh.c
index acea4d3..f4975e5 100644
--- a/sh.c
+++ b/sh.c
@@ -25,7 +25,7 @@ struct cmd {
int argc;
int token;
};
-struct cmd cmdlist[MAXCMD];
+struct cmd cmdlist[MAXCMD];
int nextcmd;
char buf[BUFSIZ];
@@ -43,15 +43,15 @@ main(void)
{
while(1){
puts("$ ");
- memset (buf, '\0', sizeof(buf));
+ memset(buf, '\0', sizeof(buf));
gets(buf, sizeof(buf));
- if (parse(buf) < 0)
+ if(parse(buf) < 0)
continue;
runcmd();
}
}
-int
+int
parse(char *s)
{
char *t;
@@ -61,33 +61,33 @@ parse(char *s)
nextio = 0;
nextcmd = 0;
- for (i = 0; i < MAXCMD; i++) {
+ for(i = 0; i < MAXCMD; i++) {
cmdlist[i].argc = 0;
cmdlist[i].token = 0;
}
- while (1) {
- switch ((c = gettoken(0, &t))) {
+ while(1) {
+ switch((c = gettoken(0, &t))) {
case 'w': // Add an argument
- if (cmdlist[nextcmd].argc >= MAXARGS) {
+ if(cmdlist[nextcmd].argc >= MAXARGS) {
printf(2, "too many arguments\n");
return -1;
}
cmdlist[nextcmd].argv[cmdlist[nextcmd].argc++] = t;
break;
-
+
case '<': // Input redirection
// 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");
return -1;
}
addio('<', t);
break;
-
+
case '>': // Output redirection
// 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");
return -1;
}
@@ -102,11 +102,11 @@ parse(char *s)
case 0: // String is complete
return 0;
-
+
default:
printf(2, "syntax error: bad return %d from gettoken", c);
return -1;
-
+
}
}
}
@@ -120,90 +120,90 @@ runcmd(void)
// Return immediately if command line was empty.
if(cmdlist[0].argc == 0) {
- if (debug)
+ if(debug)
printf(2, "EMPTY COMMAND\n");
return;
}
- for (c = 0; c <= nextcmd; c++) {
+ 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] != '/') {
+ 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;
-
+
// Print the command.
- if (debug) {
+ if(debug) {
printf(2, "[%d] SPAWN:", getpid());
- for (i = 0; cmdlist[c].argv[i]; i++)
+ for(i = 0; cmdlist[c].argv[i]; i++)
printf(2, " %s", cmdlist[c].argv[i]);
- for (i = 0; i < nextio; i++) {
+ for(i = 0; i < nextio; i++) {
printf(2, "%c %s", iolist[i].token, iolist[i].s);
}
printf(2, "\n");
}
- if (strcmp(cmdlist[c].argv[0], "/cd") == 0) {
- if (debug) printf (2, "/cd %s is build in\n", cmdlist[c].argv[1]);
+ 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;
}
- if (cmdlist[c].token == '|')
- if (pipe(fdarray) < 0)
+ 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)
+ if(pid == 0) {
+ if(cmdlist[c].token == '|') {
+ if(close(1) < 0)
printf(2, "close 1 failed\n");
- if ((tfd = dup(fdarray[1])) < 0)
+ if((tfd = dup(fdarray[1])) < 0)
printf(2, "dup failed\n");
- if (close(fdarray[0]) < 0)
+ if(close(fdarray[0]) < 0)
printf(2, "close fdarray[0] failed\n");
- if (close(fdarray[1]) < 0)
+ if(close(fdarray[1]) < 0)
printf(2, "close fdarray[1] failed\n");
}
- if (c > 0 && cmdlist[c-1].token == '|') {
- if (close(0) < 0)
+ if(c > 0 && cmdlist[c-1].token == '|') {
+ if(close(0) < 0)
printf(2, "close 0 failed\n");
- if ((tfd = dup(fdarray[0])) < 0)
+ if((tfd = dup(fdarray[0])) < 0)
printf(2, "dup failed\n");
- if (close(fdarray[0]) < 0)
+ if(close(fdarray[0]) < 0)
printf(2, "close fdarray[0] failed\n");
- if (close(fdarray[1]) < 0)
+ if(close(fdarray[1]) < 0)
printf(2, "close fdarray[1] failed\n");
}
- if (ioredirection() < 0)
+ if(ioredirection() < 0)
exit();
- if ((r = exec(cmdlist[c].argv0buf, (char**) cmdlist[c].argv)) < 0) {
+ 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) {
+ } else if(pid > 0) {
int p;
- if (debug)
+ if(debug)
printf(2, "[%d] FORKED child %d\n", getpid(), pid);
- if (c > 0 && cmdlist[c-1].token == '|') {
+ if(c > 0 && cmdlist[c-1].token == '|') {
close(fdarray[0]);
close(fdarray[1]);
}
- if (cmdlist[c].token != '|') {
- if (debug)
+ if(cmdlist[c].token != '|') {
+ if(debug)
printf(2, "[%d] WAIT for children\n", getpid());
do {
p = wait();
- if (debug)
+ if(debug)
printf(2, "[%d] WAIT child %d finished\n", getpid(), p);
- } while (p > 0);
- if (debug)
+ } while(p > 0);
+ if(debug)
printf(2, "[%d] wait finished\n", getpid());
}
}
@@ -215,26 +215,26 @@ ioredirection(void)
{
int i, fd;
- for (i = 0; i < nextio; i++) {
- switch (iolist[i].token) {
+ for(i = 0; i < nextio; i++) {
+ switch(iolist[i].token) {
case '<':
- if (close(0) < 0)
+ if(close(0) < 0)
printf(2, "close 0 failed\n");
- if ((fd = open(iolist[i].s, O_RDONLY)) < 0) {
+ if((fd = open(iolist[i].s, O_RDONLY)) < 0) {
printf(2, "failed to open %s for read: %d", iolist[i].s, fd);
return -1;
}
- if (debug)
+ if(debug)
printf(2, "redirect 0 from %s\n", iolist[i].s);
break;
case '>':
- if (close(1) < 0)
+ if(close(1) < 0)
printf(2, "close 1 failed\n");
- if ((fd = open(iolist[i].s, O_WRONLY|O_CREATE)) < 0) {
+ if((fd = open(iolist[i].s, O_WRONLY|O_CREATE)) < 0) {
printf(2, "failed to open %s for write: %d", iolist[i].s, fd);
exit();
}
- if (debug)
+ if(debug)
printf(2, "redirect 1 to %s\n", iolist[i].s);
break;
}
@@ -245,11 +245,11 @@ ioredirection(void)
void
addio(int token, char *s)
{
- if (nextio >= MAXNODE) {
+ if(nextio >= MAXNODE) {
printf(2, "addio: ran out of nodes\n");
return;
}
-
+
iolist[nextio].token = token;
iolist[nextio].s = s;
nextio++;
@@ -267,9 +267,9 @@ int
gettoken(char *s, char **p1)
{
static int c, nc;
- static char* np1, *np2;
+ static char *np1, *np2;
- if (s) {
+ if(s) {
nc = _gettoken(s, &np1, &np2);
return 0;
}
@@ -299,39 +299,39 @@ _gettoken(char *s, char **p1, char **p2)
{
int t;
- if (s == 0) {
- if (debug > 1)
+ if(s == 0) {
+ if(debug > 1)
printf(2, "GETTOKEN NULL\n");
return 0;
}
- if (debug > 1)
+ if(debug > 1)
printf(2, "GETTOKEN: %s\n", s);
*p1 = 0;
*p2 = 0;
- while (strchr(WHITESPACE, *s))
+ while(strchr(WHITESPACE, *s))
*s++ = 0;
- if (*s == 0) {
- if (debug > 1)
+ if(*s == 0) {
+ if(debug > 1)
printf(2, "EOL\n");
return 0;
}
- if (strchr(SYMBOLS, *s)) {
+ if(strchr(SYMBOLS, *s)) {
t = *s;
*p1 = s;
*s++ = 0;
*p2 = s;
- if (debug > 1)
+ if(debug > 1)
printf(2, "TOK %c\n", t);
return t;
}
*p1 = s;
- while (*s && !strchr(WHITESPACE SYMBOLS, *s))
+ while(*s && !strchr(WHITESPACE SYMBOLS, *s))
s++;
*p2 = s;
- if (debug > 1) {
+ if(debug > 1) {
t = **p2;
**p2 = 0;
printf(2, "WORD: %s\n", *p1);