admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4665 from dearblue/fix-4642

Browse Source 
Create a symbolic link in the temporary directory; fix #4642
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-08-25 01:28:14 +09:00
committed by GitHub
parent ce89974679 6ad2442fb9
commit 17623fd0d3
2 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-io/test/file.rb
+17 -12
View File
@@ -179,20 +179,25 @@ end
assert('File.symlink') do
target_name = "/usr/bin"
symlink_name = MRubyIOTestUtil.mktemp("test-bin-dummy-XXXXXXXX")
if !File.exist?(target_name)
skip("target directory of File.symlink is not found")
else
begin
assert_equal 0, File.symlink(target_name, symlink_name)
begin
assert_equal true, File.symlink?(symlink_name)
ensure
File.delete symlink_name
end
rescue NotImplementedError => e
skip e.message
end
end
begin
tmpdir = MRubyIOTestUtil.mkdtemp("mruby-io-test.XXXXXX")
rescue => e
skip e.message
end
symlink_name = "#{tmpdir}/test-bin-dummy"
begin
assert_equal 0, File.symlink(target_name, symlink_name)
assert_equal true, File.symlink?(symlink_name)
rescue NotImplementedError => e
skip e.message
ensure
File.delete symlink_name rescue nil
MRubyIOTestUtil.rmdir tmpdir rescue nil
end
end
mrbgems/mruby-io/test/mruby_io_test.c
-16
View File
@@ -44,7 +44,6 @@ mkdtemp(char *temp)
return path;
}
#define mktemp(path) _mktemp(path)
#define umask(mode) _umask(mode)
#define rmdir(path) _rmdir(path)
#else
@@ -199,20 +198,6 @@ mrb_io_test_file_cleanup(mrb_state *mrb, mrb_value self)
return mrb_nil_value();
}
static mrb_value
mrb_io_test_mktemp(mrb_state *mrb, mrb_value klass)
{
mrb_value str;
char *cp;
mrb_get_args(mrb, "S", &str);
cp = mrb_str_to_cstr(mrb, str);
if (mktemp(cp) == NULL) {
mrb_sys_fail(mrb, "mktemp");
}
return mrb_str_new_cstr(mrb, cp);
}
static mrb_value
mrb_io_test_mkdtemp(mrb_state *mrb, mrb_value klass)
{
@@ -263,7 +248,6 @@ mrb_mruby_io_gem_test(mrb_state* mrb)
mrb_define_class_method(mrb, io_test, "file_test_setup", mrb_io_test_file_setup, MRB_ARGS_NONE());
mrb_define_class_method(mrb, io_test, "file_test_cleanup", mrb_io_test_file_cleanup, MRB_ARGS_NONE());
mrb_define_class_method(mrb, io_test, "mktemp", mrb_io_test_mktemp, MRB_ARGS_REQ(1));
mrb_define_class_method(mrb, io_test, "mkdtemp", mrb_io_test_mkdtemp, MRB_ARGS_REQ(1));
mrb_define_class_method(mrb, io_test, "rmdir", mrb_io_test_rmdir, MRB_ARGS_REQ(1));
mrb_define_class_method(mrb, io_test, "win?", mrb_io_win_p, MRB_ARGS_NONE());