summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsc <rsc>2006-09-06 16:38:39 +0000
committerrsc <rsc>2006-09-06 16:38:39 +0000
commit45854caa93eecc3f80d34940b7cf6a400b640d69 (patch)
tree7989c8a0ad97aad2da63b816a49f704a8aa58e5a
parentd90113b638ce1324544f8aaf75daa0d414907a33 (diff)
downloadxv6-labs-45854caa93eecc3f80d34940b7cf6a400b640d69.tar.gz
xv6-labs-45854caa93eecc3f80d34940b7cf6a400b640d69.tar.bz2
xv6-labs-45854caa93eecc3f80d34940b7cf6a400b640d69.zip
print "0" for null string
-rw-r--r--console.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/console.c b/console.c
index 438e332..4affa5f 100644
--- a/console.c
+++ b/console.c
@@ -129,9 +129,13 @@ cprintf(char *fmt, ...)
} else if(c == 's'){
char *s = (char*)*ap;
ap++;
- while(*s != 0){
- cons_putc(*s);
- s++;
+ if(s == 0){
+ cons_putc('0');
+ }else{
+ while(*s != 0){
+ cons_putc(*s);
+ s++;
+ }
}
} else if(c == '%'){
cons_putc(c);