diff --git a/.cache/clangd/index/bio.c.24B057DC9C4854FB.idx b/.cache/clangd/index/bio.c.24B057DC9C4854FB.idx deleted file mode 100644 index 99a86b0..0000000 Binary files a/.cache/clangd/index/bio.c.24B057DC9C4854FB.idx and /dev/null differ diff --git a/.cache/clangd/index/buf.h.B4C0E375EE6D85D8.idx b/.cache/clangd/index/buf.h.B4C0E375EE6D85D8.idx deleted file mode 100644 index 14e442e..0000000 Binary files a/.cache/clangd/index/buf.h.B4C0E375EE6D85D8.idx and /dev/null differ diff --git a/.cache/clangd/index/cat.c.E6B5239F172B69BA.idx b/.cache/clangd/index/cat.c.E6B5239F172B69BA.idx deleted file mode 100644 index 761a1ba..0000000 Binary files a/.cache/clangd/index/cat.c.E6B5239F172B69BA.idx and /dev/null differ diff --git a/.cache/clangd/index/console.c.EDE3343BDF30AA18.idx b/.cache/clangd/index/console.c.EDE3343BDF30AA18.idx deleted file mode 100644 index 3ffa9f4..0000000 Binary files a/.cache/clangd/index/console.c.EDE3343BDF30AA18.idx and /dev/null differ diff --git a/.cache/clangd/index/defs.h.FA84750F49A8208D.idx b/.cache/clangd/index/defs.h.FA84750F49A8208D.idx deleted file mode 100644 index 83efcdd..0000000 Binary files a/.cache/clangd/index/defs.h.FA84750F49A8208D.idx and /dev/null differ diff --git a/.cache/clangd/index/echo.c.82273272593DDBF9.idx b/.cache/clangd/index/echo.c.82273272593DDBF9.idx deleted file mode 100644 index d3c1b92..0000000 Binary files a/.cache/clangd/index/echo.c.82273272593DDBF9.idx and /dev/null differ diff --git a/.cache/clangd/index/elf.h.F16A0F7955924FF5.idx b/.cache/clangd/index/elf.h.F16A0F7955924FF5.idx deleted file mode 100644 index 1a045e3..0000000 Binary files a/.cache/clangd/index/elf.h.F16A0F7955924FF5.idx and /dev/null differ diff --git a/.cache/clangd/index/entry.S.9D6A792A4C1D9732.idx b/.cache/clangd/index/entry.S.9D6A792A4C1D9732.idx deleted file mode 100644 index bd600e8..0000000 Binary files a/.cache/clangd/index/entry.S.9D6A792A4C1D9732.idx and /dev/null differ diff --git a/.cache/clangd/index/exec.c.8AD2B91A70ACA0F3.idx b/.cache/clangd/index/exec.c.8AD2B91A70ACA0F3.idx deleted file mode 100644 index 0697d87..0000000 Binary files a/.cache/clangd/index/exec.c.8AD2B91A70ACA0F3.idx and /dev/null differ diff --git a/.cache/clangd/index/fcntl.h.6652379187B12E87.idx b/.cache/clangd/index/fcntl.h.6652379187B12E87.idx deleted file mode 100644 index fff2ba9..0000000 Binary files a/.cache/clangd/index/fcntl.h.6652379187B12E87.idx and /dev/null differ diff --git a/.cache/clangd/index/file.c.820157DB6CAAC2B0.idx b/.cache/clangd/index/file.c.820157DB6CAAC2B0.idx deleted file mode 100644 index 414db22..0000000 Binary files a/.cache/clangd/index/file.c.820157DB6CAAC2B0.idx and /dev/null differ diff --git a/.cache/clangd/index/file.h.79D60CC505A3688C.idx b/.cache/clangd/index/file.h.79D60CC505A3688C.idx deleted file mode 100644 index 3f175b2..0000000 Binary files a/.cache/clangd/index/file.h.79D60CC505A3688C.idx and /dev/null differ diff --git a/.cache/clangd/index/forktest.c.507FAF0654C460C4.idx b/.cache/clangd/index/forktest.c.507FAF0654C460C4.idx deleted file mode 100644 index ae73282..0000000 Binary files a/.cache/clangd/index/forktest.c.507FAF0654C460C4.idx and /dev/null differ diff --git a/.cache/clangd/index/fs.c.58356A9A738811E1.idx b/.cache/clangd/index/fs.c.58356A9A738811E1.idx deleted file mode 100644 index 057b098..0000000 Binary files a/.cache/clangd/index/fs.c.58356A9A738811E1.idx and /dev/null differ diff --git a/.cache/clangd/index/fs.h.3686D48D80A26768.idx b/.cache/clangd/index/fs.h.3686D48D80A26768.idx deleted file mode 100644 index 69ae8e7..0000000 Binary files a/.cache/clangd/index/fs.h.3686D48D80A26768.idx and /dev/null differ diff --git a/.cache/clangd/index/grep.c.DD651FCEFC445A0B.idx b/.cache/clangd/index/grep.c.DD651FCEFC445A0B.idx deleted file mode 100644 index 06d71b3..0000000 Binary files a/.cache/clangd/index/grep.c.DD651FCEFC445A0B.idx and /dev/null differ diff --git a/.cache/clangd/index/grind.c.D7093F5661987A97.idx b/.cache/clangd/index/grind.c.D7093F5661987A97.idx deleted file mode 100644 index fe1559c..0000000 Binary files a/.cache/clangd/index/grind.c.D7093F5661987A97.idx and /dev/null differ diff --git a/.cache/clangd/index/init.c.6F85DBCB8299D7E4.idx b/.cache/clangd/index/init.c.6F85DBCB8299D7E4.idx deleted file mode 100644 index a815b27..0000000 Binary files a/.cache/clangd/index/init.c.6F85DBCB8299D7E4.idx and /dev/null differ diff --git a/.cache/clangd/index/initcode.S.BBCFEB1FDBC942C0.idx b/.cache/clangd/index/initcode.S.BBCFEB1FDBC942C0.idx deleted file mode 100644 index 6043598..0000000 Binary files a/.cache/clangd/index/initcode.S.BBCFEB1FDBC942C0.idx and /dev/null differ diff --git a/.cache/clangd/index/kalloc.c.EAD3206FD345D89F.idx b/.cache/clangd/index/kalloc.c.EAD3206FD345D89F.idx deleted file mode 100644 index 2aa4e72..0000000 Binary files a/.cache/clangd/index/kalloc.c.EAD3206FD345D89F.idx and /dev/null differ diff --git a/.cache/clangd/index/kernelvec.S.378D57D64218706B.idx b/.cache/clangd/index/kernelvec.S.378D57D64218706B.idx deleted file mode 100644 index a0baa4d..0000000 Binary files a/.cache/clangd/index/kernelvec.S.378D57D64218706B.idx and /dev/null differ diff --git a/.cache/clangd/index/kill.c.9066F57D14D15861.idx b/.cache/clangd/index/kill.c.9066F57D14D15861.idx deleted file mode 100644 index bfa4383..0000000 Binary files a/.cache/clangd/index/kill.c.9066F57D14D15861.idx and /dev/null differ diff --git a/.cache/clangd/index/ln.c.568D0D92ECB1AC55.idx b/.cache/clangd/index/ln.c.568D0D92ECB1AC55.idx deleted file mode 100644 index 8346919..0000000 Binary files a/.cache/clangd/index/ln.c.568D0D92ECB1AC55.idx and /dev/null differ diff --git a/.cache/clangd/index/log.c.6FD36E098D038E2E.idx b/.cache/clangd/index/log.c.6FD36E098D038E2E.idx deleted file mode 100644 index 248231b..0000000 Binary files a/.cache/clangd/index/log.c.6FD36E098D038E2E.idx and /dev/null differ diff --git a/.cache/clangd/index/ls.c.573C227ACE78EC31.idx b/.cache/clangd/index/ls.c.573C227ACE78EC31.idx deleted file mode 100644 index f53594f..0000000 Binary files a/.cache/clangd/index/ls.c.573C227ACE78EC31.idx and /dev/null differ diff --git a/.cache/clangd/index/main.c.E95EF6736522E87C.idx b/.cache/clangd/index/main.c.E95EF6736522E87C.idx deleted file mode 100644 index 4819636..0000000 Binary files a/.cache/clangd/index/main.c.E95EF6736522E87C.idx and /dev/null differ diff --git a/.cache/clangd/index/memlayout.h.60CFF8F9C2E8038C.idx b/.cache/clangd/index/memlayout.h.60CFF8F9C2E8038C.idx deleted file mode 100644 index b8814a5..0000000 Binary files a/.cache/clangd/index/memlayout.h.60CFF8F9C2E8038C.idx and /dev/null differ diff --git a/.cache/clangd/index/mkdir.c.3DB26FD9334A4664.idx b/.cache/clangd/index/mkdir.c.3DB26FD9334A4664.idx deleted file mode 100644 index ce7ca30..0000000 Binary files a/.cache/clangd/index/mkdir.c.3DB26FD9334A4664.idx and /dev/null differ diff --git a/.cache/clangd/index/mkfs.c.43FCEF60CDDABED5.idx b/.cache/clangd/index/mkfs.c.43FCEF60CDDABED5.idx deleted file mode 100644 index edfaf85..0000000 Binary files a/.cache/clangd/index/mkfs.c.43FCEF60CDDABED5.idx and /dev/null differ diff --git a/.cache/clangd/index/param.h.1D9016560447FB14.idx b/.cache/clangd/index/param.h.1D9016560447FB14.idx deleted file mode 100644 index b5e0a90..0000000 Binary files a/.cache/clangd/index/param.h.1D9016560447FB14.idx and /dev/null differ diff --git a/.cache/clangd/index/pipe.c.BBCBAB75B511AA59.idx b/.cache/clangd/index/pipe.c.BBCBAB75B511AA59.idx deleted file mode 100644 index 9985824..0000000 Binary files a/.cache/clangd/index/pipe.c.BBCBAB75B511AA59.idx and /dev/null differ diff --git a/.cache/clangd/index/plic.c.7A9570ABA62D6877.idx b/.cache/clangd/index/plic.c.7A9570ABA62D6877.idx deleted file mode 100644 index 39c9de8..0000000 Binary files a/.cache/clangd/index/plic.c.7A9570ABA62D6877.idx and /dev/null differ diff --git a/.cache/clangd/index/printf.c.34E3B3315EFCE18D.idx b/.cache/clangd/index/printf.c.34E3B3315EFCE18D.idx deleted file mode 100644 index e79f2b5..0000000 Binary files a/.cache/clangd/index/printf.c.34E3B3315EFCE18D.idx and /dev/null differ diff --git a/.cache/clangd/index/printf.c.531ABD1B636C8B1E.idx b/.cache/clangd/index/printf.c.531ABD1B636C8B1E.idx deleted file mode 100644 index 32f00c9..0000000 Binary files a/.cache/clangd/index/printf.c.531ABD1B636C8B1E.idx and /dev/null differ diff --git a/.cache/clangd/index/proc.c.D7FEDD31A3658231.idx b/.cache/clangd/index/proc.c.D7FEDD31A3658231.idx deleted file mode 100644 index 311e201..0000000 Binary files a/.cache/clangd/index/proc.c.D7FEDD31A3658231.idx and /dev/null differ diff --git a/.cache/clangd/index/proc.h.3AC7129B3221FEF2.idx b/.cache/clangd/index/proc.h.3AC7129B3221FEF2.idx deleted file mode 100644 index 94f4115..0000000 Binary files a/.cache/clangd/index/proc.h.3AC7129B3221FEF2.idx and /dev/null differ diff --git a/.cache/clangd/index/riscv.h.36A01EBE0D6E8DFB.idx b/.cache/clangd/index/riscv.h.36A01EBE0D6E8DFB.idx deleted file mode 100644 index 1d0af85..0000000 Binary files a/.cache/clangd/index/riscv.h.36A01EBE0D6E8DFB.idx and /dev/null differ diff --git a/.cache/clangd/index/rm.c.A4FB4F197059BFD1.idx b/.cache/clangd/index/rm.c.A4FB4F197059BFD1.idx deleted file mode 100644 index 87d05ba..0000000 Binary files a/.cache/clangd/index/rm.c.A4FB4F197059BFD1.idx and /dev/null differ diff --git a/.cache/clangd/index/sh.c.CB5D6A342B15B608.idx b/.cache/clangd/index/sh.c.CB5D6A342B15B608.idx deleted file mode 100644 index 64a1963..0000000 Binary files a/.cache/clangd/index/sh.c.CB5D6A342B15B608.idx and /dev/null differ diff --git a/.cache/clangd/index/sleep.c.FB7A3FFDCE014550.idx b/.cache/clangd/index/sleep.c.FB7A3FFDCE014550.idx deleted file mode 100644 index 66c1ea6..0000000 Binary files a/.cache/clangd/index/sleep.c.FB7A3FFDCE014550.idx and /dev/null differ diff --git a/.cache/clangd/index/sleeplock.c.C737AFEA3824B290.idx b/.cache/clangd/index/sleeplock.c.C737AFEA3824B290.idx deleted file mode 100644 index 08ab2bc..0000000 Binary files a/.cache/clangd/index/sleeplock.c.C737AFEA3824B290.idx and /dev/null differ diff --git a/.cache/clangd/index/sleeplock.h.AB9DCF968FE1602B.idx b/.cache/clangd/index/sleeplock.h.AB9DCF968FE1602B.idx deleted file mode 100644 index 139a868..0000000 Binary files a/.cache/clangd/index/sleeplock.h.AB9DCF968FE1602B.idx and /dev/null differ diff --git a/.cache/clangd/index/spinlock.c.118C42BEA2603680.idx b/.cache/clangd/index/spinlock.c.118C42BEA2603680.idx deleted file mode 100644 index 71c8648..0000000 Binary files a/.cache/clangd/index/spinlock.c.118C42BEA2603680.idx and /dev/null differ diff --git a/.cache/clangd/index/spinlock.h.ED3FF238220E61EC.idx b/.cache/clangd/index/spinlock.h.ED3FF238220E61EC.idx deleted file mode 100644 index 5a83412..0000000 Binary files a/.cache/clangd/index/spinlock.h.ED3FF238220E61EC.idx and /dev/null differ diff --git a/.cache/clangd/index/start.c.89E95DBE47605461.idx b/.cache/clangd/index/start.c.89E95DBE47605461.idx deleted file mode 100644 index ee3470a..0000000 Binary files a/.cache/clangd/index/start.c.89E95DBE47605461.idx and /dev/null differ diff --git a/.cache/clangd/index/stat.h.86672BD094069739.idx b/.cache/clangd/index/stat.h.86672BD094069739.idx deleted file mode 100644 index 91a0674..0000000 Binary files a/.cache/clangd/index/stat.h.86672BD094069739.idx and /dev/null differ diff --git a/.cache/clangd/index/stressfs.c.B3275037285EE054.idx b/.cache/clangd/index/stressfs.c.B3275037285EE054.idx deleted file mode 100644 index 4a6f461..0000000 Binary files a/.cache/clangd/index/stressfs.c.B3275037285EE054.idx and /dev/null differ diff --git a/.cache/clangd/index/string.c.3EE6B1D0B8CDCB1D.idx b/.cache/clangd/index/string.c.3EE6B1D0B8CDCB1D.idx deleted file mode 100644 index 04340ab..0000000 Binary files a/.cache/clangd/index/string.c.3EE6B1D0B8CDCB1D.idx and /dev/null differ diff --git a/.cache/clangd/index/swtch.S.4ADC9FB12CE0846F.idx b/.cache/clangd/index/swtch.S.4ADC9FB12CE0846F.idx deleted file mode 100644 index 607c31d..0000000 Binary files a/.cache/clangd/index/swtch.S.4ADC9FB12CE0846F.idx and /dev/null differ diff --git a/.cache/clangd/index/syscall.c.3F5C883044FCFCF0.idx b/.cache/clangd/index/syscall.c.3F5C883044FCFCF0.idx deleted file mode 100644 index dd51002..0000000 Binary files a/.cache/clangd/index/syscall.c.3F5C883044FCFCF0.idx and /dev/null differ diff --git a/.cache/clangd/index/syscall.h.0731AA8A1C559D11.idx b/.cache/clangd/index/syscall.h.0731AA8A1C559D11.idx deleted file mode 100644 index 2cafdef..0000000 Binary files a/.cache/clangd/index/syscall.h.0731AA8A1C559D11.idx and /dev/null differ diff --git a/.cache/clangd/index/sysfile.c.2F63584A87B4C330.idx b/.cache/clangd/index/sysfile.c.2F63584A87B4C330.idx deleted file mode 100644 index e0ebcda..0000000 Binary files a/.cache/clangd/index/sysfile.c.2F63584A87B4C330.idx and /dev/null differ diff --git a/.cache/clangd/index/sysproc.c.C8BB7E1E7CB91706.idx b/.cache/clangd/index/sysproc.c.C8BB7E1E7CB91706.idx deleted file mode 100644 index e7f42ed..0000000 Binary files a/.cache/clangd/index/sysproc.c.C8BB7E1E7CB91706.idx and /dev/null differ diff --git a/.cache/clangd/index/trampoline.S.BDFD062CFF52377F.idx b/.cache/clangd/index/trampoline.S.BDFD062CFF52377F.idx deleted file mode 100644 index 06d5dde..0000000 Binary files a/.cache/clangd/index/trampoline.S.BDFD062CFF52377F.idx and /dev/null differ diff --git a/.cache/clangd/index/trap.c.23537A97EF180684.idx b/.cache/clangd/index/trap.c.23537A97EF180684.idx deleted file mode 100644 index 69602a1..0000000 Binary files a/.cache/clangd/index/trap.c.23537A97EF180684.idx and /dev/null differ diff --git a/.cache/clangd/index/types.h.70696683BE2EC723.idx b/.cache/clangd/index/types.h.70696683BE2EC723.idx deleted file mode 100644 index b6cd92f..0000000 Binary files a/.cache/clangd/index/types.h.70696683BE2EC723.idx and /dev/null differ diff --git a/.cache/clangd/index/uart.c.5FD657EACB02A601.idx b/.cache/clangd/index/uart.c.5FD657EACB02A601.idx deleted file mode 100644 index 29b0970..0000000 Binary files a/.cache/clangd/index/uart.c.5FD657EACB02A601.idx and /dev/null differ diff --git a/.cache/clangd/index/ulib.c.3796A394AA0B4D78.idx b/.cache/clangd/index/ulib.c.3796A394AA0B4D78.idx deleted file mode 100644 index 15a60b4..0000000 Binary files a/.cache/clangd/index/ulib.c.3796A394AA0B4D78.idx and /dev/null differ diff --git a/.cache/clangd/index/umalloc.c.A8E0D49313A5FD66.idx b/.cache/clangd/index/umalloc.c.A8E0D49313A5FD66.idx deleted file mode 100644 index 1d016f9..0000000 Binary files a/.cache/clangd/index/umalloc.c.A8E0D49313A5FD66.idx and /dev/null differ diff --git a/.cache/clangd/index/user.h.0E1D177ECDFC39A7.idx b/.cache/clangd/index/user.h.0E1D177ECDFC39A7.idx deleted file mode 100644 index 0200623..0000000 Binary files a/.cache/clangd/index/user.h.0E1D177ECDFC39A7.idx and /dev/null differ diff --git a/.cache/clangd/index/usertests.c.6C9F208F54570D61.idx b/.cache/clangd/index/usertests.c.6C9F208F54570D61.idx deleted file mode 100644 index 2026f18..0000000 Binary files a/.cache/clangd/index/usertests.c.6C9F208F54570D61.idx and /dev/null differ diff --git a/.cache/clangd/index/virtio.h.792FB564DB2391F6.idx b/.cache/clangd/index/virtio.h.792FB564DB2391F6.idx deleted file mode 100644 index 7c92421..0000000 Binary files a/.cache/clangd/index/virtio.h.792FB564DB2391F6.idx and /dev/null differ diff --git a/.cache/clangd/index/virtio_disk.c.769BA37BC7FB44CB.idx b/.cache/clangd/index/virtio_disk.c.769BA37BC7FB44CB.idx deleted file mode 100644 index f2ecbb6..0000000 Binary files a/.cache/clangd/index/virtio_disk.c.769BA37BC7FB44CB.idx and /dev/null differ diff --git a/.cache/clangd/index/vm.c.0DE519F162B02AC5.idx b/.cache/clangd/index/vm.c.0DE519F162B02AC5.idx deleted file mode 100644 index 0482566..0000000 Binary files a/.cache/clangd/index/vm.c.0DE519F162B02AC5.idx and /dev/null differ diff --git a/.cache/clangd/index/wc.c.ED2C4745D8FA3371.idx b/.cache/clangd/index/wc.c.ED2C4745D8FA3371.idx deleted file mode 100644 index e6d5bf2..0000000 Binary files a/.cache/clangd/index/wc.c.ED2C4745D8FA3371.idx and /dev/null differ diff --git a/.cache/clangd/index/zombie.c.72B560D8AFCD8B22.idx b/.cache/clangd/index/zombie.c.72B560D8AFCD8B22.idx deleted file mode 100644 index 427ae8f..0000000 Binary files a/.cache/clangd/index/zombie.c.72B560D8AFCD8B22.idx and /dev/null differ diff --git a/.gitignore b/.gitignore index 5c33438..6d6387d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ _* *.asm *.sym *.img +.cache vectors.S bootblock entryother diff --git a/user/cat.c b/user/cat.c index 520dc8b..0454244 100644 --- a/user/cat.c +++ b/user/cat.c @@ -1,39 +1,35 @@ -#include "kernel/types.h" -#include "kernel/stat.h" #include "kernel/fcntl.h" +#include "kernel/stat.h" +#include "kernel/types.h" #include "user/user.h" char buf[512]; -void -cat(int fd) -{ +void cat(int fd) { int n; - while((n = read(fd, buf, sizeof(buf))) > 0) { + while ((n = read(fd, buf, sizeof(buf))) > 0) { if (write(1, buf, n) != n) { fprintf(2, "cat: write error\n"); exit(1); } } - if(n < 0){ + if (n < 0) { fprintf(2, "cat: read error\n"); exit(1); } } -int -main(int argc, char *argv[]) -{ +int main(int argc, char *argv[]) { int fd, i; - if(argc <= 1){ + if (argc <= 1) { cat(0); exit(0); } - for(i = 1; i < argc; i++){ - if((fd = open(argv[i], O_RDONLY)) < 0){ + for (i = 1; i < argc; i++) { + if ((fd = open(argv[i], O_RDONLY)) < 0) { fprintf(2, "cat: cannot open %s\n", argv[i]); exit(1); }