h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-15 22:51:13 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into death_of_fishd

Browse Source 
Conflicts:
	configure.ac
This commit is contained in:
ridiculousfish
2014-05-03 15:33:48 -07:00
parent 186b0f62eb 333fb1bf97
commit 56bf209f84
66 changed files with 804 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
history.cpp
View File

@@ -1364,12 +1364,20 @@ bool history_t::save_internal_via_rewrite()
for (size_t attempt = 0; attempt < 10 && out_fd == -1; attempt++)
{
char *narrow_str = wcs2str(tmp_name_template.c_str());
#if HAVE_MKOSTEMP
out_fd = mkostemp(narrow_str, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC | O_CLOEXEC);
if (out_fd >= 0)
{
tmp_name = str2wcstring(narrow_str);
}
#else
if (narrow_str && mktemp(narrow_str))
{
/* It was successfully templated; try opening it atomically */
tmp_name = str2wcstring(narrow_str);
out_fd = wopen_cloexec(tmp_name, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC, 0644);
}
#endif
free(narrow_str);
}