archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 53346,53347,53348,53349,53391,53928: [Backport #11898]

Browse source 
* process.c: use rb_w32_uchdir() instead of plain chdir() on Windows.
	  reported by naruse via twitter.

	* process.c (rb_execarg_addopt): need to convert to ospath.

	* process.c (rb_execarg_parent_start1): need to convert the encoding to
	  ospath's one.

	* process.c (rb_execarg_addopt): need to convert the encoding to
	  ospath's one.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2016-03-08 19:45:39 +00:00
parent ebacc09894
commit 055c3336be
4 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
process.c
View file

@ -1737,6 +1737,7 @@ rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val)
rb_raise(rb_eArgError, "chdir option specified twice");
}
FilePathValue(val);
val = rb_str_encode_ospath(val);
eargp->chdir_given = 1;
eargp->chdir_dir = hide_obj(EXPORT_DUP(val));
}
@ -2767,12 +2768,14 @@ run_exec_open(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg_b
VALUE elt = RARRAY_AREF(ary, i);
int fd = FIX2INT(RARRAY_AREF(elt, 0));
VALUE param = RARRAY_AREF(elt, 1);
const VALUE vpath = RARRAY_AREF(param, 0);
const char *path = RSTRING_PTR(vpath);
VALUE vpath = RARRAY_AREF(param, 0);
int flags = NUM2INT(RARRAY_AREF(param, 1));
int perm = NUM2INT(RARRAY_AREF(param, 2));
int need_close = 1;
int fd2 = redirect_open(path, flags, perm); /* async-signal-safe */
int fd2;
FilePathValue(vpath);
vpath = rb_str_encode_ospath(vpath);
fd2 = redirect_open(RSTRING_PTR(vpath), flags, perm); /* async-signal-safe */
if (fd2 == -1) {
ERRMSG("open");
return -1;
@ -2928,6 +2931,11 @@ save_env(struct rb_execarg *sargp)
}
#endif
#ifdef _WIN32
#undef chdir
#define chdir(p) rb_w32_uchdir(p)
#endif
/* This function should be async-signal-safe when sargp is NULL. Hopefully it is. */
int
rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)