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

mjit.c: make null device portable

Browse Source 
for future mswin support

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2018-02-06 16:57:46 +00:00
parent e31eedbdb8
commit 36991485d4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mjit.c
View File

@ -198,6 +198,8 @@ static char *header_file;
static char *pch_file; static char *pch_file;
/* Path of "/tmp", which can be changed to $TMP in MinGW. */ /* Path of "/tmp", which can be changed to $TMP in MinGW. */
static char *tmp_dir; static char *tmp_dir;
/* Portable /dev/null, fetched from file.c */
static char *null_device;
/* Hash like { 1 => true, 2 => true, ... } whose keys are valid `class_serial`s. /* Hash like { 1 => true, 2 => true, ... } whose keys are valid `class_serial`s.
This is used to invalidate obsoleted CALL_CACHE. */ This is used to invalidate obsoleted CALL_CACHE. */
static VALUE valid_class_serials; static VALUE valid_class_serials;
@ -321,7 +323,7 @@ start_process(const char *path, char *const *argv)
#else #else
{ {
/* Not calling IO functions between fork and exec for safety */ /* Not calling IO functions between fork and exec for safety */
FILE *f = fopen("/dev/null", "w"); FILE *f = fopen(null_device, "w");
int dev_null = fileno(f); int dev_null = fileno(f);
fclose(f); fclose(f);
@ -1171,6 +1173,10 @@ mjit_init(struct mjit_options *opts)
else { else {
tmp_dir = get_string("/tmp"); tmp_dir = get_string("/tmp");
} }
{
VALUE file_null = rb_const_get(rb_cFile, rb_intern("NULL"));
null_device = get_string(StringValuePtr(file_null));
}
init_header_filename(); init_header_filename();
pch_file = get_uniq_filename(0, MJIT_TMP_PREFIX "h", ".h.gch"); pch_file = get_uniq_filename(0, MJIT_TMP_PREFIX "h", ".h.gch");
@ -1255,6 +1261,7 @@ mjit_finish(void)
remove(pch_file); remove(pch_file);
xfree(tmp_dir); tmp_dir = NULL; xfree(tmp_dir); tmp_dir = NULL;
xfree(null_device); null_device = NULL;
xfree(pch_file); pch_file = NULL; xfree(pch_file); pch_file = NULL;
xfree(header_file); header_file = NULL; xfree(header_file); header_file = NULL;