From 64b93d175ac6eb739036b394fbb0766fbf06f5b7 Mon Sep 17 00:00:00 2001
From: Robert Morris <rtm@csail.mit.edu>
Date: Tue, 27 Aug 2019 13:13:03 -0400
Subject: [PATCH] user printf(1 -> printf(
---
doc/FU540-C000-v1.0.pdf | Bin 2240525 -> 2277037 bytes
user/alarmtest.c | 14 +-
user/cat.c | 6 +-
user/echo.c | 2 +-
user/forktest.c | 14 +-
user/grep.c | 4 +-
user/init.c | 8 +-
user/kill.c | 2 +-
user/ln.c | 4 +-
user/ls.c | 12 +-
user/mkdir.c | 4 +-
user/printf.c | 22 +-
user/rm.c | 4 +-
user/sh.c | 12 +-
user/stressfs.c | 6 +-
user/user.h | 3 +-
user/usertests.c | 565 ++++++++++++++++++++--------------------
user/wc.c | 6 +-
18 files changed, 352 insertions(+), 336 deletions(-)
diff --git a/doc/FU540-C000-v1.0.pdf b/doc/FU540-C000-v1.0.pdf
index 5322d67beac5a742c33fce36c043776823fb7385..1a8cc69193d75f3fca15ffb64e40d7a6b0f5dc0c 100644
GIT binary patch
delta 36879
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
SN(fxs{oe2W^xuDR_x}Nru9<WI
delta 79
zcmV~$$qj-)006+Oh!=<835o|)K#4x)K};ycp9R^72{WJnJB+^}yaY3mx!A(e%GyRE
cmC0=tN;`W8M<-{M+Qn7l=I-IC{dQSD0VO^d^Z)<=
diff --git a/user/alarmtest.c b/user/alarmtest.c
index c6da547..ca3db23 100644
--- a/user/alarmtest.c
+++ b/user/alarmtest.c
@@ -30,7 +30,7 @@ void
periodic()
{
count = count + 1;
- printf(1, "alarm!\n");
+ printf("alarm!\n");
sigreturn();
}
@@ -40,7 +40,7 @@ void
test0()
{
int i;
- printf(1, "test0 start\n");
+ printf("test0 start\n");
count = 0;
sigalarm(2, periodic);
for(i = 0; i < 1000*500000; i++){
@@ -51,9 +51,9 @@ test0()
}
sigalarm(0, 0);
if(count > 0){
- printf(1, "test0 passed\n");
+ printf("test0 passed\n");
} else {
- printf(1, "test0 failed\n");
+ printf("test0 failed\n");
}
}
@@ -70,7 +70,7 @@ test1()
int i;
int j;
- printf(1, "test1 start\n");
+ printf("test1 start\n");
count = 0;
j = 0;
sigalarm(2, periodic);
@@ -81,8 +81,8 @@ test1()
}
if(i != j || count < 10){
// i should equal j
- printf(1, "test1 failed\n");
+ printf("test1 failed\n");
} else {
- printf(1, "test1 passed\n");
+ printf("test1 passed\n");
}
}
diff --git a/user/cat.c b/user/cat.c
index d3d16c4..52909da 100644
--- a/user/cat.c
+++ b/user/cat.c
@@ -11,12 +11,12 @@ cat(int fd)
while((n = read(fd, buf, sizeof(buf))) > 0) {
if (write(1, buf, n) != n) {
- printf(1, "cat: write error\n");
+ printf("cat: write error\n");
exit();
}
}
if(n < 0){
- printf(1, "cat: read error\n");
+ printf("cat: read error\n");
exit();
}
}
@@ -33,7 +33,7 @@ main(int argc, char *argv[])
for(i = 1; i < argc; i++){
if((fd = open(argv[i], 0)) < 0){
- printf(1, "cat: cannot open %s\n", argv[i]);
+ printf("cat: cannot open %s\n", argv[i]);
exit();
}
cat(fd);
diff --git a/user/echo.c b/user/echo.c
index ef744ab..bb98e97 100644
--- a/user/echo.c
+++ b/user/echo.c
@@ -8,6 +8,6 @@ main(int argc, char *argv[])
int i;
for(i = 1; i < argc; i++)
- printf(1, "%s%s", argv[i], i+1 < argc ? " " : "\n");
+ printf("%s%s", argv[i], i+1 < argc ? " " : "\n");
exit();
}
diff --git a/user/forktest.c b/user/forktest.c
index be4915e..fa072ca 100644
--- a/user/forktest.c
+++ b/user/forktest.c
@@ -8,9 +8,9 @@
#define N 1000
void
-printf(int fd, const char *s, ...)
+print(const char *s)
{
- write(fd, s, strlen(s));
+ write(1, s, strlen(s));
}
void
@@ -18,7 +18,7 @@ forktest(void)
{
int n, pid;
- printf(1, "fork test\n");
+ print("fork test\n");
for(n=0; n<N; n++){
pid = fork();
@@ -29,23 +29,23 @@ forktest(void)
}
if(n == N){
- printf(1, "fork claimed to work N times!\n", N);
+ print("fork claimed to work N times!\n");
exit();
}
for(; n > 0; n--){
if(wait() < 0){
- printf(1, "wait stopped early\n");
+ print("wait stopped early\n");
exit();
}
}
if(wait() != -1){
- printf(1, "wait got too many\n");
+ print("wait got too many\n");
exit();
}
- printf(1, "fork test OK\n");
+ print("fork test OK\n");
}
int
diff --git a/user/grep.c b/user/grep.c
index b5fdfc2..152c8a8 100644
--- a/user/grep.c
+++ b/user/grep.c
@@ -42,7 +42,7 @@ main(int argc, char *argv[])
char *pattern;
if(argc <= 1){
- printf(2, "usage: grep pattern [file ...]\n");
+ fprintf(2, "usage: grep pattern [file ...]\n");
exit();
}
pattern = argv[1];
@@ -54,7 +54,7 @@ main(int argc, char *argv[])
for(i = 2; i < argc; i++){
if((fd = open(argv[i], 0)) < 0){
- printf(1, "grep: cannot open %s\n", argv[i]);
+ printf("grep: cannot open %s\n", argv[i]);
exit();
}
grep(pattern, fd);
diff --git a/user/init.c b/user/init.c
index 03e60da..01bb445 100644
--- a/user/init.c
+++ b/user/init.c
@@ -20,19 +20,19 @@ main(void)
dup(0); // stderr
for(;;){
- printf(1, "init: starting sh\n");
+ printf("init: starting sh\n");
pid = fork();
if(pid < 0){
- printf(1, "init: fork failed\n");
+ printf("init: fork failed\n");
exit();
}
if(pid == 0){
exec("sh", argv);
- printf(1, "init: exec sh failed\n");
+ printf("init: exec sh failed\n");
exit();
}
while((wpid=wait()) >= 0 && wpid != pid){
- //printf(1, "zombie!\n");
+ //printf("zombie!\n");
}
}
}
diff --git a/user/kill.c b/user/kill.c
index 4b19d3c..3e29cd0 100644
--- a/user/kill.c
+++ b/user/kill.c
@@ -8,7 +8,7 @@ main(int argc, char **argv)
int i;
if(argc < 2){
- printf(2, "usage: kill pid...\n");
+ fprintf(2, "usage: kill pid...\n");
exit();
}
for(i=1; i<argc; i++)
diff --git a/user/ln.c b/user/ln.c
index 482dd79..0bb0c95 100644
--- a/user/ln.c
+++ b/user/ln.c
@@ -6,10 +6,10 @@ int
main(int argc, char *argv[])
{
if(argc != 3){
- printf(2, "Usage: ln old new\n");
+ fprintf(2, "Usage: ln old new\n");
exit();
}
if(link(argv[1], argv[2]) < 0)
- printf(2, "link %s %s: failed\n", argv[1], argv[2]);
+ fprintf(2, "link %s %s: failed\n", argv[1], argv[2]);
exit();
}
diff --git a/user/ls.c b/user/ls.c
index 3511d87..5847555 100644
--- a/user/ls.c
+++ b/user/ls.c
@@ -31,24 +31,24 @@ ls(char *path)
struct stat st;
if((fd = open(path, 0)) < 0){
- printf(2, "ls: cannot open %s\n", path);
+ fprintf(2, "ls: cannot open %s\n", path);
return;
}
if(fstat(fd, &st) < 0){
- printf(2, "ls: cannot stat %s\n", path);
+ fprintf(2, "ls: cannot stat %s\n", path);
close(fd);
return;
}
switch(st.type){
case T_FILE:
- printf(1, "%s %d %d %l\n", fmtname(path), st.type, st.ino, st.size);
+ printf("%s %d %d %l\n", fmtname(path), st.type, st.ino, st.size);
break;
case T_DIR:
if(strlen(path) + 1 + DIRSIZ + 1 > sizeof buf){
- printf(1, "ls: path too long\n");
+ printf("ls: path too long\n");
break;
}
strcpy(buf, path);
@@ -60,10 +60,10 @@ ls(char *path)
memmove(p, de.name, DIRSIZ);
p[DIRSIZ] = 0;
if(stat(buf, &st) < 0){
- printf(1, "ls: cannot stat %s\n", buf);
+ printf("ls: cannot stat %s\n", buf);
continue;
}
- printf(1, "%s %d %d %d\n", fmtname(buf), st.type, st.ino, st.size);
+ printf("%s %d %d %d\n", fmtname(buf), st.type, st.ino, st.size);
}
break;
}
diff --git a/user/mkdir.c b/user/mkdir.c
index 5f1e155..6996ee9 100644
--- a/user/mkdir.c
+++ b/user/mkdir.c
@@ -8,13 +8,13 @@ main(int argc, char *argv[])
int i;
if(argc < 2){
- printf(2, "Usage: mkdir files...\n");
+ fprintf(2, "Usage: mkdir files...\n");
exit();
}
for(i = 1; i < argc; i++){
if(mkdir(argv[i]) < 0){
- printf(2, "mkdir: %s failed to create\n", argv[i]);
+ fprintf(2, "mkdir: %s failed to create\n", argv[i]);
break;
}
}
diff --git a/user/printf.c b/user/printf.c
index f3b3282..5c5c782 100644
--- a/user/printf.c
+++ b/user/printf.c
@@ -49,13 +49,11 @@ printptr(int fd, uint64 x) {
// Print to the given fd. Only understands %d, %x, %p, %s.
void
-printf(int fd, const char *fmt, ...)
+vprintf(int fd, const char *fmt, va_list ap)
{
- va_list ap;
char *s;
int c, i, state;
- va_start(ap, fmt);
state = 0;
for(i = 0; fmt[i]; i++){
c = fmt[i] & 0xff;
@@ -95,3 +93,21 @@ printf(int fd, const char *fmt, ...)
}
}
}
+
+void
+fprintf(int fd, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ vprintf(fd, fmt, ap);
+}
+
+void
+printf(const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ vprintf(1, fmt, ap);
+}
diff --git a/user/rm.c b/user/rm.c
index 3076d83..4abe295 100644
--- a/user/rm.c
+++ b/user/rm.c
@@ -8,13 +8,13 @@ main(int argc, char *argv[])
int i;
if(argc < 2){
- printf(2, "Usage: rm files...\n");
+ fprintf(2, "Usage: rm files...\n");
exit();
}
for(i = 1; i < argc; i++){
if(unlink(argv[i]) < 0){
- printf(2, "rm: %s failed to delete\n", argv[i]);
+ fprintf(2, "rm: %s failed to delete\n", argv[i]);
break;
}
}
diff --git a/user/sh.c b/user/sh.c
index 13c7883..c573c99 100644
--- a/user/sh.c
+++ b/user/sh.c
@@ -76,14 +76,14 @@ runcmd(struct cmd *cmd)
if(ecmd->argv[0] == 0)
exit();
exec(ecmd->argv[0], ecmd->argv);
- printf(2, "exec %s failed\n", ecmd->argv[0]);
+ fprintf(2, "exec %s failed\n", ecmd->argv[0]);
break;
case REDIR:
rcmd = (struct redircmd*)cmd;
close(rcmd->fd);
if(open(rcmd->file, rcmd->mode) < 0){
- printf(2, "open %s failed\n", rcmd->file);
+ fprintf(2, "open %s failed\n", rcmd->file);
exit();
}
runcmd(rcmd->cmd);
@@ -133,7 +133,7 @@ runcmd(struct cmd *cmd)
int
getcmd(char *buf, int nbuf)
{
- printf(2, "$ ");
+ fprintf(2, "$ ");
memset(buf, 0, nbuf);
gets(buf, nbuf);
if(buf[0] == 0) // EOF
@@ -161,7 +161,7 @@ main(void)
// Chdir must be called by the parent, not the child.
buf[strlen(buf)-1] = 0; // chop \n
if(chdir(buf+3) < 0)
- printf(2, "cannot cd %s\n", buf+3);
+ fprintf(2, "cannot cd %s\n", buf+3);
continue;
}
if(fork1() == 0)
@@ -174,7 +174,7 @@ main(void)
void
panic(char *s)
{
- printf(2, "%s\n", s);
+ fprintf(2, "%s\n", s);
exit();
}
@@ -334,7 +334,7 @@ parsecmd(char *s)
cmd = parseline(&s, es);
peek(&s, es, "");
if(s != es){
- printf(2, "leftovers: %s\n", s);
+ fprintf(2, "leftovers: %s\n", s);
panic("syntax");
}
nulterminate(cmd);
diff --git a/user/stressfs.c b/user/stressfs.c
index ef8f1cd..5edd7aa 100644
--- a/user/stressfs.c
+++ b/user/stressfs.c
@@ -20,14 +20,14 @@ main(int argc, char *argv[])
char path[] = "stressfs0";
char data[512];
- printf(1, "stressfs starting\n");
+ printf("stressfs starting\n");
memset(data, 'a', sizeof(data));
for(i = 0; i < 4; i++)
if(fork() > 0)
break;
- printf(1, "write %d\n", i);
+ printf("write %d\n", i);
path[8] += i;
fd = open(path, O_CREATE | O_RDWR);
@@ -36,7 +36,7 @@ main(int argc, char *argv[])
write(fd, data, sizeof(data));
close(fd);
- printf(1, "read\n");
+ printf("read\n");
fd = open(path, O_RDONLY);
for (i = 0; i < 20; i++)
diff --git a/user/user.h b/user/user.h
index 4f99c52..0e01b85 100644
--- a/user/user.h
+++ b/user/user.h
@@ -30,7 +30,8 @@ char* strcpy(char*, const char*);
void *memmove(void*, const void*, int);
char* strchr(const char*, char c);
int strcmp(const char*, const char*);
-void printf(int, const char*, ...);
+void fprintf(int, const char*, ...);
+void printf(const char*, ...);
char* gets(char*, int max);
uint strlen(const char*);
void* memset(void*, int, uint);
diff --git a/user/usertests.c b/user/usertests.c
index 285f161..641ac1c 100644
--- a/user/usertests.c
+++ b/user/usertests.c
@@ -13,31 +13,30 @@
char buf[BUFSZ];
char name[3];
char *echoargv[] = { "echo", "ALL", "TESTS", "PASSED", 0 };
-int stdout = 1;
// does chdir() call iput(p->cwd) in a transaction?
void
iputtest(void)
{
- printf(stdout, "iput test\n");
+ printf("iput test\n");
if(mkdir("iputdir") < 0){
- printf(stdout, "mkdir failed\n");
+ printf("mkdir failed\n");
exit();
}
if(chdir("iputdir") < 0){
- printf(stdout, "chdir iputdir failed\n");
+ printf("chdir iputdir failed\n");
exit();
}
if(unlink("../iputdir") < 0){
- printf(stdout, "unlink ../iputdir failed\n");
+ printf("unlink ../iputdir failed\n");
exit();
}
if(chdir("/") < 0){
- printf(stdout, "chdir / failed\n");
+ printf("chdir / failed\n");
exit();
}
- printf(stdout, "iput test ok\n");
+ printf("iput test ok\n");
}
// does exit() call iput(p->cwd) in a transaction?
@@ -46,30 +45,30 @@ exitiputtest(void)
{
int pid;
- printf(stdout, "exitiput test\n");
+ printf("exitiput test\n");
pid = fork();
if(pid < 0){
- printf(stdout, "fork failed\n");
+ printf("fork failed\n");
exit();
}
if(pid == 0){
if(mkdir("iputdir") < 0){
- printf(stdout, "mkdir failed\n");
+ printf("mkdir failed\n");
exit();
}
if(chdir("iputdir") < 0){
- printf(stdout, "child chdir failed\n");
+ printf("child chdir failed\n");
exit();
}
if(unlink("../iputdir") < 0){
- printf(stdout, "unlink ../iputdir failed\n");
+ printf("unlink ../iputdir failed\n");
exit();
}
exit();
}
wait();
- printf(stdout, "exitiput test ok\n");
+ printf("exitiput test ok\n");
}
// does the error path in open() for attempt to write a
@@ -88,31 +87,31 @@ openiputtest(void)
{
int pid;
- printf(stdout, "openiput test\n");
+ printf("openiput test\n");
if(mkdir("oidir") < 0){
- printf(stdout, "mkdir oidir failed\n");
+ printf("mkdir oidir failed\n");
exit();
}
pid = fork();
if(pid < 0){
- printf(stdout, "fork failed\n");
+ printf("fork failed\n");
exit();
}
if(pid == 0){
int fd = open("oidir", O_RDWR);
if(fd >= 0){
- printf(stdout, "open directory for write succeeded\n");
+ printf("open directory for write succeeded\n");
exit();
}
exit();
}
sleep(1);
if(unlink("oidir") != 0){
- printf(stdout, "unlink failed\n");
+ printf("unlink failed\n");
exit();
}
wait();
- printf(stdout, "openiput test ok\n");
+ printf("openiput test ok\n");
}
// simple file system tests
@@ -122,19 +121,19 @@ opentest(void)
{
int fd;
- printf(stdout, "open test\n");
+ printf("open test\n");
fd = open("echo", 0);
if(fd < 0){
- printf(stdout, "open echo failed!\n");
+ printf("open echo failed!\n");
exit();
}
close(fd);
fd = open("doesnotexist", 0);
if(fd >= 0){
- printf(stdout, "open doesnotexist succeeded!\n");
+ printf("open doesnotexist succeeded!\n");
exit();
}
- printf(stdout, "open test ok\n");
+ printf("open test ok\n");
}
void
@@ -144,47 +143,47 @@ writetest(void)
int i;
enum { N=100, SZ=10 };
- printf(stdout, "small file test\n");
+ printf("small file test\n");
fd = open("small", O_CREATE|O_RDWR);
if(fd >= 0){
- printf(stdout, "creat small succeeded; ok\n");
+ printf("creat small succeeded; ok\n");
} else {
- printf(stdout, "error: creat small failed!\n");
+ printf("error: creat small failed!\n");
exit();
}
for(i = 0; i < N; i++){
if(write(fd, "aaaaaaaaaa", SZ) != SZ){
- printf(stdout, "error: write aa %d new file failed\n", i);
+ printf("error: write aa %d new file failed\n", i);
exit();
}
if(write(fd, "bbbbbbbbbb", SZ) != SZ){
- printf(stdout, "error: write bb %d new file failed\n", i);
+ printf("error: write bb %d new file failed\n", i);
exit();
}
}
- printf(stdout, "writes ok\n");
+ printf("writes ok\n");
close(fd);
fd = open("small", O_RDONLY);
if(fd >= 0){
- printf(stdout, "open small succeeded ok\n");
+ printf("open small succeeded ok\n");
} else {
- printf(stdout, "error: open small failed!\n");
+ printf("error: open small failed!\n");
exit();
}
i = read(fd, buf, N*SZ*2);
if(i == N*SZ*2){
- printf(stdout, "read succeeded ok\n");
+ printf("read succeeded ok\n");
} else {
- printf(stdout, "read failed\n");
+ printf("read failed\n");
exit();
}
close(fd);
if(unlink("small") < 0){
- printf(stdout, "unlink small failed\n");
+ printf("unlink small failed\n");
exit();
}
- printf(stdout, "small file test ok\n");
+ printf("small file test ok\n");
}
void
@@ -192,18 +191,18 @@ writetest1(void)
{
int i, fd, n;
- printf(stdout, "big files test\n");
+ printf("big files test\n");
fd = open("big", O_CREATE|O_RDWR);
if(fd < 0){
- printf(stdout, "error: creat big failed!\n");
+ printf("error: creat big failed!\n");
exit();
}
for(i = 0; i < MAXFILE; i++){
((int*)buf)[0] = i;
if(write(fd, buf, BSIZE) != BSIZE){
- printf(stdout, "error: write big file failed\n", i);
+ printf("error: write big file failed\n", i);
exit();
}
}
@@ -212,7 +211,7 @@ writetest1(void)
fd = open("big", O_RDONLY);
if(fd < 0){
- printf(stdout, "error: open big failed!\n");
+ printf("error: open big failed!\n");
exit();
}
@@ -221,16 +220,16 @@ writetest1(void)
i = read(fd, buf, BSIZE);
if(i == 0){
if(n == MAXFILE - 1){
- printf(stdout, "read only %d blocks from big", n);
+ printf("read only %d blocks from big", n);
exit();
}
break;
} else if(i != BSIZE){
- printf(stdout, "read failed %d\n", i);
+ printf("read failed %d\n", i);
exit();
}
if(((int*)buf)[0] != n){
- printf(stdout, "read content of block %d is %d\n",
+ printf("read content of block %d is %d\n",
n, ((int*)buf)[0]);
exit();
}
@@ -238,10 +237,10 @@ writetest1(void)
}
close(fd);
if(unlink("big") < 0){
- printf(stdout, "unlink big failed\n");
+ printf("unlink big failed\n");
exit();
}
- printf(stdout, "big files ok\n");
+ printf("big files ok\n");
}
void
@@ -250,7 +249,7 @@ createtest(void)
int i, fd;
enum { N=52 };
- printf(stdout, "many creates, followed by unlink test\n");
+ printf("many creates, followed by unlink test\n");
name[0] = 'a';
name[2] = '\0';
@@ -265,41 +264,41 @@ createtest(void)
name[1] = '0' + i;
unlink(name);
}
- printf(stdout, "many creates, followed by unlink; ok\n");
+ printf("many creates, followed by unlink; ok\n");
}
void dirtest(void)
{
- printf(stdout, "mkdir test\n");
+ printf("mkdir test\n");
if(mkdir("dir0") < 0){
- printf(stdout, "mkdir failed\n");
+ printf("mkdir failed\n");
exit();
}
if(chdir("dir0") < 0){
- printf(stdout, "chdir dir0 failed\n");
+ printf("chdir dir0 failed\n");
exit();
}
if(chdir("..") < 0){
- printf(stdout, "chdir .. failed\n");
+ printf("chdir .. failed\n");
exit();
}
if(unlink("dir0") < 0){
- printf(stdout, "unlink dir0 failed\n");
+ printf("unlink dir0 failed\n");
exit();
}
- printf(stdout, "mkdir test ok\n");
+ printf("mkdir test ok\n");
}
void
exectest(void)
{
- printf(stdout, "exec test\n");
+ printf("exec test\n");
if(exec("echo", echoargv) < 0){
- printf(stdout, "exec echo failed\n");
+ printf("exec echo failed\n");
exit();
}
}
@@ -314,7 +313,7 @@ pipe1(void)
enum { N=5, SZ=1033 };
if(pipe(fds) != 0){
- printf(1, "pipe() failed\n");
+ printf("pipe() failed\n");
exit();
}
pid = fork();
@@ -325,7 +324,7 @@ pipe1(void)
for(i = 0; i < SZ; i++)
buf[i] = seq++;
if(write(fds[1], buf, SZ) != SZ){
- printf(1, "pipe1 oops 1\n");
+ printf("pipe1 oops 1\n");
exit();
}
}
@@ -337,7 +336,7 @@ pipe1(void)
while((n = read(fds[0], buf, cc)) > 0){
for(i = 0; i < n; i++){
if((buf[i] & 0xff) != (seq++ & 0xff)){
- printf(1, "pipe1 oops 2\n");
+ printf("pipe1 oops 2\n");
return;
}
}
@@ -347,16 +346,16 @@ pipe1(void)
cc = sizeof(buf);
}
if(total != N * SZ){
- printf(1, "pipe1 oops 3 total %d\n", total);
+ printf("pipe1 oops 3 total %d\n", total);
exit();
}
close(fds[0]);
wait();
} else {
- printf(1, "fork() failed\n");
+ printf("fork() failed\n");
exit();
}
- printf(1, "pipe1 ok\n");
+ printf("pipe1 ok\n");
}
// meant to be run w/ at most two CPUs
@@ -366,10 +365,10 @@ preempt(void)
int pid1, pid2, pid3;
int pfds[2];
- printf(1, "preempt: ");
+ printf("preempt: ");
pid1 = fork();
if(pid1 < 0) {
- printf(1, "fork failed");
+ printf("fork failed");
exit();
}
if(pid1 == 0)
@@ -378,7 +377,7 @@ preempt(void)
pid2 = fork();
if(pid2 < 0) {
- printf(1, "fork failed\n");
+ printf("fork failed\n");
exit();
}
if(pid2 == 0)
@@ -388,13 +387,13 @@ preempt(void)
pipe(pfds);
pid3 = fork();
if(pid3 < 0) {
- printf(1, "fork failed\n");
+ printf("fork failed\n");
exit();
}
if(pid3 == 0){
close(pfds[0]);
if(write(pfds[1], "x", 1) != 1)
- printf(1, "preempt write error");
+ printf("preempt write error");
close(pfds[1]);
for(;;)
;
@@ -402,19 +401,19 @@ preempt(void)
close(pfds[1]);
if(read(pfds[0], buf, sizeof(buf)) != 1){
- printf(1, "preempt read error");
+ printf("preempt read error");
return;
}
close(pfds[0]);
- printf(1, "kill... ");
+ printf("kill... ");
kill(pid1);
kill(pid2);
kill(pid3);
- printf(1, "wait... ");
+ printf("wait... ");
wait();
wait();
wait();
- printf(1, "preempt ok\n");
+ printf("preempt ok\n");
}
// try to find any races between exit and wait
@@ -423,24 +422,24 @@ exitwait(void)
{
int i, pid;
- printf(1, "exitwait test\n");
+ printf("exitwait test\n");
for(i = 0; i < 100; i++){
pid = fork();
if(pid < 0){
- printf(1, "fork failed\n");
+ printf("fork failed\n");
exit();
}
if(pid){
if(wait() != pid){
- printf(1, "wait wrong pid\n");
+ printf("wait wrong pid\n");
exit();
}
} else {
exit();
}
}
- printf(1, "exitwait ok\n");
+ printf("exitwait ok\n");
}
// try to find races in the reparenting
@@ -451,23 +450,23 @@ reparent(void)
{
int master_pid = getpid();
- printf(1, "reparent test\n");
+ printf("reparent test\n");
for(int i = 0; i < 200; i++){
int pid = fork();
if(pid < 0){
- printf(1, "fork failed\n");
+ printf("fork failed\n");
exit();
}
if(pid){
if(wait() != pid){
- printf(1, "wait wrong pid\n");
+ printf("wait wrong pid\n");
exit();
}
} else {
int pid2 = fork();
if(pid2 < 0){
- printf(1, "fork failed\n");
+ printf("fork failed\n");
kill(master_pid);
exit();
}
@@ -478,19 +477,19 @@ reparent(void)
}
}
}
- printf(1, "reparent ok\n");
+ printf("reparent ok\n");
}
// what if two children exit() at the same time?
void
twochildren(void)
{
- printf(1, "twochildren test\n");
+ printf("twochildren test\n");
for(int i = 0; i < 1000; i++){
int pid1 = fork();
if(pid1 < 0){
- printf(1, "fork failed\n");
+ printf("fork failed\n");
exit();
}
if(pid1 == 0){
@@ -498,7 +497,7 @@ twochildren(void)
} else {
int pid2 = fork();
if(pid2 < 0){
- printf(1, "fork failed\n");
+ printf("fork failed\n");
exit();
}
if(pid2 == 0){
@@ -509,7 +508,7 @@ twochildren(void)
}
}
}
- printf(1, "twochildren ok\n");
+ printf("twochildren ok\n");
}
// concurrent forks to try to expose locking bugs.
@@ -519,19 +518,19 @@ forkfork(void)
int ppid = getpid();
enum { N=2 };
- printf(1, "forkfork test\n");
+ printf("forkfork test\n");
for(int i = 0; i < N; i++){
int pid = fork();
if(pid < 0){
- printf(1, "fork failed");
+ printf("fork failed");
exit();
}
if(pid == 0){
for(int j = 0; j < 200; j++){
int pid1 = fork();
if(pid1 < 0){
- printf(1, "fork failed\n");
+ printf("fork failed\n");
kill(ppid);
exit();
}
@@ -548,19 +547,19 @@ forkfork(void)
wait();
}
- printf(1, "forkfork ok\n");
+ printf("forkfork ok\n");
}
void
forkforkfork(void)
{
- printf(1, "forkforkfork test\n");
+ printf("forkforkfork test\n");
unlink("stopforking");
int pid = fork();
if(pid < 0){
- printf(1, "fork failed");
+ printf("fork failed");
exit();
}
if(pid == 0){
@@ -582,7 +581,7 @@ forkforkfork(void)
wait();
sleep(10); // one second
- printf(1, "forkforkfork ok\n");
+ printf("forkforkfork ok\n");
}
void
@@ -591,7 +590,7 @@ mem(void)
void *m1, *m2;
int pid, ppid;
- printf(1, "mem test\n");
+ printf("mem test\n");
ppid = getpid();
if((pid = fork()) == 0){
m1 = 0;
@@ -606,12 +605,12 @@ mem(void)
}
m1 = malloc(1024*20);
if(m1 == 0){
- printf(1, "couldn't allocate mem?!!\n");
+ printf("couldn't allocate mem?!!\n");
kill(ppid);
exit();
}
free(m1);
- printf(1, "mem ok\n");
+ printf("mem ok\n");
exit();
} else {
wait();
@@ -629,19 +628,19 @@ sharedfd(void)
enum { N = 1000, SZ=10};
char buf[SZ];
- printf(1, "sharedfd test\n");
+ printf("sharedfd test\n");
unlink("sharedfd");
fd = open("sharedfd", O_CREATE|O_RDWR);
if(fd < 0){
- printf(1, "fstests: cannot open sharedfd for writing");
+ printf("fstests: cannot open sharedfd for writing");
return;
}
pid = fork();
memset(buf, pid==0?'c':'p', sizeof(buf));
for(i = 0; i < N; i++){
if(write(fd, buf, sizeof(buf)) != sizeof(buf)){
- printf(1, "fstests: write sharedfd failed\n");
+ printf("fstests: write sharedfd failed\n");
break;
}
}
@@ -652,7 +651,7 @@ sharedfd(void)
close(fd);
fd = open("sharedfd", 0);
if(fd < 0){
- printf(1, "fstests: cannot open sharedfd for reading\n");
+ printf("fstests: cannot open sharedfd for reading\n");
return;
}
nc = np = 0;
@@ -667,9 +666,9 @@ sharedfd(void)
close(fd);
unlink("sharedfd");
if(nc == N*SZ && np == N*SZ){
- printf(1, "sharedfd ok\n");
+ printf("sharedfd ok\n");
} else {
- printf(1, "sharedfd oops %d %d\n", nc, np);
+ printf("sharedfd oops %d %d\n", nc, np);
exit();
}
}
@@ -684,7 +683,7 @@ fourfiles(void)
char *fname;
enum { N=12, NCHILD=4, SZ=500 };
- printf(1, "fourfiles test\n");
+ printf("fourfiles test\n");
for(pi = 0; pi < NCHILD; pi++){
fname = names[pi];
@@ -692,21 +691,21 @@ fourfiles(void)
pid = fork();
if(pid < 0){
- printf(1, "fork failed\n");
+ printf("fork failed\n");
exit();
}
if(pid == 0){
fd = open(fname, O_CREATE | O_RDWR);
if(fd < 0){
- printf(1, "create failed\n");
+ printf("create failed\n");
exit();
}
memset(buf, '0'+pi, SZ);
for(i = 0; i < N; i++){
if((n = write(fd, buf, SZ)) != SZ){
- printf(1, "write failed %d\n", n);
+ printf("write failed %d\n", n);
exit();
}
}
@@ -725,7 +724,7 @@ fourfiles(void)
while((n = read(fd, buf, sizeof(buf))) > 0){
for(j = 0; j < n; j++){
if(buf[j] != '0'+i){
- printf(1, "wrong char\n");
+ printf("wrong char\n");
exit();
}
}
@@ -733,13 +732,13 @@ fourfiles(void)
}
close(fd);
if(total != N*SZ){
- printf(1, "wrong length %d\n", total);
+ printf("wrong length %d\n", total);
exit();
}
unlink(fname);
}
- printf(1, "fourfiles ok\n");
+ printf("fourfiles ok\n");
}
// four processes create and delete different files in same directory
@@ -750,12 +749,12 @@ createdelete(void)
int pid, i, fd, pi;
char name[32];
- printf(1, "createdelete test\n");
+ printf("createdelete test\n");
for(pi = 0; pi < NCHILD; pi++){
pid = fork();
if(pid < 0){
- printf(1, "fork failed\n");
+ printf("fork failed\n");
exit();
}
@@ -766,14 +765,14 @@ createdelete(void)
name[1] = '0' + i;
fd = open(name, O_CREATE | O_RDWR);
if(fd < 0){
- printf(1, "create failed\n");
+ printf("create failed\n");
exit();
}
close(fd);
if(i > 0 && (i % 2 ) == 0){
name[1] = '0' + (i / 2);
if(unlink(name) < 0){
- printf(1, "unlink failed\n");
+ printf("unlink failed\n");
exit();
}
}
@@ -793,10 +792,10 @@ createdelete(void)
name[1] = '0' + i;
fd = open(name, 0);
if((i == 0 || i >= N/2) && fd < 0){
- printf(1, "oops createdelete %s didn't exist\n", name);
+ printf("oops createdelete %s didn't exist\n", name);
exit();
} else if((i >= 1 && i < N/2) && fd >= 0){
- printf(1, "oops createdelete %s did exist\n", name);
+ printf("oops createdelete %s did exist\n", name);
exit();
}
if(fd >= 0)
@@ -812,7 +811,7 @@ createdelete(void)
}
}
- printf(1, "createdelete ok\n");
+ printf("createdelete ok\n");
}
// can I unlink a file and still read it?
@@ -822,10 +821,10 @@ unlinkread(void)
enum { SZ = 5 };
int fd, fd1;
- printf(1, "unlinkread test\n");
+ printf("unlinkread test\n");
fd = open("unlinkread", O_CREATE | O_RDWR);
if(fd < 0){
- printf(1, "create unlinkread failed\n");
+ printf("create unlinkread failed\n");
exit();
}
write(fd, "hello", SZ);
@@ -833,11 +832,11 @@ unlinkread(void)
fd = open("unlinkread", O_RDWR);
if(fd < 0){
- printf(1, "open unlinkread failed\n");
+ printf("open unlinkread failed\n");
exit();
}
if(unlink("unlinkread") != 0){
- printf(1, "unlink unlinkread failed\n");
+ printf("unlink unlinkread failed\n");
exit();
}
@@ -846,20 +845,20 @@ unlinkread(void)
close(fd1);
if(read(fd, buf, sizeof(buf)) != SZ){
- printf(1, "unlinkread read failed");
+ printf("unlinkread read failed");
exit();
}
if(buf[0] != 'h'){
- printf(1, "unlinkread wrong data\n");
+ printf("unlinkread wrong data\n");
exit();
}
if(write(fd, buf, 10) != 10){
- printf(1, "unlinkread write failed\n");
+ printf("unlinkread write failed\n");
exit();
}
close(fd);
unlink("unlinkread");
- printf(1, "unlinkread ok\n");
+ printf("unlinkread ok\n");
}
void
@@ -868,61 +867,61 @@ linktest(void)
enum { SZ = 5 };
int fd;
- printf(1, "linktest\n");
+ printf("linktest\n");
unlink("lf1");
unlink("lf2");
fd = open("lf1", O_CREATE|O_RDWR);
if(fd < 0){
- printf(1, "create lf1 failed\n");
+ printf("create lf1 failed\n");
exit();
}
if(write(fd, "hello", SZ) != SZ){
- printf(1, "write lf1 failed\n");
+ printf("write lf1 failed\n");
exit();
}
close(fd);
if(link("lf1", "lf2") < 0){
- printf(1, "link lf1 lf2 failed\n");
+ printf("link lf1 lf2 failed\n");
exit();
}
unlink("lf1");
if(open("lf1", 0) >= 0){
- printf(1, "unlinked lf1 but it is still there!\n");
+ printf("unlinked lf1 but it is still there!\n");
exit();
}
fd = open("lf2", 0);
if(fd < 0){
- printf(1, "open lf2 failed\n");
+ printf("open lf2 failed\n");
exit();
}
if(read(fd, buf, sizeof(buf)) != SZ){
- printf(1, "read lf2 failed\n");
+ printf("read lf2 failed\n");
exit();
}
close(fd);
if(link("lf2", "lf2") >= 0){
- printf(1, "link lf2 lf2 succeeded! oops\n");
+ printf("link lf2 lf2 succeeded! oops\n");
exit();
}
unlink("lf2");
if(link("lf2", "lf1") >= 0){
- printf(1, "link non-existant succeeded! oops\n");
+ printf("link non-existant succeeded! oops\n");
exit();
}
if(link(".", "lf1") >= 0){
- printf(1, "link . lf1 succeeded! oops\n");
+ printf("link . lf1 succeeded! oops\n");
exit();
}
- printf(1, "linktest ok\n");
+ printf("linktest ok\n");
}
// test concurrent create/link/unlink of the same file
@@ -938,7 +937,7 @@ concreate(void)
char name[DIRSIZ];
} de;
- printf(1, "concreate test\n");
+ printf("concreate test\n");
file[0] = 'C';
file[2] = '\0';
for(i = 0; i < N; i++){
@@ -952,7 +951,7 @@ concreate(void)
} else {
fd = open(file, O_CREATE | O_RDWR);
if(fd < 0){
- printf(1, "concreate create %s failed\n", file);
+ printf("concreate create %s failed\n", file);
exit();
}
close(fd);
@@ -972,11 +971,11 @@ concreate(void)
if(de.name[0] == 'C' && de.name[2] == '\0'){
i = de.name[1] - '0';
if(i < 0 || i >= sizeof(fa)){
- printf(1, "concreate weird file %s\n", de.name);
+ printf("concreate weird file %s\n", de.name);
exit();
}
if(fa[i]){
- printf(1, "concreate duplicate file %s\n", de.name);
+ printf("concreate duplicate file %s\n", de.name);
exit();
}
fa[i] = 1;
@@ -986,7 +985,7 @@ concreate(void)
close(fd);
if(n != N){
- printf(1, "concreate not enough files in directory listing\n");
+ printf("concreate not enough files in directory listing\n");
exit();
}
@@ -994,7 +993,7 @@ concreate(void)
file[1] = '0' + i;
pid = fork();
if(pid < 0){
- printf(1, "fork failed\n");
+ printf("fork failed\n");
exit();
}
if(((i % 3) == 0 && pid == 0) ||
@@ -1015,7 +1014,7 @@ concreate(void)
wait();
}
- printf(1, "concreate ok\n");
+ printf("concreate ok\n");
}
// another concurrent link/unlink/create test,
@@ -1025,12 +1024,12 @@ linkunlink()
{
int pid, i;
- printf(1, "linkunlink test\n");
+ printf("linkunlink test\n");
unlink("x");
pid = fork();
if(pid < 0){
- printf(1, "fork failed\n");
+ printf("fork failed\n");
exit();
}
@@ -1051,7 +1050,7 @@ linkunlink()
else
exit();
- printf(1, "linkunlink ok\n");
+ printf("linkunlink ok\n");
}
// directory that uses indirect blocks
@@ -1062,12 +1061,12 @@ bigdir(void)
int i, fd;
char name[10];
- printf(1, "bigdir test\n");
+ printf("bigdir test\n");
unlink("bd");
fd = open("bd", O_CREATE);
if(fd < 0){
- printf(1, "bigdir create failed\n");
+ printf("bigdir create failed\n");
exit();
}
close(fd);
@@ -1078,7 +1077,7 @@ bigdir(void)
name[2] = '0' + (i % 64);
name[3] = '\0';
if(link("bd", name) != 0){
- printf(1, "bigdir link failed\n");
+ printf("bigdir link failed\n");
exit();
}
}
@@ -1090,12 +1089,12 @@ bigdir(void)
name[2] = '0' + (i % 64);
name[3] = '\0';
if(unlink(name) != 0){
- printf(1, "bigdir unlink failed");
+ printf("bigdir unlink failed");
exit();
}
}
- printf(1, "bigdir ok\n");
+ printf("bigdir ok\n");
}
void
@@ -1103,35 +1102,35 @@ subdir(void)
{
int fd, cc;
- printf(1, "subdir test\n");
+ printf("subdir test\n");
unlink("ff");
if(mkdir("dd") != 0){
- printf(1, "subdir mkdir dd failed\n");
+ printf("subdir mkdir dd failed\n");
exit();
}
fd = open("dd/ff", O_CREATE | O_RDWR);
if(fd < 0){
- printf(1, "create dd/ff failed\n");
+ printf("create dd/ff failed\n");
exit();
}
write(fd, "ff", 2);
close(fd);
if(unlink("dd") >= 0){
- printf(1, "unlink dd (non-empty dir) succeeded!\n");
+ printf("unlink dd (non-empty dir) succeeded!\n");
exit();
}
if(mkdir("/dd/dd") != 0){
- printf(1, "subdir mkdir dd/dd failed\n");
+ printf("subdir mkdir dd/dd failed\n");
exit();
}
fd = open("dd/dd/ff", O_CREATE | O_RDWR);
if(fd < 0){
- printf(1, "create dd/dd/ff failed\n");
+ printf("create dd/dd/ff failed\n");
exit();
}
write(fd, "FF", 2);
@@ -1139,146 +1138,146 @@ subdir(void)
fd = open("dd/dd/../ff", 0);
if(fd < 0){
- printf(1, "open dd/dd/../ff failed\n");
+ printf("open dd/dd/../ff failed\n");
exit();
}
cc = read(fd, buf, sizeof(buf));
if(cc != 2 || buf[0] != 'f'){
- printf(1, "dd/dd/../ff wrong content\n");
+ printf("dd/dd/../ff wrong content\n");
exit();
}
close(fd);
if(link("dd/dd/ff", "dd/dd/ffff") != 0){
- printf(1, "link dd/dd/ff dd/dd/ffff failed\n");
+ printf("link dd/dd/ff dd/dd/ffff failed\n");
exit();
}
if(unlink("dd/dd/ff") != 0){
- printf(1, "unlink dd/dd/ff failed\n");
+ printf("unlink dd/dd/ff failed\n");
exit();
}
if(open("dd/dd/ff", O_RDONLY) >= 0){
- printf(1, "open (unlinked) dd/dd/ff succeeded\n");
+ printf("open (unlinked) dd/dd/ff succeeded\n");
exit();
}
if(chdir("dd") != 0){
- printf(1, "chdir dd failed\n");
+ printf("chdir dd failed\n");
exit();
}
if(chdir("dd/../../dd") != 0){
- printf(1, "chdir dd/../../dd failed\n");
+ printf("chdir dd/../../dd failed\n");
exit();
}
if(chdir("dd/../../../dd") != 0){
- printf(1, "chdir dd/../../dd failed\n");
+ printf("chdir dd/../../dd failed\n");
exit();
}
if(chdir("./..") != 0){
- printf(1, "chdir ./.. failed\n");
+ printf("chdir ./.. failed\n");
exit();
}
fd = open("dd/dd/ffff", 0);
if(fd < 0){
- printf(1, "open dd/dd/ffff failed\n");
+ printf("open dd/dd/ffff failed\n");
exit();
}
if(read(fd, buf, sizeof(buf)) != 2){
- printf(1, "read dd/dd/ffff wrong len\n");
+ printf("read dd/dd/ffff wrong len\n");
exit();
}
close(fd);
if(open("dd/dd/ff", O_RDONLY) >= 0){
- printf(1, "open (unlinked) dd/dd/ff succeeded!\n");
+ printf("open (unlinked) dd/dd/ff succeeded!\n");
exit();
}
if(open("dd/ff/ff", O_CREATE|O_RDWR) >= 0){
- printf(1, "create dd/ff/ff succeeded!\n");
+ printf("create dd/ff/ff succeeded!\n");
exit();
}
if(open("dd/xx/ff", O_CREATE|O_RDWR) >= 0){
- printf(1, "create dd/xx/ff succeeded!\n");
+ printf("create dd/xx/ff succeeded!\n");
exit();
}
if(open("dd", O_CREATE) >= 0){
- printf(1, "create dd succeeded!\n");
+ printf("create dd succeeded!\n");
exit();
}
if(open("dd", O_RDWR) >= 0){
- printf(1, "open dd rdwr succeeded!\n");
+ printf("open dd rdwr succeeded!\n");
exit();
}
if(open("dd", O_WRONLY) >= 0){
- printf(1, "open dd wronly succeeded!\n");
+ printf("open dd wronly succeeded!\n");
exit();
}
if(link("dd/ff/ff", "dd/dd/xx") == 0){
- printf(1, "link dd/ff/ff dd/dd/xx succeeded!\n");
+ printf("link dd/ff/ff dd/dd/xx succeeded!\n");
exit();
}
if(link("dd/xx/ff", "dd/dd/xx") == 0){
- printf(1, "link dd/xx/ff dd/dd/xx succeeded!\n");
+ printf("link dd/xx/ff dd/dd/xx succeeded!\n");
exit();
}
if(link("dd/ff", "dd/dd/ffff") == 0){
- printf(1, "link dd/ff dd/dd/ffff succeeded!\n");
+ printf("link dd/ff dd/dd/ffff succeeded!\n");
exit();
}
if(mkdir("dd/ff/ff") == 0){
- printf(1, "mkdir dd/ff/ff succeeded!\n");
+ printf("mkdir dd/ff/ff succeeded!\n");
exit();
}
if(mkdir("dd/xx/ff") == 0){
- printf(1, "mkdir dd/xx/ff succeeded!\n");
+ printf("mkdir dd/xx/ff succeeded!\n");
exit();
}
if(mkdir("dd/dd/ffff") == 0){
- printf(1, "mkdir dd/dd/ffff succeeded!\n");
+ printf("mkdir dd/dd/ffff succeeded!\n");
exit();
}
if(unlink("dd/xx/ff") == 0){
- printf(1, "unlink dd/xx/ff succeeded!\n");
+ printf("unlink dd/xx/ff succeeded!\n");
exit();
}
if(unlink("dd/ff/ff") == 0){
- printf(1, "unlink dd/ff/ff succeeded!\n");
+ printf("unlink dd/ff/ff succeeded!\n");
exit();
}
if(chdir("dd/ff") == 0){
- printf(1, "chdir dd/ff succeeded!\n");
+ printf("chdir dd/ff succeeded!\n");
exit();
}
if(chdir("dd/xx") == 0){
- printf(1, "chdir dd/xx succeeded!\n");
+ printf("chdir dd/xx succeeded!\n");
exit();
}
if(unlink("dd/dd/ffff") != 0){
- printf(1, "unlink dd/dd/ff failed\n");
+ printf("unlink dd/dd/ff failed\n");
exit();
}
if(unlink("dd/ff") != 0){
- printf(1, "unlink dd/ff failed\n");
+ printf("unlink dd/ff failed\n");
exit();
}
if(unlink("dd") == 0){
- printf(1, "unlink non-empty dd succeeded!\n");
+ printf("unlink non-empty dd succeeded!\n");
exit();
}
if(unlink("dd/dd") < 0){
- printf(1, "unlink dd/dd failed\n");
+ printf("unlink dd/dd failed\n");
exit();
}
if(unlink("dd") < 0){
- printf(1, "unlink dd failed\n");
+ printf("unlink dd failed\n");
exit();
}
- printf(1, "subdir ok\n");
+ printf("subdir ok\n");
}
// test writes that are larger than the log.
@@ -1287,20 +1286,20 @@ bigwrite(void)
{
int fd, sz;
- printf(1, "bigwrite test\n");
+ printf("bigwrite test\n");
unlink("bigwrite");
for(sz = 499; sz < (MAXOPBLOCKS+2)*BSIZE; sz += 471){
fd = open("bigwrite", O_CREATE | O_RDWR);
if(fd < 0){
- printf(1, "cannot create bigwrite\n");
+ printf("cannot create bigwrite\n");
exit();
}
int i;
for(i = 0; i < 2; i++){
int cc = write(fd, buf, sz);
if(cc != sz){
- printf(1, "write(%d) ret %d\n", sz, cc);
+ printf("write(%d) ret %d\n", sz, cc);
exit();
}
}
@@ -1308,7 +1307,7 @@ bigwrite(void)
unlink("bigwrite");
}
- printf(1, "bigwrite ok\n");
+ printf("bigwrite ok\n");
}
void
@@ -1317,18 +1316,18 @@ bigfile(void)
enum { N = 20, SZ=600 };
int fd, i, total, cc;
- printf(1, "bigfile test\n");
+ printf("bigfile test\n");
unlink("bigfile");
fd = open("bigfile", O_CREATE | O_RDWR);
if(fd < 0){
- printf(1, "cannot create bigfile");
+ printf("cannot create bigfile");
exit();
}
for(i = 0; i < N; i++){
memset(buf, i, SZ);
if(write(fd, buf, SZ) != SZ){
- printf(1, "write bigfile failed\n");
+ printf("write bigfile failed\n");
exit();
}
}
@@ -1336,36 +1335,36 @@ bigfile(void)
fd = open("bigfile", 0);
if(fd < 0){
- printf(1, "cannot open bigfile\n");
+ printf("cannot open bigfile\n");
exit();
}
total = 0;
for(i = 0; ; i++){
cc = read(fd, buf, SZ/2);
if(cc < 0){
- printf(1, "read bigfile failed\n");
+ printf("read bigfile failed\n");
exit();
}
if(cc == 0)
break;
if(cc != SZ/2){
- printf(1, "short read bigfile\n");
+ printf("short read bigfile\n");
exit();
}
if(buf[0] != i/2 || buf[SZ/2-1] != i/2){
- printf(1, "read bigfile wrong data\n");
+ printf("read bigfile wrong data\n");
exit();
}
total += cc;
}
close(fd);
if(total != N*SZ){
- printf(1, "read bigfile wrong total\n");
+ printf("read bigfile wrong total\n");
exit();
}
unlink("bigfile");
- printf(1, "bigfile test ok\n");
+ printf("bigfile test ok\n");
}
void
@@ -1374,78 +1373,78 @@ fourteen(void)
int fd;
// DIRSIZ is 14.
- printf(1, "fourteen test\n");
+ printf("fourteen test\n");
if(mkdir("12345678901234") != 0){
- printf(1, "mkdir 12345678901234 failed\n");
+ printf("mkdir 12345678901234 failed\n");
exit();
}
if(mkdir("12345678901234/123456789012345") != 0){
- printf(1, "mkdir 12345678901234/123456789012345 failed\n");
+ printf("mkdir 12345678901234/123456789012345 failed\n");
exit();
}
fd = open("123456789012345/123456789012345/123456789012345", O_CREATE);
if(fd < 0){
- printf(1, "create 123456789012345/123456789012345/123456789012345 failed\n");
+ printf("create 123456789012345/123456789012345/123456789012345 failed\n");
exit();
}
close(fd);
fd = open("12345678901234/12345678901234/12345678901234", 0);
if(fd < 0){
- printf(1, "open 12345678901234/12345678901234/12345678901234 failed\n");
+ printf("open 12345678901234/12345678901234/12345678901234 failed\n");
exit();
}
close(fd);
if(mkdir("12345678901234/12345678901234") == 0){
- printf(1, "mkdir 12345678901234/12345678901234 succeeded!\n");
+ printf("mkdir 12345678901234/12345678901234 succeeded!\n");
exit();
}
if(mkdir("123456789012345/12345678901234") == 0){
- printf(1, "mkdir 12345678901234/123456789012345 succeeded!\n");
+ printf("mkdir 12345678901234/123456789012345 succeeded!\n");
exit();
}
- printf(1, "fourteen ok\n");
+ printf("fourteen ok\n");
}
void
rmdot(void)
{
- printf(1, "rmdot test\n");
+ printf("rmdot test\n");
if(mkdir("dots") != 0){
- printf(1, "mkdir dots failed\n");
+ printf("mkdir dots failed\n");
exit();
}
if(chdir("dots") != 0){
- printf(1, "chdir dots failed\n");
+ printf("chdir dots failed\n");
exit();
}
if(unlink(".") == 0){
- printf(1, "rm . worked!\n");
+ printf("rm . worked!\n");
exit();
}
if(unlink("..") == 0){
- printf(1, "rm .. worked!\n");
+ printf("rm .. worked!\n");
exit();
}
if(chdir("/") != 0){
- printf(1, "chdir / failed\n");
+ printf("chdir / failed\n");
exit();
}
if(unlink("dots/.") == 0){
- printf(1, "unlink dots/. worked!\n");
+ printf("unlink dots/. worked!\n");
exit();
}
if(unlink("dots/..") == 0){
- printf(1, "unlink dots/.. worked!\n");
+ printf("unlink dots/.. worked!\n");
exit();
}
if(unlink("dots") != 0){
- printf(1, "unlink dots failed!\n");
+ printf("unlink dots failed!\n");
exit();
}
- printf(1, "rmdot ok\n");
+ printf("rmdot ok\n");
}
void
@@ -1453,58 +1452,58 @@ dirfile(void)
{
int fd;
- printf(1, "dir vs file\n");
+ printf("dir vs file\n");
fd = open("dirfile", O_CREATE);
if(fd < 0){
- printf(1, "create dirfile failed\n");
+ printf("create dirfile failed\n");
exit();
}
close(fd);
if(chdir("dirfile") == 0){
- printf(1, "chdir dirfile succeeded!\n");
+ printf("chdir dirfile succeeded!\n");
exit();
}
fd = open("dirfile/xx", 0);
if(fd >= 0){
- printf(1, "create dirfile/xx succeeded!\n");
+ printf("create dirfile/xx succeeded!\n");
exit();
}
fd = open("dirfile/xx", O_CREATE);
if(fd >= 0){
- printf(1, "create dirfile/xx succeeded!\n");
+ printf("create dirfile/xx succeeded!\n");
exit();
}
if(mkdir("dirfile/xx") == 0){
- printf(1, "mkdir dirfile/xx succeeded!\n");
+ printf("mkdir dirfile/xx succeeded!\n");
exit();
}
if(unlink("dirfile/xx") == 0){
- printf(1, "unlink dirfile/xx succeeded!\n");
+ printf("unlink dirfile/xx succeeded!\n");
exit();
}
if(link("README", "dirfile/xx") == 0){
- printf(1, "link to dirfile/xx succeeded!\n");
+ printf("link to dirfile/xx succeeded!\n");
exit();
}
if(unlink("dirfile") != 0){
- printf(1, "unlink dirfile failed!\n");
+ printf("unlink dirfile failed!\n");
exit();
}
fd = open(".", O_RDWR);
if(fd >= 0){
- printf(1, "open . for writing succeeded!\n");
+ printf("open . for writing succeeded!\n");
exit();
}
fd = open(".", 0);
if(write(fd, "x", 1) > 0){
- printf(1, "write . succeeded!\n");
+ printf("write . succeeded!\n");
exit();
}
close(fd);
- printf(1, "dir vs file OK\n");
+ printf("dir vs file OK\n");
}
// test that iput() is called at the end of _namei()
@@ -1513,15 +1512,15 @@ iref(void)
{
int i, fd;
- printf(1, "empty file name\n");
+ printf("empty file name\n");
for(i = 0; i < NINODE + 1; i++){
if(mkdir("irefd") != 0){
- printf(1, "mkdir irefd failed\n");
+ printf("mkdir irefd failed\n");
exit();
}
if(chdir("irefd") != 0){
- printf(1, "chdir irefd failed\n");
+ printf("chdir irefd failed\n");
exit();
}
@@ -1537,7 +1536,7 @@ iref(void)
}
chdir("/");
- printf(1, "empty file name OK\n");
+ printf("empty file name OK\n");
}
// test that fork fails gracefully
@@ -1549,7 +1548,7 @@ forktest(void)
enum{ N = 1000 };
int n, pid;
- printf(1, "fork test\n");
+ printf("fork test\n");
for(n=0; n<N; n++){
pid = fork();
@@ -1560,28 +1559,28 @@ forktest(void)
}
if (n == 0) {
- printf(1, "no fork at all!\n");
+ printf("no fork at all!\n");
exit();
}
if(n == N){
- printf(1, "fork claimed to work 1000 times!\n");
+ printf("fork claimed to work 1000 times!\n");
exit();
}
for(; n > 0; n--){
if(wait() < 0){
- printf(1, "wait stopped early\n");
+ printf("wait stopped early\n");
exit();
}
}
if(wait() != -1){
- printf(1, "wait got too many\n");
+ printf("wait got too many\n");
exit();
}
- printf(1, "fork test OK\n");
+ printf("fork test OK\n");
}
void
@@ -1594,13 +1593,13 @@ sbrktest(void)
int fd;
int n;
- printf(stdout, "sbrk test\n");
+ printf("sbrk test\n");
oldbrk = sbrk(0);
// does sbrk() return the expected failure value?
a = sbrk(TOOMUCH);
if(a != (char*)0xffffffffffffffffL){
- printf(stdout, "sbrk(<toomuch>) returned %p\n", a);
+ printf("sbrk(<toomuch>) returned %p\n", a);
exit();
}
@@ -1609,7 +1608,7 @@ sbrktest(void)
for(i = 0; i < 5000; i++){
b = sbrk(1);
if(b != a){
- printf(stdout, "sbrk test failed %d %x %x\n", i, a, b);
+ printf("sbrk test failed %d %x %x\n", i, a, b);
exit();
}
*b = 1;
@@ -1617,13 +1616,13 @@ sbrktest(void)
}
pid = fork();
if(pid < 0){
- printf(stdout, "sbrk test fork failed\n");
+ printf("sbrk test fork failed\n");
exit();
}
c = sbrk(1);
c = sbrk(1);
if(c != a + 1){
- printf(stdout, "sbrk test failed post-fork\n");
+ printf("sbrk test failed post-fork\n");
exit();
}
if(pid == 0)
@@ -1635,7 +1634,7 @@ sbrktest(void)
amt = BIG - (uint64)a;
p = sbrk(amt);
if (p != a) {
- printf(stdout, "sbrk test failed to grow big address space; enough phys mem?\n");
+ printf("sbrk test failed to grow big address space; enough phys mem?\n");
exit();
}
lastaddr = (char*) (BIG-1);
@@ -1645,12 +1644,12 @@ sbrktest(void)
a = sbrk(0);
c = sbrk(-PGSIZE);
if(c == (char*)0xffffffffffffffffL){
- printf(stdout, "sbrk could not deallocate\n");
+ printf("sbrk could not deallocate\n");
exit();
}
c = sbrk(0);
if(c != a - PGSIZE){
- printf(stdout, "sbrk deallocation produced wrong address, a %x c %x\n", a, c);
+ printf("sbrk deallocation produced wrong address, a %x c %x\n", a, c);
exit();
}
@@ -1658,19 +1657,19 @@ sbrktest(void)
a = sbrk(0);
c = sbrk(PGSIZE);
if(c != a || sbrk(0) != a + PGSIZE){
- printf(stdout, "sbrk re-allocation failed, a %x c %x\n", a, c);
+ printf("sbrk re-allocation failed, a %x c %x\n", a, c);
exit();
}
if(*lastaddr == 99){
// should be zero
- printf(stdout, "sbrk de-allocation didn't really deallocate\n");
+ printf("sbrk de-allocation didn't really deallocate\n");
exit();
}
a = sbrk(0);
c = sbrk(-(sbrk(0) - oldbrk));
if(c != a){
- printf(stdout, "sbrk downsize failed, a %x c %x\n", a, c);
+ printf("sbrk downsize failed, a %x c %x\n", a, c);
exit();
}
@@ -1679,11 +1678,11 @@ sbrktest(void)
ppid = getpid();
pid = fork();
if(pid < 0){
- printf(stdout, "fork failed\n");
+ printf("fork failed\n");
exit();
}
if(pid == 0){
- printf(stdout, "oops could read %x = %x\n", a, *a);
+ printf("oops could read %x = %x\n", a, *a);
kill(ppid);
exit();
}
@@ -1693,7 +1692,7 @@ sbrktest(void)
// if we run the system out of memory, does it clean up the last
// failed allocation?
if(pipe(fds) != 0){
- printf(1, "pipe() failed\n");
+ printf("pipe() failed\n");
exit();
}
for(i = 0; i < sizeof(pids)/sizeof(pids[0]); i++){
@@ -1718,7 +1717,7 @@ sbrktest(void)
wait();
}
if(c == (char*)0xffffffffffffffffL){
- printf(stdout, "failed sbrk leaked memory\n");
+ printf("failed sbrk leaked memory\n");
exit();
}
@@ -1726,7 +1725,7 @@ sbrktest(void)
ppid = getpid();
pid = fork();
if(pid < 0){
- printf(stdout, "fork failed\n");
+ printf("fork failed\n");
exit();
}
@@ -1739,7 +1738,7 @@ sbrktest(void)
for (i = 0; i < 10*BIG; i += PGSIZE) {
n += *(a+i);
}
- printf(stdout, "allocate a lot of memory succeeded %d\n", n);
+ printf("allocate a lot of memory succeeded %d\n", n);
kill(ppid);
exit();
}
@@ -1750,11 +1749,11 @@ sbrktest(void)
fd = open("sbrk", O_CREATE|O_WRONLY);
unlink("sbrk");
if(fd < 0) {
- printf(stdout, "open sbrk failed\n");
+ printf("open sbrk failed\n");
exit();
}
if ((n = write(fd, a, 10)) < 0) {
- printf(stdout, "write sbrk failed\n");
+ printf("write sbrk failed\n");
exit();
}
close(fd);
@@ -1762,14 +1761,14 @@ sbrktest(void)
// test writes to allocated memory
a = sbrk(PGSIZE);
if(pipe((int *) a) != 0){
- printf(1, "pipe() failed\n");
+ printf("pipe() failed\n");
exit();
}
if(sbrk(0) > oldbrk)
sbrk(-(sbrk(0) - oldbrk));
- printf(stdout, "sbrk test OK\n");
+ printf("sbrk test OK\n");
}
void
@@ -1778,18 +1777,18 @@ validatetest(void)
int hi;
uint64 p;
- printf(stdout, "validate test\n");
+ printf("validate test\n");
hi = 1100*1024;
for(p = 0; p <= (uint)hi; p += PGSIZE){
// try to crash the kernel by passing in a bad string pointer
if(link("nosuchfile", (char*)p) != -1){
- printf(stdout, "link should not succeed\n");
+ printf("link should not succeed\n");
exit();
}
}
- printf(stdout, "validate ok\n");
+ printf("validate ok\n");
}
// does unintialized data start out zero?
@@ -1799,14 +1798,14 @@ bsstest(void)
{
int i;
- printf(stdout, "bss test\n");
+ printf("bss test\n");
for(i = 0; i < sizeof(uninit); i++){
if(uninit[i] != '\0'){
- printf(stdout, "bss test failed\n");
+ printf("bss test failed\n");
exit();
}
}
- printf(stdout, "bss test ok\n");
+ printf("bss test ok\n");
}
// does exec return an error if the arguments
@@ -1825,20 +1824,20 @@ bigargtest(void)
for(i = 0; i < MAXARG-1; i++)
args[i] = "bigargs test: failed\n ";
args[MAXARG-1] = 0;
- printf(stdout, "bigarg test\n");
+ printf("bigarg test\n");
exec("echo", args);
- printf(stdout, "bigarg test ok\n");
+ printf("bigarg test ok\n");
fd = open("bigarg-ok", O_CREATE);
close(fd);
exit();
} else if(pid < 0){
- printf(stdout, "bigargtest: fork failed\n");
+ printf("bigargtest: fork failed\n");
exit();
}
wait();
fd = open("bigarg-ok", 0);
if(fd < 0){
- printf(stdout, "bigarg test failed!\n");
+ printf("bigarg test failed!\n");
exit();
}
close(fd);
@@ -1853,7 +1852,7 @@ fsfull()
int nfiles;
int fsblocks = 0;
- printf(1, "fsfull test\n");
+ printf("fsfull test\n");
for(nfiles = 0; ; nfiles++){
char name[64];
@@ -1863,10 +1862,10 @@ fsfull()
name[3] = '0' + (nfiles % 100) / 10;
name[4] = '0' + (nfiles % 10);
name[5] = '\0';
- printf(1, "writing %s\n", name);
+ printf("writing %s\n", name);
int fd = open(name, O_CREATE|O_RDWR);
if(fd < 0){
- printf(1, "open %s failed\n", name);
+ printf("open %s failed\n", name);
break;
}
int total = 0;
@@ -1877,7 +1876,7 @@ fsfull()
total += cc;
fsblocks++;
}
- printf(1, "wrote %d bytes\n", total);
+ printf("wrote %d bytes\n", total);
close(fd);
if(total == 0)
break;
@@ -1895,7 +1894,7 @@ fsfull()
nfiles--;
}
- printf(1, "fsfull test finished\n");
+ printf("fsfull test finished\n");
}
void argptest()
@@ -1903,12 +1902,12 @@ void argptest()
int fd;
fd = open("init", O_RDONLY);
if (fd < 0) {
- printf(2, "open failed\n");
+ fprintf(2, "open failed\n");
exit();
}
read(fd, sbrk(0) - 1, -1);
close(fd);
- printf(1, "arg test passed\n");
+ printf("arg test passed\n");
}
unsigned long randstate = 1;
@@ -1927,31 +1926,31 @@ stacktest()
int pid;
int ppid = getpid();
- printf(1, "stack guard test\n");
+ printf("stack guard test\n");
pid = fork();
if(pid == 0) {
char *sp = (char *) r_sp();
sp -= PGSIZE;
// the *sp should cause a trap.
- printf(1, "stacktest: read below stack %p\n", *sp);
- printf(1, "stacktest: test FAILED\n");
+ printf("stacktest: read below stack %p\n", *sp);
+ printf("stacktest: test FAILED\n");
kill(ppid);
exit();
} else if(pid < 0){
- printf (1, "fork failed\n");
+ printf("fork failed\n");
exit();
}
wait();
- printf(1, "stack guard test ok\n");
+ printf("stack guard test ok\n");
}
int
main(int argc, char *argv[])
{
- printf(1, "usertests starting\n");
+ printf("usertests starting\n");
if(open("usertests.ran", 0) >= 0){
- printf(1, "already ran user tests -- rebuild fs.img\n");
+ printf("already ran user tests -- rebuild fs.img\n");
exit();
}
close(open("usertests.ran", O_CREATE));
diff --git a/user/wc.c b/user/wc.c
index e2543a6..43bbf16 100644
--- a/user/wc.c
+++ b/user/wc.c
@@ -26,10 +26,10 @@ wc(int fd, char *name)
}
}
if(n < 0){
- printf(1, "wc: read error\n");
+ printf("wc: read error\n");
exit();
}
- printf(1, "%d %d %d %s\n", l, w, c, name);
+ printf("%d %d %d %s\n", l, w, c, name);
}
int
@@ -44,7 +44,7 @@ main(int argc, char *argv[])
for(i = 1; i < argc; i++){
if((fd = open(argv[i], 0)) < 0){
- printf(1, "wc: cannot open %s\n", argv[i]);
+ printf("wc: cannot open %s\n", argv[i]);
exit();
}
wc(fd, argv[i]);