1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

popen() is not available on emscripten

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2021-08-16 17:00:19 +09:00
parent 07b12a1f48
commit a8714b83c4
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
Notes: git 2021-08-16 18:32:52 +09:00 
Merged: https://github.com/ruby/ruby/pull/4745
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
io.c
View File

@ -6625,6 +6625,7 @@ struct popen_arg {
#endif #endif
#ifdef HAVE_WORKING_FORK #ifdef HAVE_WORKING_FORK
# ifndef __EMSCRIPTEN__
static void static void
popen_redirect(struct popen_arg *p) popen_redirect(struct popen_arg *p)
{ {
@ -6655,6 +6656,7 @@ popen_redirect(struct popen_arg *p)
} }
} }
} }
# endif
#if defined(__linux__) #if defined(__linux__)
/* Linux /proc/self/status contains a line: "FDSize:\t<nnn>\n" /* Linux /proc/self/status contains a line: "FDSize:\t<nnn>\n"
@ -6735,6 +6737,7 @@ rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds)
#endif #endif
} }
# ifndef __EMSCRIPTEN__
static int static int
popen_exec(void *pp, char *errmsg, size_t errmsg_len) popen_exec(void *pp, char *errmsg, size_t errmsg_len)
{ {
@ -6742,9 +6745,10 @@ popen_exec(void *pp, char *errmsg, size_t errmsg_len)
return rb_exec_async_signal_safe(p->eargp, errmsg, errmsg_len); return rb_exec_async_signal_safe(p->eargp, errmsg, errmsg_len);
} }
# endif
#endif #endif
#if defined(HAVE_WORKING_FORK) || defined(HAVE_SPAWNV) #if (defined(HAVE_WORKING_FORK) || defined(HAVE_SPAWNV)) && !defined __EMSCRIPTEN__
static VALUE static VALUE
rb_execarg_fixup_v(VALUE execarg_obj) rb_execarg_fixup_v(VALUE execarg_obj)
{ {

2
process.c
View File

@ -4536,7 +4536,7 @@ rb_syswait(rb_pid_t pid)
rb_waitpid(pid, &status, 0); rb_waitpid(pid, &status, 0);
} }
#if !defined HAVE_WORKING_FORK && !defined HAVE_SPAWNV #if !defined HAVE_WORKING_FORK && !defined HAVE_SPAWNV && !defined __EMSCRIPTEN__
char * char *
rb_execarg_commandline(const struct rb_execarg *eargp, VALUE *prog) rb_execarg_commandline(const struct rb_execarg *eargp, VALUE *prog)
{ {