Bricoles/xv6-riscv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use O_RDONLY instead of 0

Browse source
This commit is contained in:
Frans Kaashoek 2022-09-11 13:51:11 -04:00
parent 463ae0abc3
commit 4b46c0c6eb
4 changed files with 8 additions and 4 deletions

3
user/cat.c
View file

@ -1,5 +1,6 @@
#include "kernel/types.h" #include "kernel/types.h"
#include "kernel/stat.h" #include "kernel/stat.h"
#include "kernel/fcntl.h"
#include "user/user.h" #include "user/user.h"
char buf[512]; char buf[512];
@ -32,7 +33,7 @@ main(int argc, char *argv[])
} }
for(i = 1; i < argc; i++){ for(i = 1; i < argc; i++){
if((fd = open(argv[i], 0)) < 0){ if((fd = open(argv[i], O_RDONLY)) < 0){
fprintf(2, "cat: cannot open %s\n", argv[i]); fprintf(2, "cat: cannot open %s\n", argv[i]);
exit(1); exit(1);
} }

3
user/grep.c
View file

@ -2,6 +2,7 @@
#include "kernel/types.h" #include "kernel/types.h"
#include "kernel/stat.h" #include "kernel/stat.h"
#include "kernel/fcntl.h"
#include "user/user.h" #include "user/user.h"
char buf[1024]; char buf[1024];
@ -51,7 +52,7 @@ main(int argc, char *argv[])
} }
for(i = 2; i < argc; i++){ for(i = 2; i < argc; i++){
if((fd = open(argv[i], 0)) < 0){ if((fd = open(argv[i], O_RDONLY)) < 0){
printf("grep: cannot open %s\n", argv[i]); printf("grep: cannot open %s\n", argv[i]);
exit(1); exit(1);
} }

3
user/ls.c
View file

@ -2,6 +2,7 @@
#include "kernel/stat.h" #include "kernel/stat.h"
#include "user/user.h" #include "user/user.h"
#include "kernel/fs.h" #include "kernel/fs.h"
#include "kernel/fcntl.h"
char* char*
fmtname(char *path) fmtname(char *path)
@ -30,7 +31,7 @@ ls(char *path)
struct dirent de; struct dirent de;
struct stat st; struct stat st;
if((fd = open(path, 0)) < 0){ if((fd = open(path, O_RDONLY)) < 0){
fprintf(2, "ls: cannot open %s\n", path); fprintf(2, "ls: cannot open %s\n", path);
return; return;
} }

3
user/wc.c
View file

@ -1,5 +1,6 @@
#include "kernel/types.h" #include "kernel/types.h"
#include "kernel/stat.h" #include "kernel/stat.h"
#include "kernel/fcntl.h"
#include "user/user.h" #include "user/user.h"
char buf[512]; char buf[512];
@ -43,7 +44,7 @@ main(int argc, char *argv[])
} }
for(i = 1; i < argc; i++){ for(i = 1; i < argc; i++){
if((fd = open(argv[i], 0)) < 0){ if((fd = open(argv[i], O_RDONLY)) < 0){
printf("wc: cannot open %s\n", argv[i]); printf("wc: cannot open %s\n", argv[i]);
exit(1); exit(1);
} }