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

Catch errors writing to > files

Browse Source
This commit is contained in:
K. Lange 2018-09-17 09:29:47 +09:00
parent cc4baaff0d
commit d052471948
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/sh.c
View File

@ -1056,7 +1056,13 @@ _nope:
if (!fork()) {
if (output_files[cmdi]) {
dup2(open(output_files[cmdi], file_args[cmdi], 0666), STDOUT_FILENO);
int fd = open(output_files[cmdi], file_args[cmdi], 0666);
if (fd < 0) {
fprintf(stderr, "sh: %s: %s\n", output_files[cmdi], strerror(errno));
return -1;
} else {
dup2(fd, STDOUT_FILENO);
}
}
dup2(last_output[0], STDIN_FILENO);
close(last_output[1]);
@ -1074,7 +1080,13 @@ _nope:
child_pid = fork();
if (!child_pid) {
if (output_files[cmdi]) {
dup2(open(output_files[cmdi], file_args[cmdi], 0666), STDOUT_FILENO);
int fd = open(output_files[cmdi], file_args[cmdi], 0666);
if (fd < 0) {
fprintf(stderr, "sh: %s: %s\n", output_files[cmdi], strerror(errno));
return -1;
} else {
dup2(fd, STDOUT_FILENO);
}
}
run_cmd(arg_starts[0]);
}