diff options
| author | Frans Kaashoek <[email protected]> | 2019-07-08 15:50:06 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2019-07-08 15:50:06 -0400 |
| commit | 2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc (patch) | |
| tree | 189387b82cfd998170d39dfc998de0fc86602544 /user | |
| parent | 75b0c6fc91c1264aaa5d080d9faeb87c90d02ad3 (diff) | |
| parent | 60ed537427c31d320ca4c8778d21d13304285b00 (diff) | |
| download | xv6-labs-2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc.tar.gz xv6-labs-2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc.tar.bz2 xv6-labs-2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc.zip | |
Merge branch 'riscv-proc' into riscv
Diffstat (limited to 'user')
| -rw-r--r-- | user/ls.c | 2 | ||||
| -rw-r--r-- | user/printf.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -43,7 +43,7 @@ ls(char *path) switch(st.type){ case T_FILE: - printf(1, "%s %d %d %d\n", fmtname(path), st.type, st.ino, st.size); + printf(1, "%s %d %d %l\n", fmtname(path), st.type, st.ino, st.size); break; case T_DIR: diff --git a/user/printf.c b/user/printf.c index 0c6b34b..f3b3282 100644 --- a/user/printf.c +++ b/user/printf.c @@ -68,6 +68,8 @@ printf(int fd, const char *fmt, ...) } else if(state == '%'){ if(c == 'd'){ printint(fd, va_arg(ap, int), 10, 1); + } else if(c == 'l') { + printint(fd, va_arg(ap, uint64), 10, 0); } else if(c == 'x') { printint(fd, va_arg(ap, int), 16, 0); } else if(c == 'p') { |