Aren
/
toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some error handling

This commit is contained in:
K. Lange 2018-07-18 09:43:39 +09:00
parent 1241011833
commit c75b586829
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/cat.c
View File

@ -14,6 +14,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#define CHUNK_SIZE 4096 #define CHUNK_SIZE 4096
@ -36,8 +37,8 @@ int main(int argc, char ** argv) {
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {
int fd = open(argv[i], O_RDONLY); int fd = open(argv[i], O_RDONLY);
if (fd == -1) { if (fd < 0) {
fprintf(stderr, "%s: %s: no such file or directory\n", argv[0], argv[i]); fprintf(stderr, "%s: %s: %s\n", argv[0], argv[i], strerror(errno));
ret = 1; ret = 1;
continue; continue;
} }

2
apps/sh.c
View File

@ -951,7 +951,7 @@ int main(int argc, char ** argv) {
FILE * f = fopen(argv[optind],"r"); FILE * f = fopen(argv[optind],"r");
if (!f) { if (!f) {
fprintf(stderr, "%s: %s: file not found\n", argv[0], argv[optind]); fprintf(stderr, "%s: %s: %s\n", argv[0], argv[optind], strerror(errno));
return 1; return 1;
} }

1
util/devtable
View File

@ -1,3 +1,4 @@
/etc/master.passwd f 600 0 0 - - - - -
/bin/sudo f 4555 0 0 - - - - - /bin/sudo f 4555 0 0 - - - - -
/home/local d 775 1000 1000 - - - - - /home/local d 775 1000 1000 - - - - -
/home/local/hello f 664 1000 1000 - - - - - /home/local/hello f 664 1000 1000 - - - - -