Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use mkostemp in universal variables when available

Browse source
This commit is contained in:
ridiculousfish 2014-05-15 14:37:44 +08:00
parent 38c52cf9b5
commit 147403f958
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
env_universal_common.cpp
View file

@ -865,12 +865,20 @@ bool env_universal_t::open_temporary_file(const wcstring &directory, wcstring *o
{ {
int result_fd = -1; int result_fd = -1;
char *narrow_str = wcs2str(tmp_name_template.c_str()); char *narrow_str = wcs2str(tmp_name_template.c_str());
if (narrow_str && mktemp(narrow_str)) #if HAVE_MKOSTEMP
result_fd = mkostemp(narrow_str, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC | O_CLOEXEC);
if (result_fd >= 0)
{
tmp_name = str2wcstring(narrow_str);
}
#else
if (mktemp(narrow_str))
{ {
/* It was successfully templated; try opening it atomically */ /* It was successfully templated; try opening it atomically */
tmp_name = str2wcstring(narrow_str); tmp_name = str2wcstring(narrow_str);
result_fd = wopen_cloexec(tmp_name, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC, 0644); result_fd = wopen_cloexec(tmp_name, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC, 0644);
} }
#endif
if (result_fd >= 0) if (result_fd >= 0)
{ {