From acfd1a1929e9086f7a6bc3d2c05453a64be45f9a Mon Sep 17 00:00:00 2001 From: sfan5 Date: Thu, 3 Aug 2017 22:50:10 +0200 Subject: android: posix_spawn(p) replacement Signed-off-by: wm4 --- osdep/android/posix-spawn.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ osdep/android/posix-spawn.h | 43 +++++++++++++++++++++++++++ osdep/posix-spawn.h | 27 +++++++++++++++++ osdep/subprocess-posix.c | 2 +- wscript | 14 +++++++-- wscript_build.py | 1 + 6 files changed, 156 insertions(+), 3 deletions(-) create mode 100644 osdep/android/posix-spawn.c create mode 100644 osdep/android/posix-spawn.h create mode 100644 osdep/posix-spawn.h diff --git a/osdep/android/posix-spawn.c b/osdep/android/posix-spawn.c new file mode 100644 index 0000000000..a9bb27a8d1 --- /dev/null +++ b/osdep/android/posix-spawn.c @@ -0,0 +1,72 @@ +/* + * posix-spawn replacement for Android + * + * This file is part of mpv. + * + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . + */ + +#include +#include +#include "osdep/android/posix-spawn.h" + +int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *fa, int fd, int newfd) +{ + if (fa->used >= MAX_FILE_ACTIONS) + return -1; + fa->action[fa->used].filedes = fd; + fa->action[fa->used].newfiledes = newfd; + fa->used++; + return 0; +} + +int posix_spawn_file_actions_init(posix_spawn_file_actions_t *fa) +{ + fa->used = 0; + return 0; +} + +int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t *fa) +{ + return 0; +} + +int posix_spawnp(pid_t *pid, const char *file, + const posix_spawn_file_actions_t *fa, + const posix_spawnattr_t *attrp, + char *const argv[], char *const envp[]) +{ + pid_t p; + + if (attrp != NULL) + return EINVAL; + + p = fork(); + if (p == -1) + return errno; + + if (p == 0) { + for (int i = 0; i < fa->used; i++) { + int err = dup2(fa->action[i].filedes, fa->action[i].newfiledes); + if (err == -1) + goto fail; + } + execvpe(file, argv, envp); +fail: + _exit(127); + } + + *pid = p; + return 0; +} diff --git a/osdep/android/posix-spawn.h b/osdep/android/posix-spawn.h new file mode 100644 index 0000000000..d995b993ec --- /dev/null +++ b/osdep/android/posix-spawn.h @@ -0,0 +1,43 @@ +/* + * posix-spawn replacement for Android + * + * This file is part of mpv. + * + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . + */ + +#pragma once + +#include + +#define MAX_FILE_ACTIONS 4 + +typedef struct { + char dummy; +} posix_spawnattr_t; /* unsupported */ + +typedef struct { + int used; + struct { + int filedes, newfiledes; + } action[MAX_FILE_ACTIONS]; +} posix_spawn_file_actions_t; + +int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t*, int, int); +int posix_spawn_file_actions_init(posix_spawn_file_actions_t*); +int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t*); + +int posix_spawnp(pid_t*, const char*, + const posix_spawn_file_actions_t*, const posix_spawnattr_t *, + char *const [], char *const []); diff --git a/osdep/posix-spawn.h b/osdep/posix-spawn.h new file mode 100644 index 0000000000..d8bf874c98 --- /dev/null +++ b/osdep/posix-spawn.h @@ -0,0 +1,27 @@ +/* + * posix-spawn wrapper + * + * This file is part of mpv. + * + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . + */ + +#pragma once + +#ifdef __ANDROID__ +// posix_spawn(p) does not exist at all on Android +#include "osdep/android/posix-spawn.h" +#else +#include +#endif diff --git a/osdep/subprocess-posix.c b/osdep/subprocess-posix.c index c780473fce..a5fe43c6d4 100644 --- a/osdep/subprocess-posix.c +++ b/osdep/subprocess-posix.c @@ -15,7 +15,7 @@ * License along with mpv. If not, see . */ -#include +#include "osdep/posix-spawn.h" #include #include #include diff --git a/wscript b/wscript index c1162a041e..dd47956392 100644 --- a/wscript +++ b/wscript @@ -233,11 +233,21 @@ iconv support use --disable-iconv.", 'desc': 'nanosleep', 'func': check_statement('time.h', 'nanosleep(0,0)') }, { - 'name': 'posix-spawn', - 'desc': 'POSIX spawnp()/kill()', + 'name': 'posix-spawn-native', + 'desc': 'spawnp()/kill() POSIX support', 'func': check_statement(['spawn.h', 'signal.h'], 'posix_spawnp(0,0,0,0,0,0); kill(0,0)'), 'deps': '!mingw', + }, { + 'name': 'posix-spawn-android', + 'desc': 'spawnp()/kill() Android replacement', + 'func': check_true, + 'deps': 'android && !posix-spawn-native', + },{ + 'name': 'posix-spawn', + 'desc': 'any spawnp()/kill() support', + 'deps': 'posix-spawn-native || posix-spawn-android', + 'func': check_true, }, { 'name': 'win32-pipes', 'desc': 'Windows pipe support', diff --git a/wscript_build.py b/wscript_build.py index a43b1507d1..68cfafb94f 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -479,6 +479,7 @@ def build(ctx): ( "osdep/windows_utils.c", "os-cygwin" ), ( "osdep/mpv.rc", "win32-executable" ), ( "osdep/win32/pthread.c", "win32-internal-pthreads"), + ( "osdep/android/posix-spawn.c", "android"), ( "osdep/android/strnlen.c", "android"), ## tree_allocator -- cgit v1.2.3