diff options
| author | Daniel Gustafsson <dgustafsson@postgresql.org> | 2024-02-13 13:47:12 +0100 |
|---|---|---|
| committer | Daniel Gustafsson <dgustafsson@postgresql.org> | 2024-02-13 13:47:12 +0100 |
| commit | c1fc502f595bc843a603bddd267b249272de485f (patch) | |
| tree | 7f838dec4391751d0e11e9fa5054af51afc19417 /src/backend/backup | |
| parent | e4b88c5fa343ba03e299aa643f0c44120793ddfd (diff) | |
| download | postgresql-c1fc502f595bc843a603bddd267b249272de485f.tar.gz postgresql-c1fc502f595bc843a603bddd267b249272de485f.zip | |
Skip .DS_Store files in server side utils
The macOS Finder application creates .DS_Store files in directories
when opened, which creates problems for serverside utilities which
expect all files to be PostgreSQL specific files. Skip these files
when encountered in pg_checksums, pg_rewind and pg_basebackup.
This was extracted from a larger patchset for skipping hidden files
and system files, where the concencus was to just skip these. Since
this is equally likely to happen in every version, backpatch to all
supported versions.
Reported-by: Mark Guertin <markguertin@gmail.com>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Reviewed-by: Tobias Bussmann <t.bussmann@gmx.net>
Discussion: https://postgr.es/m/E258CE50-AB0E-455D-8AAD-BB4FE8F882FB@gmail.com
Backpatch-through: v12
Diffstat (limited to 'src/backend/backup')
| -rw-r--r-- | src/backend/backup/basebackup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c index d5b8ca21b74..c7a2cbb13e7 100644 --- a/src/backend/backup/basebackup.c +++ b/src/backend/backup/basebackup.c @@ -1265,6 +1265,10 @@ sendDir(bbsink *sink, const char *path, int basepathlen, bool sizeonly, strlen(PG_TEMP_FILE_PREFIX)) == 0) continue; + /* Skip macOS system files */ + if (strcmp(de->d_name, ".DS_Store") == 0) + continue; + /* * Check if the postmaster has signaled us to exit, and abort with an * error in that case. The error handler further up will call |