Clean up some copied-and-pasted code in pg_upgrade.

[postgresql] / contrib / pg_upgrade / file.c

diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
index 1b25a212c0b4b9ca5e6da8683fb5be919ae8fb68..e84110665febce811cbccbf7d0bf1d4cbfbd1e0e 100644 (file)
--- a/contrib/pg_upgrade/file.c
+++ b/contrib/pg_upgrade/file.c
@@ -440,13 +440,13 @@ copy_dir(const char *src, const char *dst, bool force)
                        return -1;
                }
 
-               if (fst.st_mode & S_IFDIR)
+               if (S_ISDIR(fst.st_mode))
                {
                        /* recurse to handle subdirectories */
                        if (force)
                                copy_dir(src_file, dest_file, true);
                }
-               else if (fst.st_mode & S_IFREG)
+               else if (S_ISREG(fst.st_mode))
                {
                        if ((copy_file(src_file, dest_file, 1)) == -1)
                        {