Merge commit '8160fa28' into scale-amd64

3ec080c4 · Nickolai Zeldovich · 010080dd · 8160fa28 · 3ec080c4 · 3ec080c4
--- a/printf.cc
+++ b/printf.cc
@@ -22,6 +22,16 @@ fprintf(int fd, const char *fmt, ...)
  va_end(ap);
 }

+void
+printf(const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start(ap, fmt);
+  vprintfmt(writec, (void*) 1, fmt, ap);
+  va_end(ap);
+}
+
 // Print to a buffer.
 struct bufstate {
  char *p;

--- a/user.h
+++ b/user.h
@@ -49,6 +49,7 @@ int atoi(const char*);
 int forkt(void *sp, void *pc, void *arg);

 // printf.c
+void printf(const char*, ...);
 void fprintf(int, const char*, ...);
 void snprintf(char *buf, unsigned int n, const char *fmt, ...);
 void die(const char* errstr, ...) __attribute__((noreturn));