github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-30 06:03:49 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use a symlink instead of a hard link for fishd.socket compatibility path

Browse Source 
On OS X, work around filesystem corruption triggered by having hard
links in /tmp, by using a symlink instead.
This commit is contained in:
ridiculousfish 2015-02-09 15:37:51 -08:00
parent 0986b6d991
commit b3aa187867
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fishd.cpp
View File

@ -626,12 +626,21 @@ repeat:
// Attempt to hardlink the old socket name so that old versions of fish keep working on upgrade // Attempt to hardlink the old socket name so that old versions of fish keep working on upgrade
// Not critical if it fails // Not critical if it fails
// On OS X, we use symlinks instead of hardlinks to work around a filesystem corruption bug http://openradar.appspot.com/19687545
// On Linux, we use hardlinks instead of symlinks for compatibility with the Yama security model - see #1859
int (*linkfunc)(const char *, const char *);
#if __APPLE__
linkfunc = symlink;
#else
linkfunc = link;
#endif
if (unlink(old_sock_name.c_str()) != 0 && errno != ENOENT) if (unlink(old_sock_name.c_str()) != 0 && errno != ENOENT)
{ {
debug(0, L"Could not create legacy socket path"); debug(0, L"Could not create legacy socket path");
wperror(L"unlink"); wperror(L"unlink");
} }
else if (link(sock_name.c_str(), old_sock_name.c_str()) != 0) else if (linkfunc(sock_name.c_str(), old_sock_name.c_str()) != 0)
{ {
debug(0, L"Could not create legacy socket path"); debug(0, L"Could not create legacy socket path");
wperror(L"link"); wperror(L"link");