diff options
| author | Michael R. Mauger | 2017-08-06 20:58:08 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-08-06 20:58:08 -0400 |
| commit | 6e2c0929bac8d3896d0472222cd3e6b77cb24c35 (patch) | |
| tree | 62668da72d88140958ed22273a6ed6557bc61a4a /src/filelock.c | |
| parent | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (diff) | |
| parent | c2f1830d69f5a5e20dac6fcbf3af4d51afba92bd (diff) | |
| download | emacs-6e2c0929bac8d3896d0472222cd3e6b77cb24c35.tar.gz emacs-6e2c0929bac8d3896d0472222cd3e6b77cb24c35.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/filelock.c')
| -rw-r--r-- | src/filelock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/filelock.c b/src/filelock.c index bfa1d63d833..dd8cb28c425 100644 --- a/src/filelock.c +++ b/src/filelock.c | |||
| @@ -339,6 +339,9 @@ rename_lock_file (char const *old, char const *new, bool force) | |||
| 339 | { | 339 | { |
| 340 | struct stat st; | 340 | struct stat st; |
| 341 | 341 | ||
| 342 | int r = renameat_noreplace (AT_FDCWD, old, AT_FDCWD, new); | ||
| 343 | if (! (r < 0 && errno == ENOSYS)) | ||
| 344 | return r; | ||
| 342 | if (link (old, new) == 0) | 345 | if (link (old, new) == 0) |
| 343 | return unlink (old) == 0 || errno == ENOENT ? 0 : -1; | 346 | return unlink (old) == 0 || errno == ENOENT ? 0 : -1; |
| 344 | if (errno != ENOSYS && errno != LINKS_MIGHT_NOT_WORK) | 347 | if (errno != ENOSYS && errno != LINKS_MIGHT_NOT_WORK) |