Add user.h for prototypes.

Add cons_puts for cleaner output.

Add user.h for prototypes.
9b37d1bf · rsc · b903b693 · 9b37d1bf · 9b37d1bf · 9b37d1bf
--- a/ulib.c
+++ b/ulib.c
+#include "user.h"
+
 int
 puts(char *s)
 {
+  return cons_puts(s);
+}
+
+int
+puts1(char *s)
+{
  int i;

  for(i = 0; s[i]; i++)

--- a/user.h
+++ b/user.h
+int fork(void);
+int exit(void) __attribute__((noreturn));
+int wait(void);
+int cons_putc(int);
+int pipe(int*);
+int write(int, void*, int);
+int read(int, void*, int);
+int close(int);
+int block(void);
+int kill(int);
+int panic(char*);
+int cons_puts(char*);
+
+int puts(char*);
+int puts1(char*);
--- a/user1.c
+++ b/user1.c
+#include "user.h"
+
 char buf[32];

+int
 main()
 {
  int pid, fds[2], n;
@@ -15,6 +18,5 @@ main()
    puts(buf);
    puts("\n");
  }
-  while(1)
-    ;
+  for(;;);
 }
--- a/userfs.c
+++ b/userfs.c
+#include "user.h"
+
 // file system tests

 char buf[1024];

+int
 main()
 {
  puts("userfs running\n");
  block();
+  return 0;
 }
--- a/usertests.c
+++ b/usertests.c
+#include "user.h"
+
 char buf[2048];

 // simple fork and pipe read/write
@@ -17,10 +19,10 @@ pipe1()
        buf[i] = seq++;
      if(write(fds[1], buf, 1033) != 1033){
        panic("pipe1 oops 1\n");
-        exit(1);
+        exit();
      }
    }
-    exit(0);
+    exit();
  } else {
    close(fds[1]);
    total = 0;
@@ -109,12 +111,13 @@ exitwait()
        return;
      }
    } else {
-      exit(0);
+      exit();
    }
  }
  puts("exitwait ok\n");
 }

+int
 main()
 {
  puts("usertests starting\n");
@@ -123,5 +126,6 @@ main()
  preempt();
  exitwait();

-  panic("usertests finished successfuly");
+  panic("usertests succeeded");
+  return 0;
 }
--- a/usys.S
+++ b/usys.S
@@ -19,3 +19,4 @@ STUB(close)
 STUB(block)
 STUB(kill)
 STUB(panic)
+STUB(cons_puts)