diff options
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/subprocess-posix.c | 13 | ||||
| -rw-r--r-- | osdep/subprocess.c | 57 | ||||
| -rw-r--r-- | osdep/subprocess.h | 3 | ||||
| -rw-r--r-- | osdep/terminal-unix.c | 3 |
4 files changed, 73 insertions, 3 deletions
diff --git a/osdep/subprocess-posix.c b/osdep/subprocess-posix.c index c2120b2aa8..9d565f411e 100644 --- a/osdep/subprocess-posix.c +++ b/osdep/subprocess-posix.c @@ -20,6 +20,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/wait.h> +#include <fcntl.h> #include <errno.h> #include <signal.h> @@ -63,6 +64,7 @@ int mp_subprocess(char **args, struct mp_cancel *cancel, void *ctx, int status = -1; int p_stdout[2] = {-1, -1}; int p_stderr[2] = {-1, -1}; + int devnull = -1; pid_t pid = -1; if (on_stdout && mp_make_cloexec_pipe(p_stdout) < 0) @@ -70,10 +72,16 @@ int mp_subprocess(char **args, struct mp_cancel *cancel, void *ctx, if (on_stderr && mp_make_cloexec_pipe(p_stderr) < 0) goto done; + devnull = open("/dev/null", O_RDONLY | O_CLOEXEC); + if (devnull < 0) + goto done; + if (posix_spawn_file_actions_init(&fa)) goto done; fa_destroy = true; - // redirect stdout and stderr + // redirect stdin/stdout/stderr + if (posix_spawn_file_actions_adddup2(&fa, devnull, 0)) + goto done; if (p_stdout[1] >= 0 && posix_spawn_file_actions_adddup2(&fa, p_stdout[1], 1)) goto done; if (p_stderr[1] >= 0 && posix_spawn_file_actions_adddup2(&fa, p_stderr[1], 2)) @@ -88,6 +96,8 @@ int mp_subprocess(char **args, struct mp_cancel *cancel, void *ctx, p_stdout[1] = -1; close(p_stderr[1]); p_stderr[1] = -1; + close(devnull); + devnull = -1; int *read_fds[2] = {&p_stdout[0], &p_stderr[0]}; subprocess_read_cb read_cbs[2] = {on_stdout, on_stderr}; @@ -133,6 +143,7 @@ done: close(p_stdout[1]); close(p_stderr[0]); close(p_stderr[1]); + close(devnull); if (WIFEXITED(status) && WEXITSTATUS(status) != 127) { *error = NULL; diff --git a/osdep/subprocess.c b/osdep/subprocess.c new file mode 100644 index 0000000000..84a1b52fe6 --- /dev/null +++ b/osdep/subprocess.c @@ -0,0 +1,57 @@ +/* + * This file is part of mpv. + * + * mpv is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * mpv is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with mpv. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <pthread.h> + +#include "common/common.h" +#include "common/msg.h" +#include "common/msg_control.h" + +#include "subprocess.h" + +struct subprocess_args { + struct mp_log *log; + char **args; +}; + +static void *run_subprocess(void *ptr) +{ + struct subprocess_args *p = ptr; + pthread_detach(pthread_self()); + + mp_msg_flush_status_line(p->log); + + char *err = NULL; + if (mp_subprocess(p->args, NULL, NULL, NULL, NULL, &err) < 0) + mp_err(p->log, "Running subprocess failed: %s\n", err); + + talloc_free(p); + return NULL; +} + +void mp_subprocess_detached(struct mp_log *log, char **args) +{ + struct subprocess_args *p = talloc_zero(NULL, struct subprocess_args); + p->log = mp_log_new(p, log, NULL); + int num_args = 0; + for (int n = 0; args[n]; n++) + MP_TARRAY_APPEND(p, p->args, num_args, talloc_strdup(p, args[n])); + MP_TARRAY_APPEND(p, p->args, num_args, NULL); + pthread_t thread; + if (pthread_create(&thread, NULL, run_subprocess, p)) + talloc_free(p); +} diff --git a/osdep/subprocess.h b/osdep/subprocess.h index 09c07da981..1bd5afe1f8 100644 --- a/osdep/subprocess.h +++ b/osdep/subprocess.h @@ -29,4 +29,7 @@ int mp_subprocess(char **args, struct mp_cancel *cancel, void *ctx, subprocess_read_cb on_stdout, subprocess_read_cb on_stderr, char **error); +struct mp_log; +void mp_subprocess_detached(struct mp_log *log, char **args); + #endif diff --git a/osdep/terminal-unix.c b/osdep/terminal-unix.c index d0f40f3a4c..f43376b088 100644 --- a/osdep/terminal-unix.c +++ b/osdep/terminal-unix.c @@ -275,8 +275,7 @@ static void enable_kx(bool enable) // shouldn't be relied on here either. if (isatty(STDOUT_FILENO)) { char *cmd = enable ? "\033=" : "\033>"; - printf("%s", cmd); - fflush(stdout); + write(STDOUT_FILENO, cmd, strlen(cmd)); } } |