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

esh: basic support for redirecting stderr

Browse Source
This commit is contained in:
K. Lange 2019-01-02 21:24:05 +09:00
parent 352bef7882
commit c09a84c686
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
apps/sh.c
View File

@ -47,6 +47,7 @@ extern char **environ;
#define PIPE_TOKEN "\xFF\xFFPIPE\xFF\xFF"
#define STAR_TOKEN "\xFF\xFFSTAR\xFF\xFF"
#define WRITE_TOKEN "\xFF\xFFWRITE\xFF\xFF"
#define WRITE_ERR_TOKEN "\xFF\xFFWRITEERR\xFF\xFF"
#define APPEND_TOKEN "\xFF\xFF""APPEND\xFF"
/* A shell command is like a C program */
@ -1100,6 +1101,12 @@ int shell_exec(char * buffer, size_t size, FILE * file, char ** out_buffer) {
case '>':
if (!quoted && !backtick) {
if (collected || force_collected) {
if (!strcmp(buffer_,"2")) {
/* Special case */
force_collected = 0;
collected = sprintf(buffer_,"%s", WRITE_ERR_TOKEN);
goto _new_arg;
}
add_argument(args, buffer_);
}
force_collected = 0;
@ -1175,7 +1182,10 @@ _done:
char * output_files[100] = { NULL };
int file_args[100] = {0};
int argcs[100] = {0};
char * err_files[100] = { NULL };
int err_args[100] = {0};
int next_is_file = 0;
int next_is_err = 0;
list_t * extra_env = list_create();
@ -1183,6 +1193,22 @@ _done:
foreach(node, args) {
char * c = node->value;
if (next_is_err) {
if (next_is_err == 1 && !strcmp(c, WRITE_TOKEN)) {
next_is_err = 2;
err_args[cmdi] = O_WRONLY | O_CREAT | O_APPEND;
continue;
}
err_files[cmdi] = c;
continue;
}
if (!strcmp(c, WRITE_ERR_TOKEN)) {
next_is_err = 1;
err_args[cmdi] = O_WRONLY | O_CREAT | O_TRUNC;
continue;
}
if (next_is_file) {
if (next_is_file == 1 && !strcmp(c, WRITE_TOKEN)) {
next_is_file = 2;
@ -1199,6 +1225,7 @@ _done:
continue;
}
if (!strcmp(c, PIPE_TOKEN)) {
if (arg_starts[cmdi] == &argv[i]) {
fprintf(stderr, "Syntax error: Unexpected pipe token\n");
@ -1397,6 +1424,15 @@ _nope:
dup2(fd, STDOUT_FILENO);
}
}
if (err_files[cmdi]) {
int fd = open(err_files[cmdi], err_args[cmdi], 0666);
if (fd < 0) {
fprintf(stderr, "sh: %s: %s\n", err_files[cmdi], strerror(errno));
return -1;
} else {
dup2(fd, STDERR_FILENO);
}
}
dup2(last_output[0], STDIN_FILENO);
close(last_output[1]);
add_environment(extra_env);
@ -1427,6 +1463,15 @@ _nope:
dup2(fd, STDOUT_FILENO);
}
}
if (err_files[cmdi]) {
int fd = open(err_files[cmdi], err_args[cmdi], 0666);
if (fd < 0) {
fprintf(stderr, "sh: %s: %s\n", err_files[cmdi], strerror(errno));
return -1;
} else {
dup2(fd, STDERR_FILENO);
}
}
add_environment(extra_env);
run_cmd(arg_starts[0]);
}