add %s to cprintf for cons_puts

b75c11b2 · rsc · b74f4b57 · b75c11b2 · b75c11b2 · b75c11b2
--- a/console.c
+++ b/console.c
@@ -105,7 +105,7 @@ printint(int xx, int base, int sgn)
 }

 /*
- * print to the console. only understands %d and %x.
+ * print to the console. only understands %d, %x, %p, %s.
 */
 void
 cprintf(char *fmt, ...)
@@ -131,8 +131,19 @@ cprintf(char *fmt, ...)
      } else if(c == 'x' || c == 'p'){
        printint(*ap, 16, 0);
        ap++;
+      } else if(c == 's'){
+        char *s = (char*)*ap;
+        ap++;
+        while(*s != 0){
+          real_cons_putc(*s);
+          s++;
+        }
      } else if(c == '%'){
        real_cons_putc(c);
+      } else {
+        // Unknown % sequence.  Print it to draw attention.
+        real_cons_putc('%');
+        real_cons_putc(c);
      }
      state = 0;
    }

--- a/ulib.c
+++ b/ulib.c
@@ -16,3 +16,13 @@ puts1(char *s)
  return i;
 }

+char*
+strcpy(char *s, char *t)
+{
+	char *os;
+	
+	os = s;
+	while((*s++ = *t++) != 0)
+		;
+	return os;
+}
--- a/user.h
+++ b/user.h
@@ -13,3 +13,4 @@ int cons_puts(char*);

 int puts(char*);
 int puts1(char*);
+char* strcpy(char*, char*);