From: Paul Eggert Date: Thu, 21 Apr 2022 02:34:57 +0000 (-0700) Subject: backupfile: fix bug when renaming simple backups X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=9e94ede7e402a43ec7b1b1ac7ab6f049703167da;p=gnulib.git backupfile: fix bug when renaming simple backups * lib/backupfile.c (backupfile_internal): Fix bug when RENAME and when doing simple backups. Problem reported by Steve Ward in: https://bugs.gnu.org/55029 --- diff --git a/ChangeLog b/ChangeLog index 2f2e751d6f..e99fb51397 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2022-04-20 Paul Eggert + + backupfile: fix bug when renaming simple backups + * lib/backupfile.c (backupfile_internal): Fix bug when RENAME + and when doing simple backups. Problem reported by Steve Ward in: + https://bugs.gnu.org/55029 + 2022-04-16 Paul Eggert verify: port to Mac OS 10.7.5 diff --git a/lib/backupfile.c b/lib/backupfile.c index 06c7e6ea7f..6f6422b4ae 100644 --- a/lib/backupfile.c +++ b/lib/backupfile.c @@ -332,7 +332,7 @@ backupfile_internal (int dir_fd, char const *file, return s; DIR *dirp = NULL; - int sdir = AT_FDCWD; + int sdir = dir_fd; idx_t base_max = 0; while (true) { @@ -371,10 +371,9 @@ backupfile_internal (int dir_fd, char const *file, if (! rename) break; - int olddirfd = sdir < 0 ? dir_fd : sdir; - idx_t offset = sdir < 0 ? 0 : base_offset; + idx_t offset = backup_type == simple_backups ? 0 : base_offset; unsigned flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE; - if (renameatu (olddirfd, file + offset, sdir, s + offset, flags) == 0) + if (renameatu (sdir, file + offset, sdir, s + offset, flags) == 0) break; int e = errno; if (! (e == EEXIST && extended))